Merge pull request #3626 from AElfProject/dev

TransactionResult optimization
AElfProject · Dec 4, 2024 · 4926267 · 4926267
2 parents 39398fa + 9d567e4
commit 4926267
Show file tree

Hide file tree

Showing 30 changed files with 425 additions and 29 deletions.
diff --git a/.github/workflows/sonarqube.yaml b/.github/workflows/sonarqube.yaml
@@ -15,7 +15,7 @@ jobs:
         with:
           dotnet-version: '8.0'
       - name: Create temporary global.json
-        run: echo '{"sdk":{"version":"8.0.303"}}' > ./global.json
+        run: echo '{"sdk":{"version":"8.0.*"}}' > ./global.json
       - name: Set up JDK 17
         uses: actions/setup-java@v1
         with:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -40,9 +40,9 @@ jobs:
       parts: 3
       n: 2
       codecoverage: true
-  - template: templates/build-template-macos.yml
-    parameters:
-      parts: 3
-      n: 3
-      codecoverage: true
+#  - template: templates/build-template-macos.yml
+#    parameters:
+#      parts: 3
+#      n: 3
+#      codecoverage: true
 
diff --git a/contract/AElf.Contracts.Consensus.AEDPoS/AEDPoSContract_ProcessConsensusInformation.cs b/contract/AElf.Contracts.Consensus.AEDPoS/AEDPoSContract_ProcessConsensusInformation.cs
@@ -127,10 +127,12 @@ private void ProcessNextRound(NextRoundInput input)
             {
                 var minersCount = GetMinersCount(nextRound);
                 if (minersCount != 0 && State.ElectionContract.Value != null)
+                {
                     State.ElectionContract.UpdateMinersCount.Send(new UpdateMinersCountInput
                     {
                         MinersCount = minersCount
                     });
+                }
             }
         }
 

diff --git a/contract/AElf.Contracts.MultiToken/TokenContract_Actions.cs b/contract/AElf.Contracts.MultiToken/TokenContract_Actions.cs
@@ -691,6 +691,35 @@ public override Int32Value GetMaxBatchApproveCount(Empty input)
         };
     }
 
+    public override Empty ExtendSeedExpirationTime(ExtendSeedExpirationTimeInput input)
+    {
+        var tokenInfo = GetTokenInfo(input.Symbol);
+        if (tokenInfo == null)
+        {
+            throw new AssertionException("Seed NFT does not exist.");
+        }
+
+        Assert(tokenInfo.Owner == Context.Sender, "Sender is not Seed NFT owner.");
+        var oldExpireTimeLong = 0L;
+        if (tokenInfo.ExternalInfo.Value.TryGetValue(TokenContractConstants.SeedExpireTimeExternalInfoKey,
+                out var oldExpireTime))
+        {
+            long.TryParse(oldExpireTime, out oldExpireTimeLong);
+        }
+
+        tokenInfo.ExternalInfo.Value[TokenContractConstants.SeedExpireTimeExternalInfoKey] =
+            input.ExpirationTime.ToString();
+        State.TokenInfos[input.Symbol] = tokenInfo;
+        Context.Fire(new SeedExpirationTimeUpdated
+        {
+            ChainId = tokenInfo.IssueChainId,
+            Symbol = input.Symbol,
+            OldExpirationTime = oldExpireTimeLong,
+            NewExpirationTime = input.ExpirationTime
+        });
+        return new Empty();
+    }
+
     private int GetMaxBatchApproveCount()
     {
         return State.MaxBatchApproveCount.Value == 0

diff --git a/contract/AElf.Contracts.MultiToken/TokenContract_Helper.cs b/contract/AElf.Contracts.MultiToken/TokenContract_Helper.cs
@@ -215,10 +215,16 @@ private Address ExtractTokenContractAddress(ByteString bytes)
     private void AssertCrossChainTransaction(Transaction originalTransaction, Address validAddress,
         params string[] validMethodNames)
     {
-        var validateResult = validMethodNames.Contains(originalTransaction.MethodName)
+        var validateResult = validMethodNames.Contains(MaybeRecoverInlineTransactionFunctionName(originalTransaction.MethodName))
                              && originalTransaction.To == validAddress;
         Assert(validateResult, "Invalid transaction.");
     }
+
+    private static string MaybeRecoverInlineTransactionFunctionName(string methodName)
+    {
+        var parts = methodName.Split('.');
+        return parts.Length > 1 ? parts[^2] : methodName;
+    }
 
     private void RegisterTokenInfo(TokenInfo tokenInfo)
     {

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.x"
+    "version": "8.0.*"
   }
 }
