Passing the ABI to underlying libraries to apply to respective routes.

0xFirekeeper · 0xFirekeeper · commit 88dfe830e9f6 · 2022-11-23T12:48:50.000+03:00
This allows the use of ERC20, ERC721, ERC1155 shorthands with custom contracts implementing said interfaces.
diff --git a/Assets/Thirdweb/Scripts/Contract.cs b/Assets/Thirdweb/Scripts/Contract.cs
@@ -27,13 +27,14 @@ public class Contract
         /// </summary>
         public Marketplace marketplace;
 
-        public Contract(string chain, string address, string abi = null) {
+        public Contract(string chain, string address, string abi = null)
+        {
             this.chain = chain;
             this.address = address;
             this.abi = abi;
-            this.ERC20 = new ERC20(chain, address);
-            this.ERC721 = new ERC721(chain, address);
-            this.ERC1155 = new ERC1155(chain, address);
+            this.ERC20 = new ERC20(chain, address, abi);
+            this.ERC721 = new ERC721(chain, address, abi);
+            this.ERC1155 = new ERC1155(chain, address, abi);
             this.marketplace = new Marketplace(chain, address);
         }
 
@@ -45,7 +46,7 @@ public Contract(string chain, string address, string abi = null) {
         /// <returns>The data deserialized to the given typed</returns>
         public async Task<T> Read<T>(string functionName, params object[] args)
         {
-            string [] argsEncoded = new string[args.Length + 1];
+            string[] argsEncoded = new string[args.Length + 1];
             argsEncoded[0] = functionName;
             Utils.ToJsonStringArray(args).CopyTo(argsEncoded, 1);
             return await Bridge.InvokeRoute<T>(getRoute("call"), argsEncoded);
@@ -59,18 +60,15 @@ public async Task<T> Read<T>(string functionName, params object[] args)
         /// <returns>The transaction receipt</returns>
         public async Task<TransactionResult> Write(string functionName, params object[] args)
         {
-            string [] argsEncoded = new string[args.Length + 1];
+            string[] argsEncoded = new string[args.Length + 1];
             argsEncoded[0] = functionName;
             Utils.ToJsonStringArray(args).CopyTo(argsEncoded, 1);
             return await Bridge.InvokeRoute<TransactionResult>(getRoute("call"), argsEncoded);
         }
 
-        private string getRoute(string functionPath) {
-            if (abi != null) {
-                return this.address + "#" + abi + "." + functionPath;
-            } else {
-                return this.address + "." + functionPath;
-            }
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + "." + functionPath : this.address + "." + functionPath;
         }
     }
 }
diff --git a/Assets/Thirdweb/Scripts/ERC1155.cs b/Assets/Thirdweb/Scripts/ERC1155.cs
@@ -15,18 +15,19 @@ public class ERC1155
         /// Handle signature minting functionality
         /// </summary>
         public ERC1155Signature signature;
-                /// <summary>
+        /// <summary>
         /// Query claim conditions
         /// </summary>
         public ERC1155ClaimConditions claimConditions;
 
         /// <summary>
         /// Interact with any ERC1155 compatible contract.
         /// </summary>
-        public ERC1155(string chain, string address)
+        public ERC1155(string chain, string address, string abi = null)
         {
             this.chain = chain;
             this.address = address;
+            this.abi = abi;
             this.signature = new ERC1155Signature(chain, address);
             this.claimConditions = new ERC1155ClaimConditions(chain, address);
         }
@@ -69,7 +70,7 @@ public async Task<string> Balance(string tokenId)
         /// <summary>
         /// Get the balance of the given NFT for the given wallet address
         /// </summary>
-        public async Task<string> BalanceOf(string address, string tokenId) 
+        public async Task<string> BalanceOf(string address, string tokenId)
         {
             return await Bridge.InvokeRoute<string>(getRoute("balanceOf"), Utils.ToJsonStringArray(address, tokenId));
         }
@@ -173,12 +174,13 @@ public async Task<TransactionResult> MintAdditionalSupplyTo(string address, stri
 
         // PRIVATE
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc1155." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc1155." + functionPath : this.address + ".erc1155." + functionPath;
         }
     }
 
-     /// <summary>
+    /// <summary>
     /// Fetch claim conditions for a given ERC1155 drop contract
     /// </summary>
     public class ERC1155ClaimConditions
