Merge branch 'dev' into feature/whitelist-to-sdk

chopin-fan · web-flow · commit 94abd2a8481c · 2024-12-14T15:13:37.000+08:00
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)
     {

Original file line number	Diff line number	Diff line change
`@@ -215,10 +215,16 @@ private Address ExtractTokenContractAddress(ByteString bytes)`
`215`	`215`	`private void AssertCrossChainTransaction(Transaction originalTransaction, Address validAddress,`
`216`	`216`	`params string[] validMethodNames)`
`217`	`217`	`{`
`218`		`- var validateResult = validMethodNames.Contains(originalTransaction.MethodName)`
	`218`	`+ var validateResult = validMethodNames.Contains(MaybeRecoverInlineTransactionFunctionName(originalTransaction.MethodName))`
`219`	`219`	`&& originalTransaction.To == validAddress;`
`220`	`220`	`Assert(validateResult, "Invalid transaction.");`
`221`	`221`	`}`
	`222`	`+`
	`223`	`+ private static string MaybeRecoverInlineTransactionFunctionName(string methodName)`
	`224`	`+ {`
	`225`	`+ var parts = methodName.Split('.');`
	`226`	`+ return parts.Length > 1 ? parts[^2] : methodName;`
	`227`	`+ }`
`222`	`228`
`223`	`229`	`private void RegisterTokenInfo(TokenInfo tokenInfo)`
`224`	`230`	`{`