diff --git a/protobuf/inline_transaction.proto b/protobuf/inline_transaction.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+
+option csharp_namespace = "AElf.Types";
+
+
+import "aelf/core.proto";
+import "aelf/options.proto";
+
+service InlineTransaction {
+}
+
+message InlineTransactionCreated {
+  option (aelf.is_event) = true;
+  aelf.Transaction transaction = 1 [(aelf.is_indexed) = true];
+}
diff --git a/protobuf/test_virtual_address_contract.proto b/protobuf/test_virtual_address_contract.proto
@@ -14,6 +14,7 @@ service VirtualAddressContract {
   option (aelf.base) = "acs1.proto";
 
   rpc VirtualAddressVote(VirtualAddressVoteInput) returns (google.protobuf.Empty);
+  rpc VirtualAddressVoteWithInline(VirtualAddressVoteWithCountInput) returns (google.protobuf.Empty);
   rpc VirtualAddressWithdraw(aelf.Hash) returns (google.protobuf.Empty);
   rpc VirtualAddressChangeVotingOption(VirtualAddressChangeVotingOptionInput) returns (google.protobuf.Empty);
   rpc VirtualAddressClaimProfit(VirtualAddressClaimProfitInput) returns (google.protobuf.Empty);
@@ -32,6 +33,11 @@ message VirtualAddressVoteInput {
   aelf.Hash token = 4;
 }
 
+message VirtualAddressVoteWithCountInput {
+  VirtualAddressVoteInput vote_input = 1; // Existing input type
+  int32 count = 2; // Additional count input
+}
+
 message VirtualAddressChangeVotingOptionInput {
   bool is_reset = 1;
   aelf.Hash vote_id = 2;

diff --git a/protobuf/token_contract_impl.proto b/protobuf/token_contract_impl.proto
@@ -182,6 +182,9 @@ service TokenContractImpl {
     rpc GetMaxBatchApproveCount (google.protobuf.Empty) returns (google.protobuf.Int32Value) {
 
     }
+
+    rpc ExtendSeedExpirationTime (ExtendSeedExpirationTimeInput) returns (google.protobuf.Empty) {
+    }
 }
 
 message AdvanceResourceTokenInput {
@@ -444,4 +447,17 @@ message ModifyTokenIssuerAndOwnerInput {
 
 message SetTokenIssuerAndOwnerModificationEnabledInput{
     bool enabled = 1;
+}
+
+message ExtendSeedExpirationTimeInput {
+    string symbol = 1;
+    int64 expiration_time = 2;
+}
+
+message SeedExpirationTimeUpdated {
+    option (aelf.is_event) = true;
+    int32 chain_id = 1;
+    string symbol = 2;
+    int64 old_expiration_time = 3;
+    int64 new_expiration_time = 4;
 }
diff --git a/protobuf/virtual_transaction.proto b/protobuf/virtual_transaction.proto
@@ -17,4 +17,4 @@ message VirtualTransactionCreated {
   string method_name = 4 [(aelf.is_indexed) = true];
   bytes params = 5;
   aelf.Address signatory = 6 [(aelf.is_indexed) = true];
-}
+}
diff --git a/src/AElf.ContractTestKit.AEDPoSExtension/UnitTestPlainTransactionExecutingService.cs b/src/AElf.ContractTestKit.AEDPoSExtension/UnitTestPlainTransactionExecutingService.cs
@@ -2,6 +2,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using AElf.Kernel;
+using AElf.Kernel.Blockchain.Application;
 using AElf.Kernel.FeatureDisable.Core;
 using AElf.Kernel.SmartContract;
 using AElf.Kernel.SmartContract.Application;
@@ -13,8 +14,8 @@ public class UnitTestPlainTransactionExecutingService : PlainTransactionExecutin
 {
     public UnitTestPlainTransactionExecutingService(ISmartContractExecutiveService smartContractExecutiveService,
         IEnumerable<IPostExecutionPlugin> postPlugins, IEnumerable<IPreExecutionPlugin> prePlugins,
-        ITransactionContextFactory transactionContextFactory, IFeatureDisableService featureDisableService) : base(
-        smartContractExecutiveService, postPlugins, prePlugins, transactionContextFactory, featureDisableService)
+        ITransactionContextFactory transactionContextFactory, IFeatureDisableService featureDisableService,IBlockchainService blockchainService) : base(
+        smartContractExecutiveService, postPlugins, prePlugins, transactionContextFactory, featureDisableService,blockchainService)
     {
     }
 

diff --git a/src/AElf.Kernel.Core/Extensions/TransactionExtensions.cs b/src/AElf.Kernel.Core/Extensions/TransactionExtensions.cs
@@ -16,6 +16,10 @@ public static int Size(this Transaction transaction)
 
     public static bool VerifySignature(this Transaction transaction)
     {
+        if (transaction.IsInlineWithTransactionId())
+        {
+            return true;
+        }
         if (!transaction.VerifyFields())
             return false;
 
@@ -27,7 +31,16 @@ public static bool VerifySignature(this Transaction transaction)
 
     public static bool VerifyExpiration(this Transaction transaction, long chainBranchBlockHeight)
     {
+        if (transaction.IsInlineWithTransactionId())
+        {
+            return true;
+        }
         return transaction.RefBlockNumber <= chainBranchBlockHeight &&
                transaction.GetExpiryBlockNumber() > chainBranchBlockHeight;
     }
+
+    public static bool IsInlineWithTransactionId(this Transaction transaction)
+    {
+        return transaction.MethodName.Contains(".");
+    }
 }
diff --git a/src/AElf.Kernel.SmartContract/AElf.Kernel.SmartContract.csproj b/src/AElf.Kernel.SmartContract/AElf.Kernel.SmartContract.csproj
@@ -22,5 +22,8 @@
         <ContractMessage Include="..\..\protobuf\virtual_transaction.proto">
             <Link>Protobuf\Proto\virtual_transaction.proto</Link>
         </ContractMessage>
+        <ContractMessage Include="..\..\protobuf\inline_transaction.proto">
+            <Link>Protobuf\Proto\inline_transaction.proto</Link>
+        </ContractMessage>
     </ItemGroup>
 </Project>