Usercenter optimize

contract/Forest/ForestContract.cs

@@ -239,5 +239,23 @@ public override Empty CreateArt(CreateArtInput input)
             });
             return new Empty();
         }
+
+        public override Empty SetMaxBatchCancelOfferCount(Int32Value input)
+        {
+            AssertSenderIsAdmin();
+            Assert(input is { Value: > 0 }, "Invalid input.");
+
+            State.MaxBatchCancelOfferCount.Value = input.Value;
+            return new Empty();
+        }
+
+        public override Empty SetMaxBatchCancelListCount(Int32Value input)
+        {
+            AssertSenderIsAdmin();
+            Assert(input is { Value: > 0 }, "Invalid input.");
+
+            State.MaxBatchCancelListCount.Value = input.Value;
+            return new Empty();
+        }
     }
 }

contract/Forest/ForestContractConstants.cs

@@ -22,5 +22,7 @@ public partial class ForestContract
     public const string DefaultAIImageSize1024 = "1024x1024";
     public const string DefaultAIImageSize512 = "512x512";
     public const string DefaultAIImageSize256 = "256x256";
+    public const int DefaultMaxBatchCancelOfferCount= 20;
+    public const int DefaultMaxBatchCancelListCount= 20;
 
 }

contract/Forest/ForestContractState.cs

@@ -61,6 +61,9 @@ public partial class ForestContractState : ContractState
         /// Symbol -> Address TxId ->  CreateArtInfo
         /// </summary>
         public MappedState<Address, string, CreateArtInfo> CreateArtInfoMap { get; set; }
+        public SingletonState<int> MaxBatchCancelOfferCount { get; set; }
+
+        public SingletonState<int> MaxBatchCancelListCount { get; set; }
 
     }
 }

contract/Forest/ForestContract_Buyers.cs

@@ -534,6 +534,12 @@ public override Empty CancelOffer(CancelOfferInput input)
     public override Empty CancelOfferListByExpireTime(CancelOfferListByExpireTimeInput input)
     {
         AssertContractInitialized();
+        CancelOfferList(input);
+        return new Empty();
+    }
+
+    private Empty CancelOfferList(CancelOfferListByExpireTimeInput input)
+    {
         Assert(Context.Sender != null, "Invalid input data : Context.Sender");
         Assert(input != null, "Invalid input data");
         Assert(input.Symbol != null, "Invalid input data : Symbol");
@@ -548,15 +554,26 @@ public override Empty CancelOfferListByExpireTime(CancelOfferListByExpireTimeInp
         Assert(offerList?.Value?.Count > 0, "Offer not exists");
 
 
-        var cancelOfferList = offerList?.Value.Where(existOffer => input.CancelOfferList.Any(cannelOffer =>
-            AreOffersEqual(existOffer, cannelOffer)
-        )).ToList();
+        var cancelOfferList = new List<Offer>();
+        var remainOfferList = new List<Offer>();
+        foreach (var existOffer in offerList?.Value)
+        {
+            foreach (var cannelOffer in input.CancelOfferList)
+            {
+                if (AreOffersEqual(existOffer, cannelOffer))
+                {
+                    cancelOfferList.Add(existOffer);
+                }
+                if (!AreOffersEqual(existOffer, cannelOffer))
+                {
+                    remainOfferList.Add(existOffer);
+                }
+            }
+        }
         Assert(cancelOfferList?.Count > 0, "Cannel Offer not exists");
 
         var newOfferList = new OfferList();
-        var remainOfferList = offerList?.Value.Where(existOffer => !input.CancelOfferList.Any(cannelOffer =>
-            AreOffersEqual(existOffer, cannelOffer)
-        )).ToList();
+
         newOfferList.Value.Add(remainOfferList);
 
         var cancelOfferMap = new Dictionary<string, long>();
@@ -599,7 +616,7 @@ public override Empty CancelOfferListByExpireTime(CancelOfferListByExpireTimeInp
         return new Empty();
 
     }
-    
+
     private bool AreOffersEqual(Offer existOffer, CancelOffer cancelOffer)
     {
         return existOffer.To == cancelOffer.OfferTo &&
@@ -757,4 +774,35 @@ private void PerformMakeOffer(MakeOfferInput input, GetBalanceOutput originGetBa
             Quantity = input.Quantity
         });
     }
+
+    public override Empty BatchCancelOfferList(BatchCancelOfferListInput input)
+    {
+        AssertContractInitialized();
+        RequireMaxBatchCancelOfferCountSet();
+        Assert(Context.Sender != null, "Invalid input data : Context.Sender");
+        Assert(input != null, "Invalid input data");
+        Assert(input.BatchCancelOfferInfo != null, "Invalid input data : BatchCancelOfferInfo");
+        Assert(input.BatchCancelOfferInfo.CancelOfferList != null, "Invalid input data : CancelOfferList");
+        var maxBatchCancelOfferCount = State.MaxBatchCancelOfferCount.Value;
+        Assert(input.BatchCancelOfferInfo.CancelOfferList.Count <= maxBatchCancelOfferCount, "Invalid cancel list count.");
+        foreach (var cancelOffer in input.BatchCancelOfferInfo.CancelOfferList)
+        {
+            var cancelInput = new CancelOfferListByExpireTimeInput()
+            {
+                Symbol = cancelOffer.Symbol,
+                CancelOfferList = {new CancelOffer()
+                {
+                    ExpireTime = cancelOffer.ExpireTime,
+                    OfferTo = cancelOffer.OfferTo,
+                    Price = new Price()
+                    {
+                        Symbol = cancelOffer.Price.Symbol,
+                        Amount = cancelOffer.Price.Amount
+                    }
+                }}
+            };
+            CancelOfferList(cancelInput);
+        }
+        return new Empty();
+    }
 }

