Merge pull request #3620 from AElfProject/feature/inline-tx-id

Inline transactions can be cross-chain indexed to enable further business processing

Author: JimAelf

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
 

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
                     });
+                }
             }
         }
 

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)
     {

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "8.0.x"
+    "version": "8.0.*"
   }
 }

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];
+}

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;

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];
-}
+}

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)
     {
     }
 

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(".");
+    }
 }

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>