@@ -224,14 +226,15 @@ public async Task<bool> GetClaimerProofs(string tokenId, string claimerAddress)
             return await Bridge.InvokeRoute<bool>(getRoute("getClaimerProofs"), Utils.ToJsonStringArray(claimerAddress));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc1155.claimConditions." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc1155.claimConditions." + functionPath : this.address + ".erc1155.claimConditions." + functionPath;
         }
     }
 
     // TODO switch to another JSON serializer that supports polymorphism
     [System.Serializable]
-    #nullable enable
+#nullable enable
     public class ERC1155MintPayload
     {
         public string to;
@@ -247,7 +250,8 @@ public class ERC1155MintPayload
         // public long mintStartTime;
         // public long mintEndTime;
 
-        public ERC1155MintPayload(string receiverAddress, NFTMetadata metadata) {
+        public ERC1155MintPayload(string receiverAddress, NFTMetadata metadata)
+        {
             this.metadata = metadata;
             this.to = receiverAddress;
             this.price = "0";
@@ -279,7 +283,8 @@ public class ERC1155MintAdditionalPayload
         // public long mintStartTime;
         // public long mintEndTime;
 
-        public ERC1155MintAdditionalPayload(string receiverAddress, string tokenId) {
+        public ERC1155MintAdditionalPayload(string receiverAddress, string tokenId)
+        {
             this.tokenId = tokenId;
             this.to = receiverAddress;
             this.price = "0";
@@ -350,8 +355,9 @@ public async Task<TransactionResult> Mint(ERC1155SignedPayload signedPayload)
             return await Bridge.InvokeRoute<TransactionResult>(getRoute("mint"), Utils.ToJsonStringArray(signedPayload));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc1155.signature." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc1155.signature." + functionPath : this.address + ".erc1155.signature." + functionPath;
         }
     }
 }
diff --git a/Assets/Thirdweb/Scripts/ERC20.cs b/Assets/Thirdweb/Scripts/ERC20.cs
@@ -22,10 +22,11 @@ public class ERC20
         /// <summary>
         /// Interact with any ERC20 compatible contract.
         /// </summary>
-        public ERC20(string chain, string address)
+        public ERC20(string chain, string address, string abi = null)
         {
             this.chain = chain;
             this.address = address;
+            this.abi = null;
             this.signature = new ERC20Signature(chain, address);
             this.claimConditions = new ERC20ClaimConditions(chain, address);
         }
@@ -140,13 +141,14 @@ public async Task<TransactionResult> MintTo(string address, string amount)
 
         // PRIVATE
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc20." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc20." + functionPath : this.address + ".erc20." + functionPath;
         }
     }
 
     [System.Serializable]
-    #nullable enable
+#nullable enable
     public class ERC20MintPayload
     {
         public string to;
@@ -159,7 +161,8 @@ public class ERC20MintPayload
         // public long mintStartTime;
         // public long mintEndTime;
 
-        public ERC20MintPayload(string receiverAddress, string quantity) {
+        public ERC20MintPayload(string receiverAddress, string quantity)
+        {
             this.to = receiverAddress;
             this.quantity = quantity;
             this.price = "0";
@@ -239,8 +242,9 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)
             return await Bridge.InvokeRoute<bool>(getRoute("getClaimerProofs"), Utils.ToJsonStringArray(claimerAddress));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc20.claimConditions." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc20.claimConditions." + functionPath : this.address + ".erc20.claimConditions." + functionPath;
         }
     }
 
@@ -286,8 +290,9 @@ public async Task<TransactionResult> Mint(ERC20SignedPayload signedPayload)
             return await Bridge.InvokeRoute<TransactionResult>(getRoute("mint"), Utils.ToJsonStringArray(signedPayload));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc20.signature." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc20.signature." + functionPath : this.address + ".erc20.signature." + functionPath;
         }
     }
 }
diff --git a/Assets/Thirdweb/Scripts/ERC721.cs b/Assets/Thirdweb/Scripts/ERC721.cs
@@ -23,10 +23,11 @@ public class ERC721
         /// <summary>
         /// Interact with any ERC721 compatible contract.
         /// </summary>
-        public ERC721(string chain, string address)
+        public ERC721(string chain, string address, string abi = null)
         {
             this.chain = chain;
             this.address = address;
+            this.abi = null;
             this.signature = new ERC721Signature(chain, address);
             this.claimConditions = new ERC721ClaimConditions(chain, address);
         }