contract/Forest/ForestContract_Helpers.cs

@@ -342,4 +342,22 @@ private void CheckCreateArtParams(CreateArtInput input)
         var size = State.AIImageSizeList.Value.Value;
         Assert(State.AIImageSizeList.Value.Value.Contains(input.Size), $"Invalid input size");
     }
+
+    private void RequireMaxBatchCancelOfferCountSet()
+    {
+        var maxCount = State.MaxBatchCancelOfferCount.Value;
+        if (maxCount <= 0)
+        {
+            State.MaxBatchCancelOfferCount.Value = DefaultMaxBatchCancelOfferCount;
+        }
+    }
+
+    private void RequireMaxBatchCancelListCountSet()
+    {
+        var maxCount = State.MaxBatchCancelListCount.Value;
+        if (maxCount <= 0)
+        {
+            State.MaxBatchCancelListCount.Value = DefaultMaxBatchCancelListCount;
+        }
+    }
 }

contract/Forest/ForestContract_Sellers.cs

@@ -138,6 +138,12 @@ public override Empty ListWithFixedPrice(ListWithFixedPriceInput input)
     }
 
     public override Empty Delist(DelistInput input)
+    {
+        SingleDelist(input);
+        return new Empty();
+    }
+
+    private Empty SingleDelist(DelistInput input)
     {
         Assert(input.Quantity > 0, "Quantity must be a positive integer.");
         var listedNftInfoList = State.ListedNFTInfoListMap[input.Symbol][Context.Sender];
@@ -147,10 +153,18 @@ public override Empty Delist(DelistInput input)
         }
 
         Assert(input.Price != null, "Need to specific list record.");
