Use safer separators to handle ABIs with dots

joaquim-verges · joaquim-verges · commit ae271b5d2688 · 2022-11-28T10:53:12.000+13:00
diff --git a/Assets/Thirdweb/Scripts/Common.cs b/Assets/Thirdweb/Scripts/Common.cs
@@ -1,13 +1,20 @@
 namespace Thirdweb {
     public abstract class Routable {
+        public static string separator = "/";
+        public static string subSeparator = "#";
+
+        public static string append(string route, string subRoute) {
+            return $"{route}{separator}{subRoute}";
+        }
+
         protected string baseRoute;
 
         public Routable(string baseRoute) {
             this.baseRoute = baseRoute;
         }
 
         protected string getRoute(string functionName) {
-            return $"{baseRoute}.{functionName}";
+            return $"{baseRoute}{separator}{functionName}";
         }
     }
 }
diff --git a/Assets/Thirdweb/Scripts/Contract.cs b/Assets/Thirdweb/Scripts/Contract.cs
@@ -27,7 +27,7 @@ public class Contract : Routable
         /// </summary>
         public Marketplace marketplace;
 
-        public Contract(string chain, string address, string abi = null) : base(abi != null ? $"{address}#{abi}" : address)
+        public Contract(string chain, string address, string abi = null) : base(abi != null ? $"{address}{Routable.subSeparator}{abi}" : address)
         {
             this.chain = chain;
             this.address = address;
diff --git a/Assets/Thirdweb/Scripts/Deployer.cs b/Assets/Thirdweb/Scripts/Deployer.cs
@@ -5,8 +5,13 @@ namespace Thirdweb
     /// <summary>
     /// Deploy contracts to the blockchain.
     /// </summary>
-    public class Deployer
+    public class Deployer : Routable
     {
+
+        public Deployer() : base($"sdk{subSeparator}deployer")
+        {
+        }
+
         public async Task<string> DeployNFTCollection(NFTContractDeployMetadata metadata)
         {
             return await Bridge.InvokeRoute<string>(getRoute("deployNFTCollection"), Utils.ToJsonStringArray(metadata));
@@ -64,12 +69,6 @@ public async Task<string> DeployReleasedContract(string releaserAddress, string
         public async Task<string> DeployFromContractUri(string uri, object[] constructorParams) {
             return await Bridge.InvokeRoute<string>(getRoute("deployContractFromUri"), Utils.ToJsonStringArray(uri, constructorParams));
         }
-
-        /// PRIVATE
-
-        private string getRoute(string functionPath) {
-            return "sdk#deployer." + functionPath;
-        }
     }
 
     [System.Serializable]
diff --git a/Assets/Thirdweb/Scripts/ERC1155.cs b/Assets/Thirdweb/Scripts/ERC1155.cs
@@ -21,7 +21,7 @@ public class ERC1155 : Routable
         /// <summary>
         /// Interact with any ERC1155 compatible contract.
         /// </summary>
-        public ERC1155(string parentRoute) : base($"{parentRoute}.erc1155")
+        public ERC1155(string parentRoute) : base(Routable.append(parentRoute, "erc1155"))
         {
             this.signature = new ERC1155Signature(baseRoute);
             this.claimConditions = new ERC1155ClaimConditions(baseRoute);
@@ -173,7 +173,7 @@ public async Task<TransactionResult> MintAdditionalSupplyTo(string address, stri
     /// </summary>
     public class ERC1155ClaimConditions : Routable
     {
-        public ERC1155ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions") 
+        public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
         {
         }
 
@@ -310,7 +310,7 @@ public class ERC1155Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC1155Signature(string parentRoute) : base($"{parentRoute}.signature") 
+        public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/ERC20.cs b/Assets/Thirdweb/Scripts/ERC20.cs
@@ -20,7 +20,7 @@ public class ERC20 : Routable
         /// <summary>
         /// Interact with any ERC20 compatible contract.
         /// </summary>
-        public ERC20(string parentRoute) : base($"{parentRoute}.erc20")
+        public ERC20(string parentRoute) : base(Routable.append(parentRoute, "erc20"))
         {
             this.signature = new ERC20Signature(baseRoute);
             this.claimConditions = new ERC20ClaimConditions(baseRoute);
@@ -188,7 +188,7 @@ public struct ERC20SignedPayload
     #nullable enable
     public class ERC20ClaimConditions : Routable
     {
-        public ERC20ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions") 
+        public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
         {
         }
 
@@ -234,7 +234,7 @@ public class ERC20Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC20Signature(string parentRoute) : base($"{parentRoute}.signature") 
+        public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/ERC721.cs b/Assets/Thirdweb/Scripts/ERC721.cs
@@ -21,7 +21,7 @@ public class ERC721 : Routable
         /// <summary>
         /// Interact with any ERC721 compatible contract.
         /// </summary>
-        public ERC721(string parentRoute) : base($"{parentRoute}.erc721")
+        public ERC721(string parentRoute) : base(Routable.append(parentRoute, "erc721"))
         {
             this.signature = new ERC721Signature(baseRoute);
             this.claimConditions = new ERC721ClaimConditions(baseRoute);
@@ -176,7 +176,7 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)
     /// </summary>
     public class ERC721ClaimConditions : Routable
     {
-       public ERC721ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions") 
+       public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions")) 
         {
         }
 
@@ -214,7 +214,7 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)
     }
 
     [System.Serializable]
-#nullable enable
+    #nullable enable
     public class ERC721MintPayload
     {
         public string to;
@@ -278,7 +278,7 @@ public class ERC721Signature : Routable
         /// <summary>
         /// Generate, verify and mint signed mintable payloads
         /// </summary>
-        public ERC721Signature(string parentRoute) : base($"{parentRoute}.signature") 
+        public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature")) 
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/Marketplace.cs b/Assets/Thirdweb/Scripts/Marketplace.cs
@@ -22,7 +22,7 @@ public class Marketplace : Routable
         /// <summary>
         /// Interact with a Marketplace contract.
         /// </summary>
-        public Marketplace(string chain, string address) : base($"{address}#marketplace")
+        public Marketplace(string chain, string address) : base($"{address}{subSeparator}marketplace")
         {
             this.chain = chain;
             this.address = address;
@@ -87,7 +87,7 @@ public async Task<TransactionResult> MakeOffer(string listingId, string pricePer
 
     public class MarketplaceDirect : Routable
     {
-        public MarketplaceDirect(string parentRoute) : base($"{parentRoute}.direct")
+        public MarketplaceDirect(string parentRoute) : base(Routable.append(parentRoute, "direct"))
         {
         }
 
@@ -120,7 +120,7 @@ public async Task<TransactionResult> CancelListing(string listingId)
     // AUCTION
 
     public class MarketplaceAuction : Routable {
-        public MarketplaceAuction(string parentRoute) : base($"{parentRoute}.auction")
+        public MarketplaceAuction(string parentRoute) : base(Routable.append(parentRoute, "auction"))
         {
         }
 
diff --git a/Assets/Thirdweb/Scripts/Wallet.cs b/Assets/Thirdweb/Scripts/Wallet.cs
@@ -5,8 +5,12 @@ namespace Thirdweb
     /// <summary>
     /// Connect and Interact with a Wallet.
     /// </summary>
-    public class Wallet
+    public class Wallet : Routable
     {
+        public Wallet() : base($"sdk{subSeparator}wallet")
+        {
+        }
+        
         /// <summary>
         /// Connect a user's wallet via browser extension
         /// </summary>
@@ -21,7 +25,7 @@ public Task<string> Connect()
         /// <param name="domain">The domain to authenticate to</param>
         public async Task<LoginPayload> Authenticate(string domain) 
         {
-            return await Bridge.InvokeRoute<LoginPayload>("sdk#auth.login", Utils.ToJsonStringArray(domain));
+            return await Bridge.InvokeRoute<LoginPayload>($"sdk{subSeparator}auth{separator}login", Utils.ToJsonStringArray(domain));
         }
 
         /// <summary>
@@ -96,11 +100,5 @@ public async Task<TransactionResult> SendRawTransaction(TransactionRequest trans
         {
             return await Bridge.InvokeRoute<TransactionResult>(getRoute("sendRawTransaction"), Utils.ToJsonStringArray(transactionRequest));
         }
-
-        /// PRIVATE
-
-        private string getRoute(string functionPath) {
-            return "sdk#wallet." + functionPath;
-        }
     }
 }
diff --git a/Assets/WebGLTemplates/Thirdweb/lib/thirdweb.js b/Assets/WebGLTemplates/Thirdweb/lib/thirdweb.js
@@ -2,6 +2,9 @@
 import { ethers } from "./ethers.js";
 import { ThirdwebSDK } from "https://esm.sh/@thirdweb-dev/sdk?bundle";
 
+const separator = "/";
+const subSeparator = "#";
+
 // big number transform
 const bigNumberReplacer = (key, value) => {
   // if we find a BigNumber then make it into a string (since that is safe)
@@ -67,8 +70,8 @@ w.bridge.switchNetwork = async (chainId) => {
 };
 
 w.bridge.invoke = async (route, payload) => {
-  const routeArgs = route.split(".");
-  const firstArg = routeArgs[0].split("#");
+  const routeArgs = route.split(separator);
+  const firstArg = routeArgs[0].split(subSeparator);
   const addrOrSDK = firstArg[0];
 
   const fnArgs = JSON.parse(payload).arguments;

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,20 @@`
`1`	`1`	`namespace Thirdweb {`
`2`	`2`	`public abstract class Routable {`
	`3`	`+ public static string separator = "/";`
	`4`	`+ public static string subSeparator = "#";`
	`5`	`+`
	`6`	`+ public static string append(string route, string subRoute) {`
	`7`	`+ return $"{route}{separator}{subRoute}";`
	`8`	`+ }`
	`9`	`+`
`3`	`10`	`protected string baseRoute;`
`4`	`11`
`5`	`12`	`public Routable(string baseRoute) {`
`6`	`13`	`this.baseRoute = baseRoute;`
`7`	`14`	`}`
`8`	`15`
`9`	`16`	`protected string getRoute(string functionName) {`
`10`		`- return $"{baseRoute}.{functionName}";`
	`17`	`+ return $"{baseRoute}{separator}{functionName}";`
`11`	`18`	`}`
`12`	`19`	`}`
`13`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class Contract : Routable`
`27`	`27`	`/// </summary>`
`28`	`28`	`public Marketplace marketplace;`
`29`	`29`
`30`		`- public Contract(string chain, string address, string abi = null) : base(abi != null ? $"{address}#{abi}" : address)`
	`30`	`+ public Contract(string chain, string address, string abi = null) : base(abi != null ? $"{address}{Routable.subSeparator}{abi}" : address)`
`31`	`31`	`{`
`32`	`32`	`this.chain = chain;`
`33`	`33`	`this.address = address;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ERC1155 : Routable`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Interact with any ERC1155 compatible contract.`
`23`	`23`	`/// </summary>`
`24`		`- public ERC1155(string parentRoute) : base($"{parentRoute}.erc1155")`
	`24`	`+ public ERC1155(string parentRoute) : base(Routable.append(parentRoute, "erc1155"))`
`25`	`25`	`{`
`26`	`26`	`this.signature = new ERC1155Signature(baseRoute);`
`27`	`27`	`this.claimConditions = new ERC1155ClaimConditions(baseRoute);`
`@@ -173,7 +173,7 @@ public async Task<TransactionResult> MintAdditionalSupplyTo(string address, stri`
`173`	`173`	`/// </summary>`
`174`	`174`	`public class ERC1155ClaimConditions : Routable`
`175`	`175`	`{`
`176`		`- public ERC1155ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions")`
	`176`	`+ public ERC1155ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`177`	`177`	`{`
`178`	`178`	`}`
`179`	`179`
`@@ -310,7 +310,7 @@ public class ERC1155Signature : Routable`
`310`	`310`	`/// <summary>`
`311`	`311`	`/// Generate, verify and mint signed mintable payloads`
`312`	`312`	`/// </summary>`
`313`		`- public ERC1155Signature(string parentRoute) : base($"{parentRoute}.signature")`
	`313`	`+ public ERC1155Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`314`	`314`	`{`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ public class ERC20 : Routable`
`20`	`20`	`/// <summary>`
`21`	`21`	`/// Interact with any ERC20 compatible contract.`
`22`	`22`	`/// </summary>`
`23`		`- public ERC20(string parentRoute) : base($"{parentRoute}.erc20")`
	`23`	`+ public ERC20(string parentRoute) : base(Routable.append(parentRoute, "erc20"))`
`24`	`24`	`{`
`25`	`25`	`this.signature = new ERC20Signature(baseRoute);`
`26`	`26`	`this.claimConditions = new ERC20ClaimConditions(baseRoute);`
`@@ -188,7 +188,7 @@ public struct ERC20SignedPayload`
`188`	`188`	`#nullable enable`
`189`	`189`	`public class ERC20ClaimConditions : Routable`
`190`	`190`	`{`
`191`		`- public ERC20ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions")`
	`191`	`+ public ERC20ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`192`	`192`	`{`
`193`	`193`	`}`
`194`	`194`
`@@ -234,7 +234,7 @@ public class ERC20Signature : Routable`
`234`	`234`	`/// <summary>`
`235`	`235`	`/// Generate, verify and mint signed mintable payloads`
`236`	`236`	`/// </summary>`
`237`		`- public ERC20Signature(string parentRoute) : base($"{parentRoute}.signature")`
	`237`	`+ public ERC20Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`238`	`238`	`{`
`239`	`239`	`}`
`240`	`240`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class ERC721 : Routable`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// Interact with any ERC721 compatible contract.`
`23`	`23`	`/// </summary>`
`24`		`- public ERC721(string parentRoute) : base($"{parentRoute}.erc721")`
	`24`	`+ public ERC721(string parentRoute) : base(Routable.append(parentRoute, "erc721"))`
`25`	`25`	`{`
`26`	`26`	`this.signature = new ERC721Signature(baseRoute);`
`27`	`27`	`this.claimConditions = new ERC721ClaimConditions(baseRoute);`
`@@ -176,7 +176,7 @@ public async Task<TransactionResult> MintTo(string address, NFTMetadata nft)`
`176`	`176`	`/// </summary>`
`177`	`177`	`public class ERC721ClaimConditions : Routable`
`178`	`178`	`{`
`179`		`- public ERC721ClaimConditions(string parentRoute) : base($"{parentRoute}.claimConditions")`
	`179`	`+ public ERC721ClaimConditions(string parentRoute) : base(Routable.append(parentRoute, "claimConditions"))`
`180`	`180`	`{`
`181`	`181`	`}`
`182`	`182`
`@@ -214,7 +214,7 @@ public async Task<bool> GetClaimerProofs(string claimerAddress)`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`[System.Serializable]`
`217`		`-#nullable enable`
	`217`	`+ #nullable enable`
`218`	`218`	`public class ERC721MintPayload`
`219`	`219`	`{`
`220`	`220`	`public string to;`
`@@ -278,7 +278,7 @@ public class ERC721Signature : Routable`
`278`	`278`	`/// <summary>`
`279`	`279`	`/// Generate, verify and mint signed mintable payloads`
`280`	`280`	`/// </summary>`
`281`		`- public ERC721Signature(string parentRoute) : base($"{parentRoute}.signature")`
	`281`	`+ public ERC721Signature(string parentRoute) : base(Routable.append(parentRoute, "signature"))`
`282`	`282`	`{`
`283`	`283`	`}`
`284`	`284`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public class Marketplace : Routable`
`22`	`22`	`/// <summary>`
`23`	`23`	`/// Interact with a Marketplace contract.`
`24`	`24`	`/// </summary>`
`25`		`- public Marketplace(string chain, string address) : base($"{address}#marketplace")`
	`25`	`+ public Marketplace(string chain, string address) : base($"{address}{subSeparator}marketplace")`
`26`	`26`	`{`
`27`	`27`	`this.chain = chain;`
`28`	`28`	`this.address = address;`
`@@ -87,7 +87,7 @@ public async Task<TransactionResult> MakeOffer(string listingId, string pricePer`
`87`	`87`
`88`	`88`	`public class MarketplaceDirect : Routable`
`89`	`89`	`{`
`90`		`- public MarketplaceDirect(string parentRoute) : base($"{parentRoute}.direct")`
	`90`	`+ public MarketplaceDirect(string parentRoute) : base(Routable.append(parentRoute, "direct"))`
`91`	`91`	`{`
`92`	`92`	`}`
`93`	`93`
`@@ -120,7 +120,7 @@ public async Task<TransactionResult> CancelListing(string listingId)`
`120`	`120`	`// AUCTION`
`121`	`121`
`122`	`122`	`public class MarketplaceAuction : Routable {`
`123`		`- public MarketplaceAuction(string parentRoute) : base($"{parentRoute}.auction")`
	`123`	`+ public MarketplaceAuction(string parentRoute) : base(Routable.append(parentRoute, "auction"))`
`124`	`124`	`{`
`125`	`125`	`}`
`126`	`126`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,12 @@ namespace Thirdweb`
`5`	`5`	`/// <summary>`
`6`	`6`	`/// Connect and Interact with a Wallet.`
`7`	`7`	`/// </summary>`
`8`		`- public class Wallet`
	`8`	`+ public class Wallet : Routable`
`9`	`9`	`{`
	`10`	`+ public Wallet() : base($"sdk{subSeparator}wallet")`
	`11`	`+ {`
	`12`	`+ }`
	`13`	`+`
`10`	`14`	`/// <summary>`
`11`	`15`	`/// Connect a user's wallet via browser extension`
`12`	`16`	`/// </summary>`
`@@ -21,7 +25,7 @@ public Task<string> Connect()`
`21`	`25`	`/// <param name="domain">The domain to authenticate to</param>`
`22`	`26`	`public async Task<LoginPayload> Authenticate(string domain)`
`23`	`27`	`{`
`24`		`- return await Bridge.InvokeRoute<LoginPayload>("sdk#auth.login", Utils.ToJsonStringArray(domain));`
	`28`	`+ return await Bridge.InvokeRoute<LoginPayload>($"sdk{subSeparator}auth{separator}login", Utils.ToJsonStringArray(domain));`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`/// <summary>`
`@@ -96,11 +100,5 @@ public async Task<TransactionResult> SendRawTransaction(TransactionRequest trans`
`96`	`100`	`{`
`97`	`101`	`return await Bridge.InvokeRoute<TransactionResult>(getRoute("sendRawTransaction"), Utils.ToJsonStringArray(transactionRequest));`
`98`	`102`	`}`
`99`		`-`
`100`		`- /// PRIVATE`
`101`		`-`
`102`		`- private string getRoute(string functionPath) {`
`103`		`- return "sdk#wallet." + functionPath;`
`104`		`- }`
`105`	`103`	`}`
`106`	`104`	`}`