Fixing erc721 and erc1155 samples reported by Juan. (#1247)

* Fixing erc721 and erc1155 samples reported by Juan. * Linter fix
ChainSafe · Nov 27, 2024 · 1152e74 · 1152e74
1 parent 1cfb6a6
commit 1152e74
Show file tree

Hide file tree

Showing 24 changed files with 28 additions and 4 deletions.
diff --git a/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll b/Packages/io.chainsafe.web3-unity.hyperplay/Runtime/Libraries/ChainSafe.Gaming.HyperPlay.dll
diff --git a/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/...web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll
diff --git a/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll b/...chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll
diff --git a/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll b/Packages/io.chainsafe.web3-unity.mud/Runtime/Libraries/ChainSafe.Gaming.Mud.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll
diff --git a/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/....chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Marketplace.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Reown.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Reown.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.SygmaClient.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.EthereumWindow.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.MetaMask.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.ThirdParty.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/System.Numerics.Vectors.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/System.Numerics.Vectors.dll
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Marketplace.meta b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/EVM/Marketplace.meta
diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Web3Unity.cs b/Packages/io.chainsafe.web3-unity/Runtime/Scripts/Web3Unity.cs
@@ -9,6 +9,7 @@
 using ChainSafe.Gaming.Evm.Signers;
 using ChainSafe.Gaming.Evm.Transactions;
 using ChainSafe.Gaming.GUI;
+using ChainSafe.Gaming.MultiCall;
 using ChainSafe.Gaming.UnityPackage.Connection;
 using ChainSafe.Gaming.UnityPackage.UI;
 using ChainSafe.Gaming.Web3;

diff --git a/src/ChainSafe.Gaming.Reown/ReownProvider.cs b/src/ChainSafe.Gaming.Reown/ReownProvider.cs
@@ -569,7 +569,7 @@ async Task<T> MakeRequest<TRequest>(bool sendChainId = true)
                     return await SignClient.Request<TRequest, T>(
                         topic,
                         data,
-                        sendChainId ? BuildChainIdForReown(chainConfig.ChainId) : null);;
+                        sendChainId ? BuildChainIdForReown(chainConfig.ChainId) : null);
                 }
                 catch (KeyNotFoundException e)
                 {

diff --git a/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/Erc721Contract.cs b/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/Erc721Contract.cs
@@ -81,7 +81,7 @@ public async Task<List<OwnerOfBatchModel>> GetOwnerOfBatch(string[] tokenIds)
             if (multiCall == null)
             {
                 throw new Web3Exception(
-                    $"Can't execute {nameof(GetOwnerOfBatch)}. No MultiCall component was provided during construction.");
+                    $"Can't execute {nameof(GetOwnerOfBatch)}. No MultiCall component was provided during construction. If you are using Web3Unity component, make sure to add the Multicall service adapter to the same game object.");
             }
 
             var calls = tokenIds

diff --git a/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/Erc721Service.cs b/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/Erc721Service.cs
@@ -6,6 +6,7 @@
 using ChainSafe.Gaming.Evm.Signers;
 using ChainSafe.Gaming.Evm.Utils;
 using ChainSafe.Gaming.MultiCall;
+using ChainSafe.Gaming.Web3.Environment;
 using TransactionReceipt = ChainSafe.Gaming.Evm.Transactions.TransactionReceipt;
 
 namespace ChainSafe.Gaming.Evm.Contracts.BuiltIn
@@ -36,6 +37,12 @@ public Erc721Service(IContractBuilder contractBuilder, ISigner signer)
             this.signer = signer;
         }
 
+        public Erc721Service(IContractBuilder contractBuilder, IMultiCall multiCall)
+            : this(contractBuilder)
+        {
+            this.multiCall = multiCall;
+        }
+
         public Erc721Service(IContractBuilder contractBuilder, ISigner signer, IMultiCall multiCall)
             : this(contractBuilder, signer)
         {

diff --git a/...pleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scenes/SampleMain.unity b/...pleProject/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scenes/SampleMain.unity
@@ -649,7 +649,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1573338518}
   m_HandleRect: {fileID: 1573338517}
   m_Direction: 0
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:
@@ -1023,6 +1023,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 29625373239180716, guid: 6d183a51c0030794a8ff3fea5dbd6423, type: 3}
+      propertyPath: initializeOnAwake
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 29625373239180716, guid: 6d183a51c0030794a8ff3fea5dbd6423, type: 3}
+      propertyPath: rememberConnection
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8519303782652390544, guid: 6d183a51c0030794a8ff3fea5dbd6423, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

diff --git a/...t/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/Erc1155Sample.cs b/...t/Assets/Samples/web3.unity SDK/3.0.6/Web3.Unity Samples/Scripts/Samples/Erc1155Sample.cs
@@ -85,7 +85,7 @@ public class Erc1155Sample : MonoBehaviour, ISample
     /// </summary>
     public async Task<string> BalanceOf()
     {
-        var balance = await Web3Unity.Web3.Erc1155.GetBalanceOf(ChainSafeContracts.Erc1155, tokenIdBalanceOf);
+        var balance = await Web3Unity.Web3.Erc1155.GetBalanceOf(ChainSafeContracts.Erc1155, tokenIdBalanceOf, accountBalanceOf);
 
         return balance.ToString();
     }