Fix packContents fetching on webGL (#51)

joaquim-verges · web-flow · commit 8b516f1a99b1 · 2023-03-22T20:51:59.000-07:00
diff --git a/Assets/Thirdweb/Core/Scripts/Pack.cs b/Assets/Thirdweb/Core/Scripts/Pack.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Numerics;
 using System.Threading.Tasks;
@@ -20,8 +19,7 @@ public class Pack : Routable
         /// <summary>
         /// Interact with a Marketplace contract.
         /// </summary>
-        public Pack(string chain, string address)
-            : base($"{address}{subSeparator}pack")
+        public Pack(string chain, string address) : base($"{address}{subSeparator}pack")
         {
             this.chain = chain;
             this.contractAddress = address;
@@ -193,14 +191,17 @@ public async Task<PackContents> GetPackContents(string packId)
                 var erc20R = new List<ERC20Contents>();
                 var erc721R = new List<ERC721Contents>();
                 var erc1155R = new List<ERC1155Contents>();
-                foreach (var tokenReward in packContents.Contents)
+                for (int i = 0; i < packContents.Contents.Count; i++)
                 {
+                    var tokenReward = packContents.Contents[i];
+                    var amount = packContents.PerUnitAmounts[i];
                     switch (tokenReward.TokenType)
                     {
                         case 0:
                             var tempERC20 = new ERC20Contents();
                             tempERC20.contractAddress = tokenReward.AssetContract;
-                            tempERC20.quantityPerReward = tokenReward.TotalAmount.ToString();
+                            tempERC20.quantityPerReward = amount.ToString().ToEth(18);
+                            tempERC20.totalRewards = (tokenReward.TotalAmount / amount).ToString().ToEth(18);
                             erc20R.Add(tempERC20);
                             break;
                         case 1:
@@ -213,17 +214,18 @@ public async Task<PackContents> GetPackContents(string packId)
                             var tempERC1155 = new ERC1155Contents();
                             tempERC1155.contractAddress = tokenReward.AssetContract;
                             tempERC1155.tokenId = tokenReward.TokenId.ToString();
-                            tempERC1155.quantityPerReward = tokenReward.TotalAmount.ToString();
+                            tempERC1155.quantityPerReward = amount.ToString();
+                            tempERC1155.totalRewards = (tokenReward.TotalAmount / amount).ToString();
                             erc1155R.Add(tempERC1155);
                             break;
                         default:
                             break;
                     }
                 }
                 PackContents contents = new PackContents();
-                contents.erc20Contents = erc20R;
-                contents.erc721Contents = erc721R;
-                contents.erc1155Contents = erc1155R;
+                contents.erc20Rewards = erc20R;
+                contents.erc721Rewards = erc721R;
+                contents.erc1155Rewards = erc1155R;
                 return contents;
             }
         }
@@ -406,20 +408,20 @@ public override string ToString()
     [System.Serializable]
     public class PackContents
     {
-        public List<ERC20Contents> erc20Contents;
-        public List<ERC721Contents> erc721Contents;
-        public List<ERC1155Contents> erc1155Contents;
+        public List<ERC20Contents> erc20Rewards;
+        public List<ERC721Contents> erc721Rewards;
+        public List<ERC1155Contents> erc1155Rewards;
 
         public override string ToString()
         {
-            string erc20str = "ERC20 Contents:\n";
-            foreach (var content in erc20Contents)
+            string erc20str = "\n";
+            foreach (var content in erc20Rewards)
                 erc20str += content.ToString();
-            string erc721str = "ERC721 Contents:\n";
-            foreach (var content in erc721Contents)
+            string erc721str = "\n";
+            foreach (var content in erc721Rewards)
                 erc721str += content.ToString();
-            string erc1155str = "ERC1155 Contents:\n";
-            foreach (var content in erc1155Contents)
+            string erc1155str = "\n";
+            foreach (var content in erc1155Rewards)
                 erc1155str += content.ToString();
             return "PackContents:\n" + erc20str + erc721str + erc1155str;
         }
@@ -462,7 +464,7 @@ public class ERC20Contents : ERC20Reward
 
         public override string ToString()
         {
-            return "ERC20Contents:\n" + $"totalRewards: {totalRewards.ToString()}\n" + base.ToString();
+            return base.ToString() + $"totalRewards: {totalRewards.ToString()}\n";
         }
     }
 
@@ -504,7 +506,7 @@ public class ERC1155Reward
 
         public override string ToString()
         {
-            return "ERC1155Reward:\n" + $"contractAddress: {contractAddress.ToString()}\n" + $"tokenId: {tokenId.ToString()}\n" + $"contractAddress: {tokenId.ToString()}\n";
+            return "ERC1155Reward:\n" + $"contractAddress: {contractAddress.ToString()}\n" + $"tokenId: {tokenId.ToString()}\n" + $"quantityPerReward: {quantityPerReward.ToString()}\n";
         }
     }
 
