From 28a955bef001facbcf87062509fbcaafef142f88 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Tue, 25 Feb 2025 09:24:47 +0300 Subject: [PATCH] chore: update localnet (#237) --- examples/call/package.json | 6 +- examples/call/scripts/localnet.sh | 2 +- examples/call/yarn.lock | 46 +++++++-------- examples/hello/package.json | 4 +- examples/hello/scripts/localnet.sh | 2 +- examples/hello/yarn.lock | 39 +++++++------ examples/nft/package.json | 4 +- examples/nft/yarn.lock | 49 +++++++++------- examples/swap/package.json | 4 +- examples/swap/scripts/localnet.sh | 92 ++++++++++++++++++++++-------- examples/swap/yarn.lock | 35 +++++++----- examples/token/package.json | 6 +- examples/token/yarn.lock | 56 +++++++++--------- 13 files changed, 203 insertions(+), 142 deletions(-) diff --git a/examples/call/package.json b/examples/call/package.json index db3607cf..e81a3967 100644 --- a/examples/call/package.json +++ b/examples/call/package.json @@ -28,7 +28,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/localnet": "6.0.0-rc8", + "@zetachain/localnet": "^6.0.1", "@zetachain/toolkit": "13.0.0-rc17", "axios": "^1.3.6", "chai": "^4.2.0", @@ -57,8 +57,8 @@ "@solana-developers/helpers": "^2.4.0", "@solana/spl-memo": "^0.2.5", "@solana/web3.js": "^1.95.8", - "@zetachain/networks": "10.0.0-rc4", + "@zetachain/networks": "13.0.0-rc1", "@zetachain/protocol-contracts": "11.0.0-rc3", "@zetachain/protocol-contracts-solana": "2.0.0-rc1" } -} \ No newline at end of file +} diff --git a/examples/call/scripts/localnet.sh b/examples/call/scripts/localnet.sh index 47ba0ff7..6234fd7b 100755 --- a/examples/call/scripts/localnet.sh +++ b/examples/call/scripts/localnet.sh @@ -4,7 +4,7 @@ set -e set -x set -o pipefail -if [ "$1" = "start" ]; then npx hardhat localnet & sleep 15; fi +if [ "$1" = "start" ]; then npx hardhat localnet & sleep 20; fi echo -e "\nšŸš€ Compiling contracts..." npx hardhat compile --force --quiet diff --git a/examples/call/yarn.lock b/examples/call/yarn.lock index d10a375b..c4ddf32f 100644 --- a/examples/call/yarn.lock +++ b/examples/call/yarn.lock @@ -1808,7 +1808,7 @@ dependencies: "@solana/codecs" "2.0.0-rc.1" -"@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": +"@solana/spl-token@^0.4.12", "@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": version "0.4.12" resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.4.12.tgz#09361f9c8116f277b177dbcae7e3a273a19cd48a" integrity sha512-K6CxzSoO1vC+WBys25zlSDaW0w4UFZO/IvEZquEI35A/PjqXNQHeVigmDCZYEJfESvYarKwsr8tYr/29lPtvaw== @@ -2370,18 +2370,19 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/localnet@6.0.0-rc8": - version "6.0.0-rc8" - resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.0-rc8.tgz#ee9b9b3f24ca9a908c61eb97118021e059f6b527" - integrity sha512-s6syRd3EvyQfcTUSjCIWLBGrQ7lt0LBvc0slg+eDAlgkHVF78ezG2L66mSIn5Qms7MO6qF8OCTnshef+kkebKg== +"@zetachain/localnet@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.1.tgz#7bcd8196668002441f31dd56e9c0e49a00889094" + integrity sha512-Rz6SyWgS0lKiKTkbvNnodnbJ0nFviDFHwN+ndkxX+sqglROVQGcLCe2wnm8BjaDQsMENRiz8hxO7qYTVFi9rIw== dependencies: "@coral-xyz/anchor" "^0.30.1" "@inquirer/prompts" "^5.5.0" "@mysten/sui" "^0.0.0-experimental-20250131013137" + "@solana/spl-token" "^0.4.12" "@solana/web3.js" "^1.95.4" "@uniswap/v2-core" "^1.0.1" "@uniswap/v2-periphery" "^1.1.0-beta.0" - "@zetachain/protocol-contracts" "11.0.0-rc5" + "@zetachain/protocol-contracts" "11.0.0" ansis "^3.3.2" bip39 "^3.1.0" bs58 "^6.0.0" @@ -2390,15 +2391,9 @@ elliptic "6.5.7" ethers "^6.13.2" hardhat "^2.22.8" + js-sha256 "^0.11.0" wait-on "^7.2.0" -"@zetachain/networks@10.0.0-rc4": - version "10.0.0-rc4" - resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-10.0.0-rc4.tgz#9af65c87aac0811b420ecb71eb9adc9da3d0865f" - integrity sha512-QFa6TrUO3RkkOE/qGnvtNBEywCqTUgF/z2XGWsRSG6+f8QwDM49A1591KyJ72JBQENYQUheLHAwSjMMWd5LlRg== - dependencies: - dotenv "^16.1.4" - "@zetachain/networks@13.0.0-rc1": version "13.0.0-rc1" resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-13.0.0-rc1.tgz#c43acb879a966102cd570cb80a2f60e5166c9f3c" @@ -2425,6 +2420,16 @@ ethereumjs-util "^7.1.5" secp256k1 "^5.0.0" +"@zetachain/protocol-contracts@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0.tgz#4889044ae2f5db3f38d052a869775d17798f273e" + integrity sha512-BKkLLru4ZJzOh0G2kBYqzjzvb6nvH8c/FlT0Py4f5TAMnrw4h5PnhKMJbWjznv+e2LJ/I9PPpCeqB9zPfGoJPA== + dependencies: + "@openzeppelin/contracts" "^5.0.2" + "@openzeppelin/contracts-upgradeable" "^5.0.2" + "@zetachain/networks" "^10.0.0" + ethers "5.6.8" + "@zetachain/protocol-contracts@11.0.0-rc3": version "11.0.0-rc3" resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc3.tgz#9b719391d0728fd1b4e046c5f496180a45ecf0d5" @@ -2445,16 +2450,6 @@ "@zetachain/networks" "^10.0.0" ethers "5.6.8" -"@zetachain/protocol-contracts@11.0.0-rc5": - version "11.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc5.tgz#b55119e6cade29c4f266eb029d8879b968f87f63" - integrity sha512-+bjeTvSzuchWEIxrZ7IbOb8ERhZ+PtgmyOSSFcwhhyAOonYxNlM+1M/mSNAk5i3cdZyJTINzhk7H603/RQSeqA== - dependencies: - "@openzeppelin/contracts" "^5.0.2" - "@openzeppelin/contracts-upgradeable" "^5.0.2" - "@zetachain/networks" "^10.0.0" - ethers "5.6.8" - "@zetachain/toolkit@13.0.0-rc17": version "13.0.0-rc17" resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-13.0.0-rc17.tgz#83a1eafe39b7492c4259872ca3d31904564ca0a1" @@ -5418,6 +5413,11 @@ js-base64@^3.7.5: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79" integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" diff --git a/examples/hello/package.json b/examples/hello/package.json index 07edbe4d..818abdf1 100644 --- a/examples/hello/package.json +++ b/examples/hello/package.json @@ -28,7 +28,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/localnet": "6.0.0-rc8", + "@zetachain/localnet": "^6.0.1", "@zetachain/toolkit": "13.0.0-rc17", "axios": "^1.3.6", "chai": "^4.2.0", @@ -59,4 +59,4 @@ "@solana/web3.js": "^1.95.8", "@zetachain/protocol-contracts": "11.0.0-rc3" } -} \ No newline at end of file +} diff --git a/examples/hello/scripts/localnet.sh b/examples/hello/scripts/localnet.sh index 62190af6..3c9dd57e 100755 --- a/examples/hello/scripts/localnet.sh +++ b/examples/hello/scripts/localnet.sh @@ -3,7 +3,7 @@ set -e set -x -if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 10; fi +if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 20; fi echo -e "\nšŸš€ Compiling contracts..." npx hardhat compile --force --quiet diff --git a/examples/hello/yarn.lock b/examples/hello/yarn.lock index bb6ecf91..c4ddf32f 100644 --- a/examples/hello/yarn.lock +++ b/examples/hello/yarn.lock @@ -1808,7 +1808,7 @@ dependencies: "@solana/codecs" "2.0.0-rc.1" -"@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": +"@solana/spl-token@^0.4.12", "@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": version "0.4.12" resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.4.12.tgz#09361f9c8116f277b177dbcae7e3a273a19cd48a" integrity sha512-K6CxzSoO1vC+WBys25zlSDaW0w4UFZO/IvEZquEI35A/PjqXNQHeVigmDCZYEJfESvYarKwsr8tYr/29lPtvaw== @@ -2370,18 +2370,19 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/localnet@6.0.0-rc8": - version "6.0.0-rc8" - resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.0-rc8.tgz#ee9b9b3f24ca9a908c61eb97118021e059f6b527" - integrity sha512-s6syRd3EvyQfcTUSjCIWLBGrQ7lt0LBvc0slg+eDAlgkHVF78ezG2L66mSIn5Qms7MO6qF8OCTnshef+kkebKg== +"@zetachain/localnet@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.1.tgz#7bcd8196668002441f31dd56e9c0e49a00889094" + integrity sha512-Rz6SyWgS0lKiKTkbvNnodnbJ0nFviDFHwN+ndkxX+sqglROVQGcLCe2wnm8BjaDQsMENRiz8hxO7qYTVFi9rIw== dependencies: "@coral-xyz/anchor" "^0.30.1" "@inquirer/prompts" "^5.5.0" "@mysten/sui" "^0.0.0-experimental-20250131013137" + "@solana/spl-token" "^0.4.12" "@solana/web3.js" "^1.95.4" "@uniswap/v2-core" "^1.0.1" "@uniswap/v2-periphery" "^1.1.0-beta.0" - "@zetachain/protocol-contracts" "11.0.0-rc5" + "@zetachain/protocol-contracts" "11.0.0" ansis "^3.3.2" bip39 "^3.1.0" bs58 "^6.0.0" @@ -2390,6 +2391,7 @@ elliptic "6.5.7" ethers "^6.13.2" hardhat "^2.22.8" + js-sha256 "^0.11.0" wait-on "^7.2.0" "@zetachain/networks@13.0.0-rc1": @@ -2418,6 +2420,16 @@ ethereumjs-util "^7.1.5" secp256k1 "^5.0.0" +"@zetachain/protocol-contracts@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0.tgz#4889044ae2f5db3f38d052a869775d17798f273e" + integrity sha512-BKkLLru4ZJzOh0G2kBYqzjzvb6nvH8c/FlT0Py4f5TAMnrw4h5PnhKMJbWjznv+e2LJ/I9PPpCeqB9zPfGoJPA== + dependencies: + "@openzeppelin/contracts" "^5.0.2" + "@openzeppelin/contracts-upgradeable" "^5.0.2" + "@zetachain/networks" "^10.0.0" + ethers "5.6.8" + "@zetachain/protocol-contracts@11.0.0-rc3": version "11.0.0-rc3" resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc3.tgz#9b719391d0728fd1b4e046c5f496180a45ecf0d5" @@ -2438,16 +2450,6 @@ "@zetachain/networks" "^10.0.0" ethers "5.6.8" -"@zetachain/protocol-contracts@11.0.0-rc5": - version "11.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc5.tgz#b55119e6cade29c4f266eb029d8879b968f87f63" - integrity sha512-+bjeTvSzuchWEIxrZ7IbOb8ERhZ+PtgmyOSSFcwhhyAOonYxNlM+1M/mSNAk5i3cdZyJTINzhk7H603/RQSeqA== - dependencies: - "@openzeppelin/contracts" "^5.0.2" - "@openzeppelin/contracts-upgradeable" "^5.0.2" - "@zetachain/networks" "^10.0.0" - ethers "5.6.8" - "@zetachain/toolkit@13.0.0-rc17": version "13.0.0-rc17" resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-13.0.0-rc17.tgz#83a1eafe39b7492c4259872ca3d31904564ca0a1" @@ -5411,6 +5413,11 @@ js-base64@^3.7.5: resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-3.7.7.tgz#e51b84bf78fbf5702b9541e2cb7bfcb893b43e79" integrity sha512-7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" diff --git a/examples/nft/package.json b/examples/nft/package.json index f7210a99..f3b0cd96 100644 --- a/examples/nft/package.json +++ b/examples/nft/package.json @@ -28,7 +28,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/localnet": "6.0.0-rc8", + "@zetachain/localnet": "^6.0.1", "axios": "^1.3.6", "chai": "^4.2.0", "dotenv": "^16.0.3", @@ -58,7 +58,7 @@ "@solana/spl-memo": "^0.2.5", "@solana/web3.js": "^1.95.8", "@zetachain/protocol-contracts": "11.0.0-rc3", - "@zetachain/standard-contracts": "1.0.0-rc6", + "@zetachain/standard-contracts": "2.0.0-rc2", "@zetachain/toolkit": "13.0.0-rc17", "validator": "^13.12.0" } diff --git a/examples/nft/yarn.lock b/examples/nft/yarn.lock index 9bc9a37b..21f79fbe 100644 --- a/examples/nft/yarn.lock +++ b/examples/nft/yarn.lock @@ -1910,7 +1910,7 @@ dependencies: "@solana/codecs" "2.0.0-rc.1" -"@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": +"@solana/spl-token@^0.4.12", "@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": version "0.4.12" resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.4.12.tgz#09361f9c8116f277b177dbcae7e3a273a19cd48a" integrity sha512-K6CxzSoO1vC+WBys25zlSDaW0w4UFZO/IvEZquEI35A/PjqXNQHeVigmDCZYEJfESvYarKwsr8tYr/29lPtvaw== @@ -2472,18 +2472,19 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/localnet@6.0.0-rc8": - version "6.0.0-rc8" - resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.0-rc8.tgz#ee9b9b3f24ca9a908c61eb97118021e059f6b527" - integrity sha512-s6syRd3EvyQfcTUSjCIWLBGrQ7lt0LBvc0slg+eDAlgkHVF78ezG2L66mSIn5Qms7MO6qF8OCTnshef+kkebKg== +"@zetachain/localnet@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.1.tgz#7bcd8196668002441f31dd56e9c0e49a00889094" + integrity sha512-Rz6SyWgS0lKiKTkbvNnodnbJ0nFviDFHwN+ndkxX+sqglROVQGcLCe2wnm8BjaDQsMENRiz8hxO7qYTVFi9rIw== dependencies: "@coral-xyz/anchor" "^0.30.1" "@inquirer/prompts" "^5.5.0" "@mysten/sui" "^0.0.0-experimental-20250131013137" + "@solana/spl-token" "^0.4.12" "@solana/web3.js" "^1.95.4" "@uniswap/v2-core" "^1.0.1" "@uniswap/v2-periphery" "^1.1.0-beta.0" - "@zetachain/protocol-contracts" "11.0.0-rc5" + "@zetachain/protocol-contracts" "11.0.0" ansis "^3.3.2" bip39 "^3.1.0" bs58 "^6.0.0" @@ -2492,6 +2493,7 @@ elliptic "6.5.7" ethers "^6.13.2" hardhat "^2.22.8" + js-sha256 "^0.11.0" wait-on "^7.2.0" "@zetachain/networks@13.0.0-rc1": @@ -2520,6 +2522,16 @@ ethereumjs-util "^7.1.5" secp256k1 "^5.0.0" +"@zetachain/protocol-contracts@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0.tgz#4889044ae2f5db3f38d052a869775d17798f273e" + integrity sha512-BKkLLru4ZJzOh0G2kBYqzjzvb6nvH8c/FlT0Py4f5TAMnrw4h5PnhKMJbWjznv+e2LJ/I9PPpCeqB9zPfGoJPA== + dependencies: + "@openzeppelin/contracts" "^5.0.2" + "@openzeppelin/contracts-upgradeable" "^5.0.2" + "@zetachain/networks" "^10.0.0" + ethers "5.6.8" + "@zetachain/protocol-contracts@11.0.0-rc3": version "11.0.0-rc3" resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc3.tgz#9b719391d0728fd1b4e046c5f496180a45ecf0d5" @@ -2540,22 +2552,10 @@ "@zetachain/networks" "^10.0.0" ethers "5.6.8" -"@zetachain/protocol-contracts@11.0.0-rc5": - version "11.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc5.tgz#b55119e6cade29c4f266eb029d8879b968f87f63" - integrity sha512-+bjeTvSzuchWEIxrZ7IbOb8ERhZ+PtgmyOSSFcwhhyAOonYxNlM+1M/mSNAk5i3cdZyJTINzhk7H603/RQSeqA== - dependencies: - "@openzeppelin/contracts" "^5.0.2" - "@openzeppelin/contracts-upgradeable" "^5.0.2" - "@zetachain/networks" "^10.0.0" - ethers "5.6.8" - -"@zetachain/standard-contracts@1.0.0-rc6": - version "1.0.0-rc6" - resolved "https://registry.yarnpkg.com/@zetachain/standard-contracts/-/standard-contracts-1.0.0-rc6.tgz#c67728dbe39bcf2816644d4a7699ffe7e4b339dd" - integrity sha512-M5cbfZVVota665yv8HNPa2MMHaPduVRLTKLja9cCjAV1AV0TqUujtrswGB5UIUk4J1mnLdo9MZr6uHFKalr5+A== - dependencies: - validator "^13.12.0" +"@zetachain/standard-contracts@2.0.0-rc2": + version "2.0.0-rc2" + resolved "https://registry.yarnpkg.com/@zetachain/standard-contracts/-/standard-contracts-2.0.0-rc2.tgz#5e51e7206ce8253d9949031fc4fe14a6969282a5" + integrity sha512-K2rAXs18FoESX15UdWeY8iNJLZUqEdFi/aJNQdr/e3mPtH8xyTetIM3CMvfvOsYHqMl0XlIuWHCUuIsDOnjk5g== "@zetachain/toolkit@13.0.0-rc17": version "13.0.0-rc17" @@ -5584,6 +5584,11 @@ js-cookie@^2.2.1: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" diff --git a/examples/swap/package.json b/examples/swap/package.json index 5084ff10..057a851a 100644 --- a/examples/swap/package.json +++ b/examples/swap/package.json @@ -29,7 +29,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/localnet": "6.0.0-rc8", + "@zetachain/localnet": "^6.0.1", "axios": "^1.3.6", "chai": "^4.2.0", "dotenv": "^16.0.3", @@ -59,4 +59,4 @@ "@solana/web3.js": "^1.95.8", "@zetachain/toolkit": "13.0.0-rc17" } -} \ No newline at end of file +} diff --git a/examples/swap/scripts/localnet.sh b/examples/swap/scripts/localnet.sh index added7d5..37af70af 100755 --- a/examples/swap/scripts/localnet.sh +++ b/examples/swap/scripts/localnet.sh @@ -4,7 +4,7 @@ set -e set -x set -o pipefail -if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 15; fi +if [ "$1" = "start" ]; then npx hardhat localnet --exit-on-error & sleep 20; fi echo -e "\nšŸš€ Compiling contracts..." npx hardhat compile --force --quiet @@ -47,6 +47,41 @@ npx hardhat evm-swap \ npx hardhat localnet-check +npx hardhat evm-swap \ + --network localhost \ + --receiver "$CONTRACT_SWAP" \ + --amount 0.1 \ + --target "$ZRC20_BNB" \ + --gateway-evm "$GATEWAY_ETHEREUM" \ + --skip-checks \ + --erc20 "$USDC_ETHEREUM" \ + --recipient "$SENDER" + +npx hardhat localnet-check + +npx hardhat evm-swap \ + --skip-checks \ + --network localhost \ + --receiver "$CONTRACT_SWAP" \ + --amount 0.1 \ + --gateway-evm "$GATEWAY_ETHEREUM" \ + --target "$ZRC20_BNB" \ + --recipient "$SENDER" + +npx hardhat localnet-check + +npx hardhat evm-swap \ + --skip-checks \ + --network localhost \ + --receiver "$CONTRACT_SWAP" \ + --amount 0.1 \ + --target "$ZRC20_BNB" \ + --gateway-evm "$GATEWAY_ETHEREUM" \ + --recipient "$SENDER" \ + --withdraw false + +npx hardhat localnet-check + npx hardhat companion-swap \ --skip-checks \ --network localhost \ @@ -88,29 +123,6 @@ npx hardhat companion-swap \ npx hardhat localnet-check -npx hardhat evm-swap \ - --skip-checks \ - --network localhost \ - --receiver "$CONTRACT_SWAP" \ - --amount 0.1 \ - --gateway-evm "$GATEWAY_ETHEREUM" \ - --target "$ZRC20_BNB" \ - --recipient "$SENDER" - -npx hardhat localnet-check - -npx hardhat evm-swap \ - --skip-checks \ - --network localhost \ - --receiver "$CONTRACT_SWAP" \ - --amount 0.1 \ - --target "$ZRC20_BNB" \ - --gateway-evm "$GATEWAY_ETHEREUM" \ - --recipient "$SENDER" \ - --withdraw false - -npx hardhat localnet-check - npx hardhat zetachain-swap \ --network localhost \ --contract "$CONTRACT_SWAP" \ @@ -121,6 +133,38 @@ npx hardhat zetachain-swap \ npx hardhat localnet-check +# SUI deposit to ZetaChain +# npx hardhat localnet:sui-deposit \ +# --mnemonic "grape subway rack mean march bubble carry avoid muffin consider thing street" \ +# --gateway 0x8d6363911564aa624ca1600d3bd0e094b33d5a97fb7f825092480dbf0f4a01ba \ +# --module 0x28737b339892206e07689dc9abb99d7eeb1ade916c400b5853e3a56cce27987b \ +# --receiver 0x0355B7B8cb128fA5692729Ab3AAa199C1753f726 \ +# --amount 100000000 + +# SUI to SOL +# npx hardhat localnet:sui-deposit-and-call \ +# --mnemonic "grape subway rack mean march bubble carry avoid muffin consider thing street" \ +# --gateway 0x8d6363911564aa624ca1600d3bd0e094b33d5a97fb7f825092480dbf0f4a01ba \ +# --module 0x28737b339892206e07689dc9abb99d7eeb1ade916c400b5853e3a56cce27987b \ +# --receiver 0x0355B7B8cb128fA5692729Ab3AAa199C1753f726 \ +# --amount 100000000 \ +# --types '["address", "bytes", "bool"]' 0x777915D031d1e8144c90D025C594b3b8Bf07a08d 8Sw9oNHHyEyAfQHC41QeFBRMhxG6HmFjNQnSbRvsXGb2 true + +# SOL to SUI +# npx hardhat localnet:solana-deposit-and-call \ +# --receiver 0x0355B7B8cb128fA5692729Ab3AAa199C1753f726 \ +# --amount 0.1 \ +# --types '["address", "bytes", "bool"]' 0xe573a6e11f8506620F123DBF930222163D46BCB6 0x2fec3fafe08d2928a6b8d9a6a77590856c458d984ae090ccbd4177ac13729e65 true + +# SPL to SUI +# npx hardhat localnet:solana-deposit-and-call \ +# --receiver 0x0355B7B8cb128fA5692729Ab3AAa199C1753f726 \ +# --mint HgpR36oSMi8SmQauUpvcE9kpfHXLn6PMKrYFtNjPAafU \ +# --to 4wehnswdQJFnsxiZ9pt5RU9mPy4Yqvgn86XPgXeHiszn \ +# --from 6DmpL65bceSPQvXbKqoh8qEiz1EeBHmTP1i5B87rgVw7 \ +# --amount 0.1 \ +# --types '["address", "bytes", "bool"]' 0xe573a6e11f8506620F123DBF930222163D46BCB6 0x2fec3fafe08d2928a6b8d9a6a77590856c458d984ae090ccbd4177ac13729e65 true + # TESTING REVERTS # npx hardhat companion-swap \ diff --git a/examples/swap/yarn.lock b/examples/swap/yarn.lock index 9c3b82cb..2789516e 100644 --- a/examples/swap/yarn.lock +++ b/examples/swap/yarn.lock @@ -1910,7 +1910,7 @@ dependencies: "@solana/codecs" "2.0.0-rc.1" -"@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": +"@solana/spl-token@^0.4.12", "@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": version "0.4.12" resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.4.12.tgz#09361f9c8116f277b177dbcae7e3a273a19cd48a" integrity sha512-K6CxzSoO1vC+WBys25zlSDaW0w4UFZO/IvEZquEI35A/PjqXNQHeVigmDCZYEJfESvYarKwsr8tYr/29lPtvaw== @@ -2472,18 +2472,19 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/localnet@6.0.0-rc8": - version "6.0.0-rc8" - resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.0-rc8.tgz#ee9b9b3f24ca9a908c61eb97118021e059f6b527" - integrity sha512-s6syRd3EvyQfcTUSjCIWLBGrQ7lt0LBvc0slg+eDAlgkHVF78ezG2L66mSIn5Qms7MO6qF8OCTnshef+kkebKg== +"@zetachain/localnet@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.1.tgz#7bcd8196668002441f31dd56e9c0e49a00889094" + integrity sha512-Rz6SyWgS0lKiKTkbvNnodnbJ0nFviDFHwN+ndkxX+sqglROVQGcLCe2wnm8BjaDQsMENRiz8hxO7qYTVFi9rIw== dependencies: "@coral-xyz/anchor" "^0.30.1" "@inquirer/prompts" "^5.5.0" "@mysten/sui" "^0.0.0-experimental-20250131013137" + "@solana/spl-token" "^0.4.12" "@solana/web3.js" "^1.95.4" "@uniswap/v2-core" "^1.0.1" "@uniswap/v2-periphery" "^1.1.0-beta.0" - "@zetachain/protocol-contracts" "11.0.0-rc5" + "@zetachain/protocol-contracts" "11.0.0" ansis "^3.3.2" bip39 "^3.1.0" bs58 "^6.0.0" @@ -2492,6 +2493,7 @@ elliptic "6.5.7" ethers "^6.13.2" hardhat "^2.22.8" + js-sha256 "^0.11.0" wait-on "^7.2.0" "@zetachain/networks@13.0.0-rc1": @@ -2520,20 +2522,20 @@ ethereumjs-util "^7.1.5" secp256k1 "^5.0.0" -"@zetachain/protocol-contracts@11.0.0-rc4": - version "11.0.0-rc4" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc4.tgz#2e2df98734793873e9c50629f6ec9f5eec6f9f54" - integrity sha512-7MJzEyUad7JgHucveIhtU8aaPkoMMzsfhKkh9MDMdxUzlaOmmxrQw2hi5B2b7UPxw2K9vFffkmIox6gd6c1+Yw== +"@zetachain/protocol-contracts@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0.tgz#4889044ae2f5db3f38d052a869775d17798f273e" + integrity sha512-BKkLLru4ZJzOh0G2kBYqzjzvb6nvH8c/FlT0Py4f5TAMnrw4h5PnhKMJbWjznv+e2LJ/I9PPpCeqB9zPfGoJPA== dependencies: "@openzeppelin/contracts" "^5.0.2" "@openzeppelin/contracts-upgradeable" "^5.0.2" "@zetachain/networks" "^10.0.0" ethers "5.6.8" -"@zetachain/protocol-contracts@11.0.0-rc5": - version "11.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc5.tgz#b55119e6cade29c4f266eb029d8879b968f87f63" - integrity sha512-+bjeTvSzuchWEIxrZ7IbOb8ERhZ+PtgmyOSSFcwhhyAOonYxNlM+1M/mSNAk5i3cdZyJTINzhk7H603/RQSeqA== +"@zetachain/protocol-contracts@11.0.0-rc4": + version "11.0.0-rc4" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc4.tgz#2e2df98734793873e9c50629f6ec9f5eec6f9f54" + integrity sha512-7MJzEyUad7JgHucveIhtU8aaPkoMMzsfhKkh9MDMdxUzlaOmmxrQw2hi5B2b7UPxw2K9vFffkmIox6gd6c1+Yw== dependencies: "@openzeppelin/contracts" "^5.0.2" "@openzeppelin/contracts-upgradeable" "^5.0.2" @@ -5567,6 +5569,11 @@ js-cookie@^2.2.1: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" diff --git a/examples/token/package.json b/examples/token/package.json index f08811cb..3b43ac9b 100644 --- a/examples/token/package.json +++ b/examples/token/package.json @@ -28,7 +28,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/localnet": "6.0.0-rc8", + "@zetachain/localnet": "^6.0.1", "axios": "^1.3.6", "chai": "^4.2.0", "dotenv": "^16.0.3", @@ -58,8 +58,8 @@ "@solana/spl-memo": "^0.2.5", "@solana/web3.js": "^1.95.8", "@zetachain/protocol-contracts": "11.0.0-rc3", - "@zetachain/standard-contracts": "1.0.0-rc6", + "@zetachain/standard-contracts": "2.0.0-rc2", "@zetachain/toolkit": "13.0.0-rc17", "validator": "^13.12.0" } -} \ No newline at end of file +} diff --git a/examples/token/yarn.lock b/examples/token/yarn.lock index 33fdd5c0..21f79fbe 100644 --- a/examples/token/yarn.lock +++ b/examples/token/yarn.lock @@ -1910,7 +1910,7 @@ dependencies: "@solana/codecs" "2.0.0-rc.1" -"@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": +"@solana/spl-token@^0.4.12", "@solana/spl-token@^0.4.6", "@solana/spl-token@^0.4.8": version "0.4.12" resolved "https://registry.yarnpkg.com/@solana/spl-token/-/spl-token-0.4.12.tgz#09361f9c8116f277b177dbcae7e3a273a19cd48a" integrity sha512-K6CxzSoO1vC+WBys25zlSDaW0w4UFZO/IvEZquEI35A/PjqXNQHeVigmDCZYEJfESvYarKwsr8tYr/29lPtvaw== @@ -2472,18 +2472,19 @@ typescript "5.5.4" zod "3.22.4" -"@zetachain/localnet@6.0.0-rc8": - version "6.0.0-rc8" - resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.0-rc8.tgz#ee9b9b3f24ca9a908c61eb97118021e059f6b527" - integrity sha512-s6syRd3EvyQfcTUSjCIWLBGrQ7lt0LBvc0slg+eDAlgkHVF78ezG2L66mSIn5Qms7MO6qF8OCTnshef+kkebKg== +"@zetachain/localnet@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@zetachain/localnet/-/localnet-6.0.1.tgz#7bcd8196668002441f31dd56e9c0e49a00889094" + integrity sha512-Rz6SyWgS0lKiKTkbvNnodnbJ0nFviDFHwN+ndkxX+sqglROVQGcLCe2wnm8BjaDQsMENRiz8hxO7qYTVFi9rIw== dependencies: "@coral-xyz/anchor" "^0.30.1" "@inquirer/prompts" "^5.5.0" "@mysten/sui" "^0.0.0-experimental-20250131013137" + "@solana/spl-token" "^0.4.12" "@solana/web3.js" "^1.95.4" "@uniswap/v2-core" "^1.0.1" "@uniswap/v2-periphery" "^1.1.0-beta.0" - "@zetachain/protocol-contracts" "11.0.0-rc5" + "@zetachain/protocol-contracts" "11.0.0" ansis "^3.3.2" bip39 "^3.1.0" bs58 "^6.0.0" @@ -2492,15 +2493,9 @@ elliptic "6.5.7" ethers "^6.13.2" hardhat "^2.22.8" + js-sha256 "^0.11.0" wait-on "^7.2.0" -"@zetachain/networks@10.0.0-rc4": - version "10.0.0-rc4" - resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-10.0.0-rc4.tgz#9af65c87aac0811b420ecb71eb9adc9da3d0865f" - integrity sha512-QFa6TrUO3RkkOE/qGnvtNBEywCqTUgF/z2XGWsRSG6+f8QwDM49A1591KyJ72JBQENYQUheLHAwSjMMWd5LlRg== - dependencies: - dotenv "^16.1.4" - "@zetachain/networks@13.0.0-rc1": version "13.0.0-rc1" resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-13.0.0-rc1.tgz#c43acb879a966102cd570cb80a2f60e5166c9f3c" @@ -2527,6 +2522,16 @@ ethereumjs-util "^7.1.5" secp256k1 "^5.0.0" +"@zetachain/protocol-contracts@11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0.tgz#4889044ae2f5db3f38d052a869775d17798f273e" + integrity sha512-BKkLLru4ZJzOh0G2kBYqzjzvb6nvH8c/FlT0Py4f5TAMnrw4h5PnhKMJbWjznv+e2LJ/I9PPpCeqB9zPfGoJPA== + dependencies: + "@openzeppelin/contracts" "^5.0.2" + "@openzeppelin/contracts-upgradeable" "^5.0.2" + "@zetachain/networks" "^10.0.0" + ethers "5.6.8" + "@zetachain/protocol-contracts@11.0.0-rc3": version "11.0.0-rc3" resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc3.tgz#9b719391d0728fd1b4e046c5f496180a45ecf0d5" @@ -2547,22 +2552,10 @@ "@zetachain/networks" "^10.0.0" ethers "5.6.8" -"@zetachain/protocol-contracts@11.0.0-rc5": - version "11.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-11.0.0-rc5.tgz#b55119e6cade29c4f266eb029d8879b968f87f63" - integrity sha512-+bjeTvSzuchWEIxrZ7IbOb8ERhZ+PtgmyOSSFcwhhyAOonYxNlM+1M/mSNAk5i3cdZyJTINzhk7H603/RQSeqA== - dependencies: - "@openzeppelin/contracts" "^5.0.2" - "@openzeppelin/contracts-upgradeable" "^5.0.2" - "@zetachain/networks" "^10.0.0" - ethers "5.6.8" - -"@zetachain/standard-contracts@1.0.0-rc6": - version "1.0.0-rc6" - resolved "https://registry.yarnpkg.com/@zetachain/standard-contracts/-/standard-contracts-1.0.0-rc6.tgz#c67728dbe39bcf2816644d4a7699ffe7e4b339dd" - integrity sha512-M5cbfZVVota665yv8HNPa2MMHaPduVRLTKLja9cCjAV1AV0TqUujtrswGB5UIUk4J1mnLdo9MZr6uHFKalr5+A== - dependencies: - validator "^13.12.0" +"@zetachain/standard-contracts@2.0.0-rc2": + version "2.0.0-rc2" + resolved "https://registry.yarnpkg.com/@zetachain/standard-contracts/-/standard-contracts-2.0.0-rc2.tgz#5e51e7206ce8253d9949031fc4fe14a6969282a5" + integrity sha512-K2rAXs18FoESX15UdWeY8iNJLZUqEdFi/aJNQdr/e3mPtH8xyTetIM3CMvfvOsYHqMl0XlIuWHCUuIsDOnjk5g== "@zetachain/toolkit@13.0.0-rc17": version "13.0.0-rc17" @@ -5591,6 +5584,11 @@ js-cookie@^2.2.1: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ== +js-sha256@^0.11.0: + version "0.11.0" + resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" + integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== + js-sha3@0.8.0, js-sha3@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840"