From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 1/3] Revert "automated duplicating imported samples modifications (#595)" This reverts commit a5558941827a91df51e2dd200648dcd13a1231c8. --- .github/workflows/duplicate_sample.yaml | 28 ------------------- duplicate_package_sample.sh | 14 ---------- .../Samples~/Web3.Unity/Prefabs.meta | 8 ------ .../Samples~/Web3.Unity/Scenes.meta | 8 ------ .../Samples~/Web3.Unity/Scripts.meta | 8 ------ .../Samples~/Web3.Unity/Sprites.meta | 8 ------ 6 files changed, 74 deletions(-) delete mode 100644 .github/workflows/duplicate_sample.yaml delete mode 100644 duplicate_package_sample.sh delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta delete mode 100644 src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta diff --git a/.github/workflows/duplicate_sample.yaml b/.github/workflows/duplicate_sample.yaml deleted file mode 100644 index 793149e56..000000000 --- a/.github/workflows/duplicate_sample.yaml +++ /dev/null @@ -1,28 +0,0 @@ -name: Duplicate-Package-Sample - -on: - push: - branches: - - main - -jobs: - duplicate: - name: duplicate package sample - runs-on: ubuntu-latest - - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - - name: Run duplicate script file - run: bash ${GITHUB_WORKSPACE}/duplicate_package_sample.sh - - - name: Commit and Push - run: | - git config --global user.email $git_email - git config --global user.name "${{ github.actor }}" - git add ./src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/. -f - git diff-index --cached --quiet HEAD || git commit -m "Auto-duplicate Package Samples" - git push - env: - git_email: "${{ github.actor }}@users.noreply.github.com" \ No newline at end of file diff --git a/duplicate_package_sample.sh b/duplicate_package_sample.sh deleted file mode 100644 index f3a677742..000000000 --- a/duplicate_package_sample.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -# Specify the source directory and the destination directory -SOURCE_DIRECTORY="src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0-pre001/Web3.Unity Samples/" -DESTINATION_DIRECTORY="src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/" - -# clear destination directory first -rm -r "$DESTINATION_DIRECTORY" - -# Copy source to the destination -cp -r "$SOURCE_DIRECTORY" "$DESTINATION_DIRECTORY" - -#add all modified files -git add "src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/." -f \ No newline at end of file diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta deleted file mode 100644 index 5b35daff8..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 45a04d2621549e3458049c6c447c3941 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta deleted file mode 100644 index 5488a62ed..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scenes.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f39f8dda9616349489a7803d7e0aff30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta deleted file mode 100644 index 9a1e8b8d4..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eaef630f284e6e04a88b5939e0eb1cc5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta b/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta deleted file mode 100644 index 7175ee89d..000000000 --- a/src/UnityPackages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Sprites.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 0c06517aee7843642a091a67c72b1379 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: From cd514db5c9d0bb82e069293c669733864d41544e Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Wed, 7 Feb 2024 13:35:15 +0300 Subject: [PATCH 2/3] made main package testable, revert due to a mistake --- src/UnitySampleProject/Packages/manifest.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/UnitySampleProject/Packages/manifest.json b/src/UnitySampleProject/Packages/manifest.json index 08c0ac92f..22a37ba40 100644 --- a/src/UnitySampleProject/Packages/manifest.json +++ b/src/UnitySampleProject/Packages/manifest.json @@ -47,5 +47,8 @@ "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0", "com.tools.webglthreadingpatcher": "https://github.com/VolodymyrBS/WebGLThreadingPatcher.git" - } + }, + "testables": [ + "io.chainsafe.web3-unity" + ] } \ No newline at end of file From b62584b17dd5ffecd3f1130af2846630a3dce49e Mon Sep 17 00:00:00 2001 From: rob1997 Date: Fri, 2 Aug 2024 18:54:30 +0300 Subject: [PATCH 3/3] read calls fix --- .../RPC/Contracts/BuiltIn/BuiltInContract.cs | 3 ++- src/ChainSafe.Gaming/RPC/Contracts/Contract.cs | 14 ++++++++++---- src/ChainSafe.Gaming/RPC/Contracts/IContract.cs | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/BuiltInContract.cs b/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/BuiltInContract.cs index 34de253ce..204c96ef2 100644 --- a/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/BuiltInContract.cs +++ b/src/ChainSafe.Gaming/RPC/Contracts/BuiltIn/BuiltInContract.cs @@ -38,7 +38,8 @@ public Task public Task PrepareTransactionRequest( string method, object[] parameters, + bool isReadCall = false, TransactionRequest overwrite = null) - => Original.PrepareTransactionRequest(method, parameters, overwrite); + => Original.PrepareTransactionRequest(method, parameters, isReadCall, overwrite); } } \ No newline at end of file diff --git a/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs b/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs index b9215f538..25e42c89e 100644 --- a/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs +++ b/src/ChainSafe.Gaming/RPC/Contracts/Contract.cs @@ -87,7 +87,7 @@ public async Task Call(string method, object[] parameters = null, Tran parameters ??= Array.Empty(); - var txReq = await PrepareTransactionRequest(method, parameters, overwrite); + var txReq = await PrepareTransactionRequest(method, parameters, true, overwrite); var result = await provider.Call(txReq); analyticsClient.CaptureEvent(new AnalyticsEvent() @@ -156,7 +156,7 @@ public async Task Send(string method, object[] parameters = null, Tran var function = contractBuilder.GetFunctionBuilder(method); - var txReq = await PrepareTransactionRequest(method, parameters, overwrite); + var txReq = await PrepareTransactionRequest(method, parameters, false, overwrite); var tx = await transactionExecutor.SendTransaction(txReq); var receipt = await provider.WaitForTransactionReceipt(tx.Hash); @@ -195,7 +195,7 @@ public async Task EstimateGas( throw new Exception("provider or signer is not set"); } - return await provider.EstimateGas(await PrepareTransactionRequest(method, parameters, overwrite)); + return await provider.EstimateGas(await PrepareTransactionRequest(method, parameters, false, overwrite)); } /// @@ -244,7 +244,7 @@ public string Calldata(string method, object[] parameters = null) return function.GetData(parameters); } - public async Task PrepareTransactionRequest(string method, object[] parameters, TransactionRequest overwrite = null) + public async Task PrepareTransactionRequest(string method, object[] parameters, bool isReadCall = false, TransactionRequest overwrite = null) { parameters ??= Array.Empty(); @@ -254,6 +254,12 @@ public async Task PrepareTransactionRequest(string method, o txReq.From ??= signer?.PublicAddress; txReq.To ??= address; txReq.Data ??= function.GetData(parameters); + + if (isReadCall) + { + return txReq; + } + try { var feeData = await provider.GetFeeData(); diff --git a/src/ChainSafe.Gaming/RPC/Contracts/IContract.cs b/src/ChainSafe.Gaming/RPC/Contracts/IContract.cs index cf92c9c84..e7283864f 100644 --- a/src/ChainSafe.Gaming/RPC/Contracts/IContract.cs +++ b/src/ChainSafe.Gaming/RPC/Contracts/IContract.cs @@ -73,6 +73,6 @@ Task EstimateGas( /// The contract call data. string Calldata(string method, object[] parameters = null); - Task PrepareTransactionRequest(string method, object[] parameters, TransactionRequest overwrite = null); + Task PrepareTransactionRequest(string method, object[] parameters, bool isReadCall = false, TransactionRequest overwrite = null); } } \ No newline at end of file