From b5356375f1185121a4798a0efbf3e91696a9b59f Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Thu, 14 Sep 2023 11:30:11 +0300 Subject: [PATCH 1/4] 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 bf690dbe2b7b021fe3870a6e2d5871cf4cc89f42 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Fri, 12 Jan 2024 14:29:37 +0300 Subject: [PATCH 2/4] fix Null Ref error on Android Builds when redirecting --- .../Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs index 31178d19d..7dd991dc2 100644 --- a/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs +++ b/src/UnitySampleProject/Assets/Samples/web3.unity SDK/2.5.0/Web3.Unity Samples/Scripts/Scenes/ExistingWalletLogin.cs @@ -62,7 +62,7 @@ public class ExistingWalletLogin : Login private bool redirectToWallet; - private Dictionary supportedWallets; + private Dictionary supportedWallets = new Dictionary(); private WalletConnectConfig walletConnectConfig; From e2a739b768b9a603cb4257ce8729818699d1acdf Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Fri, 12 Jan 2024 11:31:07 +0000 Subject: [PATCH 3/4] Auto-duplicate Packages Samples --- .../Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs b/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs index 31178d19d..7dd991dc2 100644 --- a/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs +++ b/Packages/io.chainsafe.web3-unity/Samples~/Web3.Unity/Scripts/Scenes/ExistingWalletLogin.cs @@ -62,7 +62,7 @@ public class ExistingWalletLogin : Login private bool redirectToWallet; - private Dictionary supportedWallets; + private Dictionary supportedWallets = new Dictionary(); private WalletConnectConfig walletConnectConfig; From c1575dde308aa9c89989a56b2f968277a03bcda3 Mon Sep 17 00:00:00 2001 From: robGG1997 Date: Fri, 12 Jan 2024 11:34:23 +0000 Subject: [PATCH 4/4] Published Solution Dependencies to Package Libraries as DLLs --- .../ChainSafe.Gaming.Lootboxes.Chainlink.dll | Bin 31232 -> 31232 bytes .../Libraries/Chainsafe.Gaming.Chainlink.dll | Bin 5632 -> 5632 bytes .../Libraries/ChainSafe.Gaming.Debugging.dll | Bin 16384 -> 16384 bytes .../Libraries/ChainSafe.Gaming.Gelato.dll | Bin 45056 -> 45056 bytes .../ChainSafe.Gaming.InProcessSigner.dll | Bin 8192 -> 8192 bytes ...ing.InProcessTransactionExecutor.Unity.dll | Bin 6656 -> 6656 bytes ...fe.Gaming.InProcessTransactionExecutor.dll | Bin 11264 -> 11264 bytes .../ChainSafe.Gaming.MetaMask.Unity.dll | Bin 13824 -> 13824 bytes .../Libraries/ChainSafe.Gaming.MetaMask.dll | Bin 11264 -> 11264 bytes .../ChainSafe.Gaming.Unity.ThirdParty.dll | Bin 24064 -> 24064 bytes .../Libraries/ChainSafe.Gaming.Unity.dll | Bin 15360 -> 15360 bytes .../ChainSafe.Gaming.WalletConnect.dll | Bin 35840 -> 35840 bytes .../Runtime/Libraries/ChainSafe.Gaming.dll | Bin 216064 -> 216064 bytes 13 files changed, 0 insertions(+), 0 deletions(-) diff --git a/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll b/Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/ChainSafe.Gaming.Lootboxes.Chainlink.dll index 371ea02be9092cadb4f96f0bb3e0a6dd7f5ccec3..e97c2cf2164c47420aee5287d5dd83f2c7083dd9 100644 GIT binary patch delta 238 zcmZqp!r1VIaY6^nO8#q4HugM;5wK0M`#OQ4+W(^jrE>r(SKNq)N7qVNEVzZruOLlT22 zg8`7VU`PZ)6CiEGUlZXHUHNIVMd1M!e^Uk%h7=%9 zW-w$hU`PYfCJaeHn8;wvUGy&2^3}!$w83@gQB9=gy0))m4<_u{-c{8BuWT1F5P|O5K8UjVlfU-dSn;#3x GvH$=f!%TGm delta 235 zcmZqBY0#O_!4m$-+&v0VK?`%JAV_sXknOQfZ{{;=UbgSsT)?Bk>Tk+m!jJ;Q$qa@J z1`KIH+Jqqq2oo8M8O(rmDv(SDsz?LM8v)5w21}p{Gaxns$|f_I1LaZ~EP$d0Kxn%8 Iv7jsq030bxc>n+a 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 index 85230333ddf28e3e53f8446c90682fec8f79e09e..0a2bfbb8f4cf57d260441fa8412b59274e381ab4 100644 GIT binary patch delta 252 zcmZo@U~Fh$oY28?GFG8wV^4vOKyP<)(A}&1{CW@NxJC3EyKUyt)o0Z+GfFZwNU}&w zG_f!;vq(-hOSH61NijB0GchwrPE1ZQNj6L~Gqy-%U~ph$u%4WwB{BJcvB2huM$t?x z{#UstPyS#MAW-yteq8EZNw+O~FS^IP+Nv=*z_dpJD#&I66$GiC!P%I0wP|JM2P`Ez1G``ZiC; delta 252 zcmZo@U~Fh$oY29-=eF?L#-0KlfjKvF<1U}B@oDWlk|gyew`?qOn<0s#$VMnxRozs-=mUiBVFrc}l8T?o z`JSb>W%37;00D;PFsozVvt1W-2{lZu{>U*oz_dpJDyRw*1gbV!nzhM}*W-i3oBPTM zoBx>3VD&d;Fkwgm;$#Lx1_OpPAZ@~s1cZqU#tddaIu%GJ168B}<&A)3DuX3Zg&7bV Z0cDdJ%z<*L3>H9910Xcr{McHS1pu)*P3Zst 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 index f875032cdf483ecb83aef141bf86934665641fec..3da304ba8576af423c8fce3845c6128c75232b31 100644 GIT binary patch delta 247 zcmZp8z|`=7X+j4}>xM(;HugA75O`E6_xpo>kn?)^FvnD3`q>83pe#`T=G|*unE>`$Qb_;+ delta 247 zcmZp8z|`=7X+j6f^5d_6ZtQWGATZ(F=f#hNpS!ni{&(vY)2zD9cP0ez=$V?Nm?Rq- zq$QgqB_$f0C8e4rr=%GgrKMV$n3)(QC7Y+DT38wwm@+U}GcuS>p1449bM@R~T+Hhh zUYP8%B0ykW>f^=@rx?Ab>i<&z9iyK+dC7`41*qWdP^jR4pz4x*so)2`n~p!xkvh5A zYo!v4zbS(WLkbWlGZ-=$Fr)!#6NV%pOk^--Fay%5Kr$JqA`K{S1SC@#EP*P_fY=Bq Xo6KMiluKo>0E!v_q3Pz`Yh9TDALdq) 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 index 67c2dc6a1d9f08169ca0520a40d80b4ca9485af1..e1bdabc09c4d6a680c669bcda4e6770e2a6a4668 100644 GIT binary patch delta 235 zcmZp0XmFU&!NMb%F@0mt89@OT8!RM>n|F~?n5u3v5Z^mH6ki=lhU;rd7 z7!rZd1V|e(m;uRTAT$GtSOQ@R5E?U>Go%6K&48+tf#S(PF%uwZ2oyB~$^!LomX~?R F3;@^aNN@lE delta 235 zcmZp0XmFU&!NS1%@YcqjGlBwo%{O&F4ZFpJ0?A~ciZr0S5s*w}umq|w17ahfY%+s6P%f3h0w`(#gr=M2 IWgapE0Q{OoPyhe` diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.Unity.dll index f3e417b53d820b255e89be6b4fb1be81780eda4a..9e97a924965ce582bb6519d2fd7cad76fd2e30c4 100644 GIT binary patch delta 235 zcmZoLX)u}4!SddcXU4{!Gdu!%D@>m_anEyUnV?dBP3-N<%^AEMj2dP}Nu~x#7Kw=_ z7Di?k$;oDkmX;|g#^z}zW(LWL$tfnuhG}NT7KxK3_+wbyj~qWexq?4Hpq`o4;eDKe z+q#vW@!MAQ-<^Def1d(W&8{JK*?T@Fk=5<_z8rMh#Pw6q95_gS2Fm zq@+Y+v!qnB*e J^JOtzW&nWPM`!>5 diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll index 865c74818dfb012a078c1c50878325c12e9d27c4..310a602a35262cb6b946fe526fb8016ec8a391f1 100644 GIT binary patch delta 235 zcmZpOXo#55!J>D`J*iU|Gzw%d_*BYpts;gO;V_o zYvZFkYOBsQ_Dxn%+@t^%WIYHK1gW->dCSA^@ugf)$SY;@H^m?}e=`Onh9m}41_K~z z!H@`qCP3PV!3;P0-UvvhGFSptm;td7P&S#t94ME{U;z|007BEv I(={@g0fs|NmjD0& diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.Unity.dll index 260e66423bc29646b852962792fafd9ad3545db0..b126d1f3b379b54f1e6f6a04115b3a07152da35a 100644 GIT binary patch delta 245 zcmZq3X~>z-!LoR9?(&U2Ths(1&6jPTUhn3(p=^7n|0mfEn*-G4SoF+{l1vSfED{q< zER4)7l9SC6EiF@0jLp+b%nXtflT%ER4b#kwEfN_RJQx|AC)?{POx~ltg=M$QiPp&_ zIspQUI|`mSr=Rheu_Cl-)vu~;ldtGZQ-BKIxd9afs%G8oHP2b^zgFM*^pr!JyL63M z{LL7Q7?K!F84Q4=1w$ebngD4d1~VX;41{Jt5lbLU0YYO2bA~jayctk+GEh7jC}sjA R4S}L&Kv|&v&D=&`nE~$~P&)ts delta 245 zcmZq3X~>z-!J^}Dy>(;H7Bztjg?F>`PrY>RS8rZwvSwA*<^Xj$7Clpw6q95_gS2Fm zq@+Y+v!qnBH zOc+vtIGMqa!GIwRNSiPu0bwG8F@qV9P6d+5Kow~~c_Sd1%3ujpVFtuTK-pvlbD&%* Rg9T9300>Pta~pkS1^^vuOjG~> diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.MetaMask.dll index 2334a112b2a56f6079b0cbab1a5c5d91b3af0123..ac154c8965cc3fb1b242f1b217e1230f7900e4e6 100644 GIT binary patch delta 249 zcmZpOXo#55!4jWv<Rg??LNP$V{*|JBr$(v&5{32p+l+-pQ_7)%)qfTRUOA`qGYX(I+RAejt=Wd1ItU> z^rZ&zByb#aq?nbR^H@Oy*GPQa~33sxB#A%u%Z`+w1h6U={7no0QJ6 z_?t4AFr)x+GJ_$50Ye&)HepBt!bApR1~VX?3M7+(D$;=RMnE!^!4jy#42X?@vdIkQ UK)F-~3!tb05Sng2uWrZ!05Anjf&c&j 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 index aafab1e003c2ff0947c98d8ec0976ad02eb07813..a32ea61721d3daea92e2824df1b0c742c8c1ddf2 100644 GIT binary patch delta 238 zcmZqJ!`QHgaY6@+V&sz@8+&fJ3wWg!Yh8%`=+$aFqhO-s$rGDPJVZD&%#4yu4U#Mp z6HP3P%q)_V%@QpwQ&No0(@e|^k`t3tOp*=L%#1A(H*W}VVP-j`#4vC2kKh1-33uM^ zNO< delta 238 zcmZqJ!`QHgaY6^n=_ku3ZtS_?F5p_Ft2*0K+;zR#PPS=RDn&P!c!+Rln3|-RBpVu} zC7UEAB^sM0rJ5zDq!}8erCOSpnHVJ{o2R5&SQ;3ZZr%{!!pyQp@z}S?KY{}UI;IHK zEch_hdq?sWX7QLgB9kLRW+^}gtu3H}Ak_}H`HxO>xV7|8a+ddIq0oIS{-z8j3@JdI z%wWi1z>o%{O&F4ZFpJ0?A~ciZr0S5s*w}umq|w17ahfY%+s6P%f3h0w`(# Mgr=M2qaHE?06t|)82|tP 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 index 0a70edb89184400909164033dff883fa02871212..1ecf79423e7f285df7d9c77e66227f7cabace8c2 100644 GIT binary patch delta 236 zcmZpuXsDRb!IGbH?b*hj8%hGA_rDvt8clO()#aW1$?o{U%_YjptQuxUNu~x#7Kw=_ z7Di?k$;oDkmX;|g#^z}zW(LWL$tfnuhG}NT7KxkpYqWB)tWs~8JK4iHKw!SUWy!QD z(*E=ACkCeJ%(9=n!nj2NDp(H_1gTECc8^!c_#30-V~H=DeM}Ts{mmGR7?K!F84Q4= z1w$ebngD4d1~VX;41{Jt5lbLU0YYO2bA~jayctk+GEh7jC}sjA4S}L&Kv|&v&ATmK FnEPt J@3wSh0suygNyq>I diff --git a/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll b/Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WalletConnect.dll index 78c0c90769de8e6bbc2d4cd233c9ad9c4454b7b7..a9d94e0f992dda39f7c153e19136877e50cfff41 100644 GIT binary patch delta 238 zcmZpe!PGE=X+j5!MDT-^8+%;x1(c-zDg2Xl@m##mH#D9{`fR%n{T>Tkwi#E`^b z%3uH_Ef^Ak&;&>uF_;0#WFRyHidX_+3J@AIm@}jS<;{SqlY!#NKrs^_X$TZG1IhyR KZ|3g!$_xNEU`7l8 delta 238 zcmZpe!PGE=X+j4}_)FzU8+%;x1@0FoPApBE;6H1&^TqI}Q`a^>$nW6NFf~arNj5Y{ zOEyVLN;Ec0N;OMPNi#G`OSLpHGcig^Hcv^lurx3*-8`YHf{n%KQRC*xJdFVYtR;75 zdkWlf=}t}awX43*J2|IuiUL$HNG1bSqygoPfMhCzB~XPK5E}tylNro`a;Xd!Kv4rA LG~LYI@s$|>ymdwtjkm3v+-#WT?4*S*5ezR*7@!Z`sV7rf+azu26uA%E3fI>K9DaDvVxT zdN6gX_rmQSuFNl({mmGR7?K!F84Q4=1w$ebngD4d1~VX;41{Jt5lbLU0YYO2bA~ja eyctk+GEh7jC}sjA4S}L&Kv|&v?e(6_jZ6T?p-&3{ delta 260 zcmZpe!P_u{cR~ltgWrdyH1@RiFmCN(O2`xtdTnW2KS9%PXG!6_4$FBR+y7)T{oAf# zYLa4-Y-o^{Y?73eXl$00YL=XmW@wa_YH4C-Vw99@o|0-|X<%SFeStc&`1A=|8Ckd6 zDKYaYvGDRe+crJGg*iarQnLU6