@@ -176,8 +177,9 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)
 
         // PRIVATE
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc721." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc721." + functionPath : this.address + ".erc721." + functionPath;
         }
     }
 
@@ -228,13 +230,14 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)
             return await Bridge.InvokeRoute<bool>(getRoute("getClaimerProofs"), Utils.ToJsonStringArray(claimerAddress));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc721.claimConditions." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc721.claimConditions." + functionPath : this.address + ".erc721.claimConditions." + functionPath;
         }
     }
 
     [System.Serializable]
-    #nullable enable
+#nullable enable
     public class ERC721MintPayload
     {
         public string to;
@@ -250,7 +253,8 @@ public class ERC721MintPayload
         // public long mintStartTime;
         // public long mintEndTime;
 
-        public ERC721MintPayload(string receiverAddress, NFTMetadata metadata) {
+        public ERC721MintPayload(string receiverAddress, NFTMetadata metadata)
+        {
             this.metadata = metadata;
             this.to = receiverAddress;
             this.price = "0";
@@ -315,8 +319,9 @@ public async Task<TransactionResult> Mint(ERC721SignedPayload signedPayload)
             return await Bridge.InvokeRoute<TransactionResult>(getRoute("mint"), Utils.ToJsonStringArray(signedPayload));
         }
 
-        private string getRoute(string functionPath) {
-            return this.address + ".erc721.signature." + functionPath;
+        private string getRoute(string functionPath)
+        {
+            return abi != null ? this.address + "#" + abi + ".erc721.signature." + functionPath : this.address + ".erc721.signature." + functionPath;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,11 @@ public class ERC20`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// Interact with any ERC20 compatible contract.`
`24`	`24`	`/// </summary>`
`25`		`- public ERC20(string chain, string address)`
	`25`	`+ public ERC20(string chain, string address, string abi = null)`
`26`	`26`	`{`
`27`	`27`	`this.chain = chain;`
`28`	`28`	`this.address = address;`
	`29`	`+ this.abi = null;`
`29`	`30`	`this.signature = new ERC20Signature(chain, address);`
`30`	`31`	`this.claimConditions = new ERC20ClaimConditions(chain, address);`
`31`	`32`	`}`
`@@ -140,13 +141,14 @@ public async Task<TransactionResult> MintTo(string address, string amount)`
`140`	`141`
`141`	`142`	`// PRIVATE`
`142`	`143`
`143`		`- private string getRoute(string functionPath) {`
`144`		`- return this.address + ".erc20." + functionPath;`
	`144`	`+ private string getRoute(string functionPath)`
	`145`	`+ {`
	`146`	`+ return abi != null ? this.address + "#" + abi + ".erc20." + functionPath : this.address + ".erc20." + functionPath;`
`145`	`147`	`}`
`146`	`148`	`}`
`147`	`149`
`148`	`150`	`[System.Serializable]`
`149`		`- #nullable enable`
	`151`	`+#nullable enable`
`150`	`152`	`public class ERC20MintPayload`
`151`	`153`	`{`
`152`	`154`	`public string to;`
`@@ -159,7 +161,8 @@ public class ERC20MintPayload`
`159`	`161`	`// public long mintStartTime;`
`160`	`162`	`// public long mintEndTime;`
`161`	`163`
`162`		`- public ERC20MintPayload(string receiverAddress, string quantity) {`
	`164`	`+ public ERC20MintPayload(string receiverAddress, string quantity)`
	`165`	`+ {`
`163`	`166`	`this.to = receiverAddress;`
`164`	`167`	`this.quantity = quantity;`
`165`	`168`	`this.price = "0";`
`@@ -239,8 +242,9 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)`
`239`	`242`	`return await Bridge.InvokeRoute<bool>(getRoute("getClaimerProofs"), Utils.ToJsonStringArray(claimerAddress));`
`240`	`243`	`}`
`241`	`244`
`242`		`- private string getRoute(string functionPath) {`
`243`		`- return this.address + ".erc20.claimConditions." + functionPath;`
	`245`	`+ private string getRoute(string functionPath)`
	`246`	`+ {`
	`247`	`+ return abi != null ? this.address + "#" + abi + ".erc20.claimConditions." + functionPath : this.address + ".erc20.claimConditions." + functionPath;`
`244`	`248`	`}`
`245`	`249`	`}`
`246`	`250`
`@@ -286,8 +290,9 @@ public async Task<TransactionResult> Mint(ERC20SignedPayload signedPayload)`
`286`	`290`	`return await Bridge.InvokeRoute<TransactionResult>(getRoute("mint"), Utils.ToJsonStringArray(signedPayload));`
`287`	`291`	`}`
`288`	`292`
`289`		`- private string getRoute(string functionPath) {`
`290`		`- return this.address + ".erc20.signature." + functionPath;`
	`293`	`+ private string getRoute(string functionPath)`
	`294`	`+ {`
	`295`	`+ return abi != null ? this.address + "#" + abi + ".erc20.signature." + functionPath : this.address + ".erc20.signature." + functionPath;`
`291`	`296`	`}`
`292`	`297`	`}`
`293`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,10 +23,11 @@ public class ERC721`
`23`	`23`	`/// <summary>`
`24`	`24`	`/// Interact with any ERC721 compatible contract.`
`25`	`25`	`/// </summary>`
`26`		`- public ERC721(string chain, string address)`
	`26`	`+ public ERC721(string chain, string address, string abi = null)`
`27`	`27`	`{`
`28`	`28`	`this.chain = chain;`
`29`	`29`	`this.address = address;`
	`30`	`+ this.abi = null;`
`30`	`31`	`this.signature = new ERC721Signature(chain, address);`
`31`	`32`	`this.claimConditions = new ERC721ClaimConditions(chain, address);`
`32`	`33`	`}`
`@@ -176,8 +177,9 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)`
`176`	`177`
`177`	`178`	`// PRIVATE`
`178`	`179`
`179`		`- private string getRoute(string functionPath) {`
`180`		`- return this.address + ".erc721." + functionPath;`
	`180`	`+ private string getRoute(string functionPath)`
	`181`	`+ {`
	`182`	`+ return abi != null ? this.address + "#" + abi + ".erc721." + functionPath : this.address + ".erc721." + functionPath;`
`181`	`183`	`}`
`182`	`184`	`}`
`183`	`185`
`@@ -228,13 +230,14 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)`
`228`	`230`	`return await Bridge.InvokeRoute<bool>(getRoute("getClaimerProofs"), Utils.ToJsonStringArray(claimerAddress));`
`229`	`231`	`}`
`230`	`232`
`231`		`- private string getRoute(string functionPath) {`
`232`		`- return this.address + ".erc721.claimConditions." + functionPath;`
	`233`	`+ private string getRoute(string functionPath)`
	`234`	`+ {`
	`235`	`+ return abi != null ? this.address + "#" + abi + ".erc721.claimConditions." + functionPath : this.address + ".erc721.claimConditions." + functionPath;`
`233`	`236`	`}`
`234`	`237`	`}`
`235`	`238`
`236`	`239`	`[System.Serializable]`
`237`		`- #nullable enable`
	`240`	`+#nullable enable`
`238`	`241`	`public class ERC721MintPayload`
`239`	`242`	`{`
`240`	`243`	`public string to;`
`@@ -250,7 +253,8 @@ public class ERC721MintPayload`
`250`	`253`	`// public long mintStartTime;`
`251`	`254`	`// public long mintEndTime;`
`252`	`255`
`253`		`- public ERC721MintPayload(string receiverAddress, NFTMetadata metadata) {`
	`256`	`+ public ERC721MintPayload(string receiverAddress, NFTMetadata metadata)`
	`257`	`+ {`
`254`	`258`	`this.metadata = metadata;`
`255`	`259`	`this.to = receiverAddress;`
`256`	`260`	`this.price = "0";`
`@@ -315,8 +319,9 @@ public async Task<TransactionResult> Mint(ERC721SignedPayload signedPayload)`
`315`	`319`	`return await Bridge.InvokeRoute<TransactionResult>(getRoute("mint"), Utils.ToJsonStringArray(signedPayload));`
`316`	`320`	`}`
`317`	`321`
`318`		`- private string getRoute(string functionPath) {`
`319`		`- return this.address + ".erc721.signature." + functionPath;`
	`322`	`+ private string getRoute(string functionPath)`
	`323`	`+ {`
	`324`	`+ return abi != null ? this.address + "#" + abi + ".erc721.signature." + functionPath : this.address + ".erc721.signature." + functionPath;`
`320`	`325`	`}`
`321`	`326`	`}`
`322`	`327`	`}`