Contract.FetchAbi Helper (#174)

thirdweb-dev · Apr 10, 2024 · 9e90d61 · 9e90d61
1 parent ec4ce3e
commit 9e90d61
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 25 deletions.
diff --git a/Assets/Tests/CustomReadTests.cs b/Assets/Tests/CustomReadTests.cs
@@ -46,23 +46,21 @@ public IEnumerator GetContract_Success()
     }
 
     [UnityTest]
-    public IEnumerator Custom_WithoutAbi_FailNativeSucceedWebGL()
+    public IEnumerator Custom_WithoutAbi_Fetch()
     {
-        var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc20Address);
+        var abiTask = Contract.FetchAbi(_dropErc20Address, 421614);
+        yield return new WaitUntil(() => abiTask.IsCompleted);
+        if (abiTask.IsFaulted)
+            throw abiTask.Exception;
+        Assert.IsTrue(abiTask.IsCompletedSuccessfully);
+        Assert.NotNull(abiTask.Result);
+        var contract = ThirdwebManager.Instance.SDK.GetContract(_dropErc20Address, abiTask.Result);
         var readTask = contract.Read<BigInteger>("balanceOf", _dropErc20Address);
         yield return new WaitUntil(() => readTask.IsCompleted);
-        if (Utils.IsWebGLBuild())
-        {
-            if (readTask.IsFaulted)
-                throw readTask.Exception;
-            Assert.IsTrue(readTask.IsCompletedSuccessfully);
-            Assert.NotNull(readTask.Result);
-        }
-        else
-        {
-            Assert.IsTrue(readTask.IsFaulted);
-            Assert.AreEqual("You must pass an ABI for native platform custom calls", readTask.Exception.InnerException.Message);
-        }
+        if (readTask.IsFaulted)
+            throw readTask.Exception;
+        Assert.IsTrue(readTask.IsCompletedSuccessfully);
+        Assert.NotNull(readTask.Result);
     }
 
     [UnityTest]

diff --git a/Assets/Tests/SmartWalletTests.cs b/Assets/Tests/SmartWalletTests.cs
@@ -66,7 +66,7 @@ public IEnumerator CreateSessionKey_WithValidSignerCheck_Success()
         yield return Connect_WithGaslessManagedAccountFactory_Success();
 
         var task = ThirdwebManager.Instance.SDK.Wallet.CreateSessionKey(
-            signerAddress: "0x22b79AD6c6009525933ac2FF40bC9F30dF14Ecfb",
+            signerAddress: "0xA86F78b995a3899785FA1508eB1E62aEa501fc3c",
             approvedTargets: new List<string>() { "0x450b943729Ddba196Ab58b589Cea545551DF71CC" },
             nativeTokenLimitPerTransactionInWei: "0",
             permissionStartTimestamp: "0",
@@ -88,7 +88,7 @@ public IEnumerator CreateSessionKey_WithValidSignerCheck_Success()
         bool exists = false;
         foreach (var signer in getAllActiveSignersTask.Result)
         {
-            if (signer.signer == "0x22b79AD6c6009525933ac2FF40bC9F30dF14Ecfb")
+            if (signer.signer == "0xA86F78b995a3899785FA1508eB1E62aEa501fc3c")
             {
                 exists = true;
                 break;
@@ -120,7 +120,7 @@ public IEnumerator RevokeSessionKey_WithValidSignerCheck_Success()
     {
         yield return CreateSessionKey_WithValidSignerCheck_Success();
 
-        var task = ThirdwebManager.Instance.SDK.Wallet.RevokeSessionKey(signerAddress: "0x22b79AD6c6009525933ac2FF40bC9F30dF14Ecfb");
+        var task = ThirdwebManager.Instance.SDK.Wallet.RevokeSessionKey(signerAddress: "0xA86F78b995a3899785FA1508eB1E62aEa501fc3c");
         yield return new WaitUntil(() => task.IsCompleted);
         Assert.IsTrue(task.IsCompletedSuccessfully);
         Assert.IsNotNull(task.Result);
@@ -134,7 +134,7 @@ public IEnumerator RevokeSessionKey_WithValidSignerCheck_Success()
         bool exists = false;
         foreach (var signer in getAllActiveSignersTask.Result)
         {
-            if (signer.signer == "0x22b79AD6c6009525933ac2FF40bC9F30dF14Ecfb")
+            if (signer.signer == "0xA86F78b995a3899785FA1508eB1E62aEa501fc3c")
             {
                 exists = true;
                 break;

diff --git a/Assets/Thirdweb/Core/Scripts/Contract.cs b/Assets/Thirdweb/Core/Scripts/Contract.cs
@@ -10,6 +10,8 @@
 using Nethereum.Contracts;
 using Nethereum.RPC.Eth.DTOs;
 using Nethereum.ABI.FunctionEncoding.Attributes;
+using UnityEngine.Networking;
+using Thirdweb.Redcode.Awaiting;
 
 namespace Thirdweb
 {
@@ -198,7 +200,7 @@ public async Task<TransactionResult> Write(string functionName, TransactionReque
             else
             {
                 if (this.ABI == null)
-                    throw new UnityException("You must pass an ABI for native platform custom calls");
+                    this.ABI = await FetchAbi(this.Address, await ThirdwebManager.Instance.SDK.Wallet.GetChainId());
 
                 var contract = ThirdwebManager.Instance.SDK.Session.Web3.Eth.GetContract(this.ABI, this.Address);
 
@@ -256,7 +258,7 @@ public async Task<T> Read<T>(string functionName, params object[] args)
             }
 
             if (this.ABI == null)
-                throw new UnityException("You must pass an ABI for native platform custom calls");
+                this.ABI = await FetchAbi(this.Address, await ThirdwebManager.Instance.SDK.Wallet.GetChainId());
 
             var contract = Utils.GetWeb3().Eth.GetContract(this.ABI, this.Address);
             var function = contract.GetFunction(functionName);
@@ -392,13 +394,27 @@ public async Task<T> ReadRaw<T>(string functionName, params object[] args)
             }
 
             if (this.ABI == null)
-                throw new UnityException("You must pass an ABI for native platform custom calls");
+                this.ABI = await FetchAbi(this.Address, await ThirdwebManager.Instance.SDK.Wallet.GetChainId());
 
             var contract = Utils.GetWeb3().Eth.GetContract(this.ABI, this.Address);
             var function = contract.GetFunction(functionName);
             return await function.CallDeserializingToObjectAsync<T>(args);
         }
 
+        public static async Task<string> FetchAbi(string contractAddress, BigInteger chainId)
+        {
+            var url = $"https://contract.thirdweb.com/abi/{chainId}/{contractAddress}";
+            using (var request = UnityWebRequest.Get(url))
+            {
+                await request.SendWebRequest();
+                if (request.result != UnityWebRequest.Result.Success)
+                {
+                    throw new UnityException($"Failed to fetch ABI! Error: {request.error}");
+                }
+                return request.downloadHandler.text;
+            }
+        }
+
         private T ConvertValue<T>(object value)
         {
             if (value is T result)