-        var listedNftInfo = listedNftInfoList.Value.FirstOrDefault(i =>
-            i.Price.Amount == input.Price.Amount && i.Price.Symbol == input.Price.Symbol &&
-            i.Owner == Context.Sender &&
-            (input.StartTime == null ? true : input.StartTime.Seconds == i.Duration.StartTime.Seconds));
+        ListedNFTInfo listedNftInfo = null;
+
+        foreach (var i in listedNftInfoList.Value)
+        {
+            if (i.Price.Amount == input.Price.Amount && i.Price.Symbol == input.Price.Symbol &&
+                i.Owner == Context.Sender &&
+                (input.StartTime == null ? true : input.StartTime.Seconds == i.Duration.StartTime.Seconds))
+            {
+                listedNftInfo = i;
+                break;
+            }
+        }
 
         if (listedNftInfo == null)
         {
@@ -370,4 +384,33 @@ public override Empty Deal(DealInput input)
         });
         return new Empty();
     }
+
+    public override Empty BatchCancelList(BatchCancelListInput input)
+    {
+        AssertContractInitialized();
+        RequireMaxBatchCancelListCountSet();
+        Assert(Context.Sender != null, "Invalid input data : Context.Sender");
+        Assert(input != null, "Invalid input data");
+        Assert(input.BatchCancelListInfo != null, "Invalid input data : Symbol");
+        Assert(input.BatchCancelListInfo.CancelList != null, "Invalid input data : CancelList");
+        var maxBatchCancelCount = State.MaxBatchCancelListCount.Value;
+        Assert(input.BatchCancelListInfo.CancelList.Count <= maxBatchCancelCount, "Invalid cancel list count.");
+        foreach (var cancelInfo in input.BatchCancelListInfo.CancelList)
+        {
+            var cancelInput = new DelistInput()
+            {
+                Symbol = cancelInfo.Symbol,
+                Quantity = cancelInfo.Quantity,
+                Price = new Price()
+                {
+                    Symbol = cancelInfo.Price.Symbol,
+                    Amount = cancelInfo.Price.Amount
+                },
+                StartTime = cancelInfo.StartTime
+            };
+            SingleDelist(cancelInput);
+        }
+        return new Empty();
+
+    }
 }

contract/Forest/ForestContract_Views.cs

@@ -147,4 +147,14 @@ public override CreateArtInfo GetCreateArtInfo(GetCreateArtInfoInput input)
         Assert(input != null, "Invalid TransactionId");
         return State.CreateArtInfoMap[input.Address ?? Context.Sender][input.TransactionId];
     }
+
+    public override Int32Value GetMaxBatchCancelOfferCount(Empty input)
+    {
+        return new Int32Value { Value = State.MaxBatchCancelOfferCount.Value };
+    }
+
+    public override Int32Value GetMaxBatchCancelListCount(Empty input)
+    {
+        return new Int32Value { Value = State.MaxBatchCancelListCount.Value };
+    }
 }

protobuf/forest_contract.proto

@@ -39,6 +39,11 @@ service ForestContract {
   }
   rpc CancelOfferListByExpireTime (CancelOfferListByExpireTimeInput) returns (google.protobuf.Empty) {
   }
+
+  rpc BatchCancelOfferList (BatchCancelOfferListInput) returns (google.protobuf.Empty) {
+  }
+  rpc BatchCancelList (BatchCancelListInput) returns (google.protobuf.Empty){
+  }
   rpc BatchBuyNow (BatchBuyNowInput) returns (google.protobuf.Empty){
   }
 
