[Cross-Platform] ZkCandy Sepolia AA Support (#201)

0xFirekeeper · web-flow · commit 5b590ddb6df1 · 2024-06-12T01:10:13.000+03:00
diff --git a/Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/SmartWallet.cs b/Assets/Thirdweb/Core/Scripts/AccountAbstraction/Core/SmartWallet.cs
@@ -51,7 +51,7 @@ public class SmartWallet
         public bool IsDeploying => _deploying;
 
         private readonly ThirdwebSDK _sdk;
-        private bool IsZkSync => _sdk.Session.ChainId == 300 || _sdk.Session.ChainId == 324;
+        private bool IsZkSync => Utils.IsZkSyncChain(_sdk.Session.ChainId);
 
         public SmartWallet(IThirdwebWallet personalWallet, ThirdwebSDK sdk)
         {
diff --git a/Assets/Thirdweb/Core/Scripts/Utils.cs b/Assets/Thirdweb/Core/Scripts/Utils.cs
@@ -780,5 +780,10 @@ public static Nethereum.Contracts.Function GetFunctionMatchSignature(Nethereum.C
             }
             throw new UnityException($"Can't find function {functionName} in contract {contract.Address}, that takes: {paramsCount} arguments");
         }
+
+        public static bool IsZkSyncChain(BigInteger chainId)
+        {
+            return chainId == 324 || chainId == 300 || chainId == 302;
+        }
     }
 }
diff --git a/Assets/Thirdweb/Core/Scripts/Wallet.cs b/Assets/Thirdweb/Core/Scripts/Wallet.cs
@@ -493,7 +493,7 @@ public async Task<string> SignTypedDataV4<T, TDomain>(T data, TypedData<TDomain>
                     if (_sdk.Session.ActiveWallet.GetProvider() == WalletProvider.SmartWallet)
                     {
                         // Zk AA
-                        if (_sdk.Session.ChainId == 300 || _sdk.Session.ChainId == 324)
+                        if (Utils.IsZkSyncChain(_sdk.Session.ChainId))
                         {
                             var hashToken = jsonObject.SelectToken("$.message.data");
                             if (hashToken != null)
diff --git a/Assets/WebGLTemplates/Thirdweb/lib/thirdweb-unity-bridge.js b/Assets/WebGLTemplates/Thirdweb/lib/thirdweb-unity-bridge.js

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public class SmartWallet`
`51`	`51`	`public bool IsDeploying => _deploying;`
`52`	`52`
`53`	`53`	`private readonly ThirdwebSDK _sdk;`
`54`		`- private bool IsZkSync => _sdk.Session.ChainId == 300 \|\| _sdk.Session.ChainId == 324;`
	`54`	`+ private bool IsZkSync => Utils.IsZkSyncChain(_sdk.Session.ChainId);`
`55`	`55`
`56`	`56`	`public SmartWallet(IThirdwebWallet personalWallet, ThirdwebSDK sdk)`
`57`	`57`	`{`
Original file line number	Diff line number	Diff line change
`@@ -780,5 +780,10 @@ public static Nethereum.Contracts.Function GetFunctionMatchSignature(Nethereum.C`
`780`	`780`	`}`
`781`	`781`	`throw new UnityException($"Can't find function {functionName} in contract {contract.Address}, that takes: {paramsCount} arguments");`
`782`	`782`	`}`
	`783`	`+`
	`784`	`+ public static bool IsZkSyncChain(BigInteger chainId)`
	`785`	`+ {`
	`786`	`+ return chainId == 324 \|\| chainId == 300 \|\| chainId == 302;`
	`787`	`+ }`
`783`	`788`	`}`
`784`	`789`	`}`
Original file line number	Diff line number	Diff line change
`@@ -493,7 +493,7 @@ public async Task<string> SignTypedDataV4<T, TDomain>(T data, TypedData<TDomain>`
`493`	`493`	`if (_sdk.Session.ActiveWallet.GetProvider() == WalletProvider.SmartWallet)`
`494`	`494`	`{`
`495`	`495`	`// Zk AA`
`496`		`- if (_sdk.Session.ChainId == 300 \|\| _sdk.Session.ChainId == 324)`
	`496`	`+ if (Utils.IsZkSyncChain(_sdk.Session.ChainId))`
`497`	`497`	`{`
`498`	`498`	`var hashToken = jsonObject.SelectToken("$.message.data");`
`499`	`499`	`if (hashToken != null)`