@@ -515,7 +517,7 @@ public class ERC1155Contents : ERC1155Reward
 
         public override string ToString()
         {
-            return "ERC1155Contents:\n" + $"totalRewards: {totalRewards.ToString()}\n" + base.ToString();
+            return base.ToString() + $"totalRewards: {totalRewards.ToString()}\n";
         }
     }
 }
diff --git a/Assets/Thirdweb/Core/Scripts/Utils.cs b/Assets/Thirdweb/Core/Scripts/Utils.cs
@@ -151,7 +151,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL
         {
             List<Thirdweb.Contracts.Pack.ContractDefinition.Token> tokenList = new List<Contracts.Pack.ContractDefinition.Token>();
             // Add ERC20 Rewards
-            foreach (var erc20Reward in packContents.erc20Contents)
+            foreach (var erc20Reward in packContents.erc20Rewards)
             {
                 tokenList.Add(
                     new Thirdweb.Contracts.Pack.ContractDefinition.Token()
@@ -164,7 +164,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL
                 );
             }
             // Add ERC721 Rewards
-            foreach (var erc721Reward in packContents.erc721Contents)
+            foreach (var erc721Reward in packContents.erc721Rewards)
             {
                 tokenList.Add(
                     new Thirdweb.Contracts.Pack.ContractDefinition.Token()
@@ -177,7 +177,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL
                 );
             }
             // Add ERC1155 Rewards
-            foreach (var erc1155Reward in packContents.erc1155Contents)
+            foreach (var erc1155Reward in packContents.erc1155Rewards)
             {
                 tokenList.Add(
                     new Thirdweb.Contracts.Pack.ContractDefinition.Token()
@@ -196,17 +196,17 @@ public static List<BigInteger> ToPackRewardUnitsList(this PackContents packConte
         {
             List<BigInteger> rewardUnits = new List<BigInteger>();
             // Add ERC20 Rewards
-            foreach (var content in packContents.erc20Contents)
+            foreach (var content in packContents.erc20Rewards)
             {
                 rewardUnits.Add(BigInteger.Parse(content.quantityPerReward.ToWei()));
             }
             // Add ERC721 Rewards
-            foreach (var content in packContents.erc721Contents)
+            foreach (var content in packContents.erc721Rewards)
             {
                 rewardUnits.Add(1);
             }
             // Add ERC1155 Rewards
-            foreach (var content in packContents.erc1155Contents)
+            foreach (var content in packContents.erc1155Rewards)
             {
                 rewardUnits.Add(BigInteger.Parse(content.quantityPerReward));
             }
diff --git a/Assets/Thirdweb/Examples/Scripts/Prefabs/Prefab_Reading.cs b/Assets/Thirdweb/Examples/Scripts/Prefabs/Prefab_Reading.cs
@@ -93,7 +93,7 @@ public async void FetchPackContents()
             Contract contract = ThirdwebManager.Instance.SDK.GetContract(PACK_CONTRACT);
 
             PackContents packContents = await contract.pack.GetPackContents("0");
-            Debugger.Instance.Log("[Fetch Pack Contents] Pack #0", "ERC721 Contents:\n" + packContents.erc721Contents[0].ToString());
+            Debugger.Instance.Log("[Fetch Pack Contents] Pack #0", packContents.ToString());
         }
         catch (System.Exception e)
         {
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
`@@ -1,4 +1,3 @@`
`1`		`-using System;`
`2`	`1`	`using System.Collections.Generic;`
`3`	`2`	`using System.Numerics;`
`4`	`3`	`using System.Threading.Tasks;`
`@@ -20,8 +19,7 @@ public class Pack : Routable`
`20`	`19`	`/// <summary>`
`21`	`20`	`/// Interact with a Marketplace contract.`
`22`	`21`	`/// </summary>`
`23`		`- public Pack(string chain, string address)`
`24`		`- : base($"{address}{subSeparator}pack")`
	`22`	`+ public Pack(string chain, string address) : base($"{address}{subSeparator}pack")`
`25`	`23`	`{`
`26`	`24`	`this.chain = chain;`
`27`	`25`	`this.contractAddress = address;`
`@@ -193,14 +191,17 @@ public async Task<PackContents> GetPackContents(string packId)`
`193`	`191`	`var erc20R = new List<ERC20Contents>();`
`194`	`192`	`var erc721R = new List<ERC721Contents>();`
`195`	`193`	`var erc1155R = new List<ERC1155Contents>();`
`196`		`- foreach (var tokenReward in packContents.Contents)`
	`194`	`+ for (int i = 0; i < packContents.Contents.Count; i++)`
`197`	`195`	`{`
	`196`	`+ var tokenReward = packContents.Contents[i];`
	`197`	`+ var amount = packContents.PerUnitAmounts[i];`
`198`	`198`	`switch (tokenReward.TokenType)`
`199`	`199`	`{`
`200`	`200`	`case 0:`
`201`	`201`	`var tempERC20 = new ERC20Contents();`
`202`	`202`	`tempERC20.contractAddress = tokenReward.AssetContract;`
`203`		`- tempERC20.quantityPerReward = tokenReward.TotalAmount.ToString();`
	`203`	`+ tempERC20.quantityPerReward = amount.ToString().ToEth(18);`
	`204`	`+ tempERC20.totalRewards = (tokenReward.TotalAmount / amount).ToString().ToEth(18);`
`204`	`205`	`erc20R.Add(tempERC20);`
`205`	`206`	`break;`
`206`	`207`	`case 1:`
`@@ -213,17 +214,18 @@ public async Task<PackContents> GetPackContents(string packId)`
`213`	`214`	`var tempERC1155 = new ERC1155Contents();`
`214`	`215`	`tempERC1155.contractAddress = tokenReward.AssetContract;`
`215`	`216`	`tempERC1155.tokenId = tokenReward.TokenId.ToString();`
`216`		`- tempERC1155.quantityPerReward = tokenReward.TotalAmount.ToString();`
	`217`	`+ tempERC1155.quantityPerReward = amount.ToString();`
	`218`	`+ tempERC1155.totalRewards = (tokenReward.TotalAmount / amount).ToString();`
`217`	`219`	`erc1155R.Add(tempERC1155);`
`218`	`220`	`break;`
`219`	`221`	`default:`
`220`	`222`	`break;`
`221`	`223`	`}`
`222`	`224`	`}`
`223`	`225`	`PackContents contents = new PackContents();`
`224`		`- contents.erc20Contents = erc20R;`
`225`		`- contents.erc721Contents = erc721R;`
`226`		`- contents.erc1155Contents = erc1155R;`
	`226`	`+ contents.erc20Rewards = erc20R;`
	`227`	`+ contents.erc721Rewards = erc721R;`
	`228`	`+ contents.erc1155Rewards = erc1155R;`
`227`	`229`	`return contents;`
`228`	`230`	`}`
`229`	`231`	`}`
`@@ -406,20 +408,20 @@ public override string ToString()`
`406`	`408`	`[System.Serializable]`
`407`	`409`	`public class PackContents`
`408`	`410`	`{`
`409`		`- public List<ERC20Contents> erc20Contents;`
`410`		`- public List<ERC721Contents> erc721Contents;`
`411`		`- public List<ERC1155Contents> erc1155Contents;`
	`411`	`+ public List<ERC20Contents> erc20Rewards;`
	`412`	`+ public List<ERC721Contents> erc721Rewards;`
	`413`	`+ public List<ERC1155Contents> erc1155Rewards;`
`412`	`414`
`413`	`415`	`public override string ToString()`
`414`	`416`	`{`
`415`		`- string erc20str = "ERC20 Contents:\n";`
`416`		`- foreach (var content in erc20Contents)`
	`417`	`+ string erc20str = "\n";`
	`418`	`+ foreach (var content in erc20Rewards)`
`417`	`419`	`erc20str += content.ToString();`
`418`		`- string erc721str = "ERC721 Contents:\n";`
`419`		`- foreach (var content in erc721Contents)`
	`420`	`+ string erc721str = "\n";`
	`421`	`+ foreach (var content in erc721Rewards)`
`420`	`422`	`erc721str += content.ToString();`
`421`		`- string erc1155str = "ERC1155 Contents:\n";`
`422`		`- foreach (var content in erc1155Contents)`
	`423`	`+ string erc1155str = "\n";`
	`424`	`+ foreach (var content in erc1155Rewards)`
`423`	`425`	`erc1155str += content.ToString();`
`424`	`426`	`return "PackContents:\n" + erc20str + erc721str + erc1155str;`
`425`	`427`	`}`
`@@ -462,7 +464,7 @@ public class ERC20Contents : ERC20Reward`
`462`	`464`
`463`	`465`	`public override string ToString()`
`464`	`466`	`{`
`465`		`- return "ERC20Contents:\n" + $"totalRewards: {totalRewards.ToString()}\n" + base.ToString();`
	`467`	`+ return base.ToString() + $"totalRewards: {totalRewards.ToString()}\n";`
`466`	`468`	`}`
`467`	`469`	`}`
`468`	`470`
`@@ -504,7 +506,7 @@ public class ERC1155Reward`
`504`	`506`
`505`	`507`	`public override string ToString()`
`506`	`508`	`{`
`507`		`- return "ERC1155Reward:\n" + $"contractAddress: {contractAddress.ToString()}\n" + $"tokenId: {tokenId.ToString()}\n" + $"contractAddress: {tokenId.ToString()}\n";`
	`509`	`+ return "ERC1155Reward:\n" + $"contractAddress: {contractAddress.ToString()}\n" + $"tokenId: {tokenId.ToString()}\n" + $"quantityPerReward: {quantityPerReward.ToString()}\n";`
`508`	`510`	`}`
`509`	`511`	`}`
`510`	`512`
`@@ -515,7 +517,7 @@ public class ERC1155Contents : ERC1155Reward`
`515`	`517`
`516`	`518`	`public override string ToString()`
`517`	`519`	`{`
`518`		`- return "ERC1155Contents:\n" + $"totalRewards: {totalRewards.ToString()}\n" + base.ToString();`
	`520`	`+ return base.ToString() + $"totalRewards: {totalRewards.ToString()}\n";`
`519`	`521`	`}`
`520`	`522`	`}`
`521`	`523`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL`
`151`	`151`	`{`
`152`	`152`	`List<Thirdweb.Contracts.Pack.ContractDefinition.Token> tokenList = new List<Contracts.Pack.ContractDefinition.Token>();`
`153`	`153`	`// Add ERC20 Rewards`
`154`		`- foreach (var erc20Reward in packContents.erc20Contents)`
	`154`	`+ foreach (var erc20Reward in packContents.erc20Rewards)`
`155`	`155`	`{`
`156`	`156`	`tokenList.Add(`
`157`	`157`	`new Thirdweb.Contracts.Pack.ContractDefinition.Token()`
`@@ -164,7 +164,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL`
`164`	`164`	`);`
`165`	`165`	`}`
`166`	`166`	`// Add ERC721 Rewards`
`167`		`- foreach (var erc721Reward in packContents.erc721Contents)`
	`167`	`+ foreach (var erc721Reward in packContents.erc721Rewards)`
`168`	`168`	`{`
`169`	`169`	`tokenList.Add(`
`170`	`170`	`new Thirdweb.Contracts.Pack.ContractDefinition.Token()`
`@@ -177,7 +177,7 @@ public async static Task<List<NFT>> ToNFTList(this List<TokenData721> tokenDataL`
`177`	`177`	`);`
`178`	`178`	`}`
`179`	`179`	`// Add ERC1155 Rewards`
`180`		`- foreach (var erc1155Reward in packContents.erc1155Contents)`
	`180`	`+ foreach (var erc1155Reward in packContents.erc1155Rewards)`
`181`	`181`	`{`
`182`	`182`	`tokenList.Add(`
`183`	`183`	`new Thirdweb.Contracts.Pack.ContractDefinition.Token()`
`@@ -196,17 +196,17 @@ public static List<BigInteger> ToPackRewardUnitsList(this PackContents packConte`
`196`	`196`	`{`
`197`	`197`	`List<BigInteger> rewardUnits = new List<BigInteger>();`
`198`	`198`	`// Add ERC20 Rewards`
`199`		`- foreach (var content in packContents.erc20Contents)`
	`199`	`+ foreach (var content in packContents.erc20Rewards)`
`200`	`200`	`{`
`201`	`201`	`rewardUnits.Add(BigInteger.Parse(content.quantityPerReward.ToWei()));`
`202`	`202`	`}`
`203`	`203`	`// Add ERC721 Rewards`
`204`		`- foreach (var content in packContents.erc721Contents)`
	`204`	`+ foreach (var content in packContents.erc721Rewards)`
`205`	`205`	`{`
`206`	`206`	`rewardUnits.Add(1);`
`207`	`207`	`}`
`208`	`208`	`// Add ERC1155 Rewards`
`209`		`- foreach (var content in packContents.erc1155Contents)`
	`209`	`+ foreach (var content in packContents.erc1155Rewards)`
`210`	`210`	`{`
`211`	`211`	`rewardUnits.Add(BigInteger.Parse(content.quantityPerReward));`
`212`	`212`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ public async void FetchPackContents()`
`93`	`93`	`Contract contract = ThirdwebManager.Instance.SDK.GetContract(PACK_CONTRACT);`
`94`	`94`
`95`	`95`	`PackContents packContents = await contract.pack.GetPackContents("0");`
`96`		`- Debugger.Instance.Log("[Fetch Pack Contents] Pack #0", "ERC721 Contents:\n" + packContents.erc721Contents[0].ToString());`
	`96`	`+ Debugger.Instance.Log("[Fetch Pack Contents] Pack #0", packContents.ToString());`
`97`	`97`	`}`
`98`	`98`	`catch (System.Exception e)`
`99`	`99`	`{`