@@ -74,7 +79,13 @@ service ForestContract {
 
   rpc RemoveAIImageSize (google.protobuf.StringValue) returns (google.protobuf.Empty){
   }
+
+  rpc SetMaxBatchCancelOfferCount(google.protobuf.Int32Value) returns (google.protobuf.Empty){
+  }
 
+  rpc SetMaxBatchCancelListCount(google.protobuf.Int32Value) returns (google.protobuf.Empty){
+  }
+
   // Views.
   rpc GetListedNFTInfoList (GetListedNFTInfoListInput) returns (ListedNFTInfoList) {
     option (aelf.is_view) = true;
@@ -124,6 +135,14 @@ service ForestContract {
   rpc GetCreateArtInfo (GetCreateArtInfoInput) returns (CreateArtInfo){
     option (aelf.is_view) = true;
   }
+
+  rpc GetMaxBatchCancelOfferCount(google.protobuf.Empty) returns (google.protobuf.Int32Value){
+    option (aelf.is_view) = true;
+  }
+
+  rpc GetMaxBatchCancelListCount(google.protobuf.Empty) returns (google.protobuf.Int32Value){
+    option (aelf.is_view) = true;
+  }
 }
 
 // Structs.
@@ -141,7 +160,6 @@ message ListedNFTInfoList {
   repeated ListedNFTInfo value = 1;
 }
 
-
 message StringList {
   repeated string value = 1;
 }
@@ -269,6 +287,30 @@ message CancelOfferListByExpireTimeInput {
   repeated CancelOffer cancel_offer_list =2;
 }
 
+message BatchCancelOfferListInput {
+  BatchCancelOfferInfo batch_cancel_offer_info = 1;
+}
+
+message BatchCancelOfferInfo{
+  repeated CancelOfferList cancel_offer_list =1;
+}
+
+message CancelOfferList{
+  string symbol = 1;
+  google.protobuf.Timestamp expire_time = 2;
+  aelf.Address offer_to = 3;
+  Price price = 4;
+}
+
+message BatchCancelListInput{
+  BatchCancelListInfo batch_cancel_list_info = 1;
+}
+
+message BatchCancelListInfo{
+  repeated DelistInput cancel_list =1;
+}
+
+
 message CancelOffer{
   google.protobuf.Timestamp expire_time = 1;
   aelf.Address offer_to = 2;

src/AElf.Boilerplate.MainChain/AElf.Boilerplate.MainChain.csproj

@@ -43,7 +43,7 @@
             <OutputItemType>Contract</OutputItemType>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </PackageReference>
-        <PackageReference Include="AElf.Contracts.MultiToken" Version="1.5.0">
+        <PackageReference Include="AElf.Contracts.MultiToken" Version="1.7.0">
             <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
             <OutputItemType>Contract</OutputItemType>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

src/AElf.Boilerplate.TestBase/AElf.Boilerplate.TestBase.csproj

@@ -56,7 +56,7 @@
             <OutputItemType>Contract</OutputItemType>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </PackageReference>
-        <PackageReference Include="AElf.Contracts.MultiToken" Version="1.5.0">
+        <PackageReference Include="AElf.Contracts.MultiToken" Version="1.7.0">
             <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
             <OutputItemType>Contract</OutputItemType>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

test/Forest.Contracts.Auction.Tests/AuctionContractTests.cs

@@ -347,7 +347,7 @@ public async Task CreateAuctionTests_Fail()
             {
                 Symbol = "SEED-2"
             });
-            result.TransactionResult.Error.ShouldContain("Only support 721 type NFT.");
+            result.TransactionResult.Error.ShouldContain("Invalid input auction type.");
 
             result = await AuctionContractStub.CreateAuction.SendWithExceptionAsync(new CreateAuctionInput
             {
@@ -904,7 +904,7 @@ await TokenContractStub.Create.SendAsync(new CreateInput
                 Issuer = DefaultAddress,
                 Symbol = "SEED-2",
                 TokenName = "SEED-TEST",
-                TotalSupply = 2,
+                TotalSupply = 1,
                 Decimals = 0,
                 IsBurnable = true,
                 LockWhiteList = { TokenContractAddress },

test/Forest.Tests/Forest.Tests.csproj

@@ -97,8 +97,4 @@
         <ProjectReference Include="..\..\src\AElf.Boilerplate.TestBase\AElf.Boilerplate.TestBase.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-      <Folder Include="Protobuf\Proto\reference\" />
-    </ItemGroup>
-
 </Project>