From e073cab3d17a3c93879aca892fb36c813afb79e5 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Mon, 11 Mar 2024 11:11:10 +0500 Subject: [PATCH 1/4] Update template to toolkit v6 --- package.json | 2 +- tsconfig.json | 1 + yarn.lock | 29 +++++++++++++++-------------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 150f1c0..76d185d 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/toolkit": "5.0.0", + "@zetachain/toolkit": "6.0.0-rc5", "axios": "^1.3.6", "chai": "^4.2.0", "dotenv": "^16.0.3", diff --git a/tsconfig.json b/tsconfig.json index 574e785..0474f6e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -6,6 +6,7 @@ "forceConsistentCasingInFileNames": true, "strict": true, "skipLibCheck": true, + "moduleResolution": "bundler", "resolveJsonModule": true } } diff --git a/yarn.lock b/yarn.lock index 8e705ed..bab17c1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1699,22 +1699,22 @@ typescript "5.0.4" zod "3.19.1" -"@zetachain/networks@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-3.0.0.tgz#4af60859e6fe057002d17d81f088be5581cdcf9a" - integrity sha512-Yq6kbXhxou7SOazDYBhHev8k6JtWMkX+QAzshg/JYW07mDQg78MFEfqWDWmfD4xtWOsPKvnjrURpGgROc5xqKw== +"@zetachain/networks@4.0.0-rc1": + version "4.0.0-rc1" + resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-4.0.0-rc1.tgz#0ec6efabaa78d7124f5adb9218f25d85e252087b" + integrity sha512-Zl8cZc5PdKI46KZqPeIu7DmpSqUkXN07L9Yxy/Lp233L9pZKWUVr7RnEq2HUaN9F6gqtxlofNtKBFopphm1pEQ== dependencies: dotenv "^16.1.4" -"@zetachain/protocol-contracts@^3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-3.0.2.tgz#384b73484fedd1cba130af473f92664293f3ac1e" - integrity sha512-5Z66o0AdOtHYWFfcgjsH9Y79bHHK/h9I+TsOwHsIiqOp/fTdGLZ2HJO/PKgjbeUsfvI2RMm/UyYYWgsX6gucBQ== +"@zetachain/protocol-contracts@5.0.0-rc6": + version "5.0.0-rc6" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-5.0.0-rc6.tgz#1ec1419a71cdea831ac8de159bfbffae257785f5" + integrity sha512-NIN3mkR4csq1yGtv9miOWKHj2S6azTo/QET7ALKh5dxPnpCmTHx9Lgf+xuDa95W/Tbw8BAGHdRoyp0z3j72kXQ== -"@zetachain/toolkit@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-5.0.0.tgz#e581818ff32359a411546d7b820b560eeea66be3" - integrity sha512-3suCqG36JvUpOBUnmiozjwiIzxDItYQcmeXFiMZ8RZTGW0g9ISAvnOeYY8yaANkzAYrCyfuNzVnUgD6Lm+So7g== +"@zetachain/toolkit@6.0.0-rc5": + version "6.0.0-rc5" + resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-6.0.0-rc5.tgz#b2cdcf9823eb04fb628739e9e9d3c975eddf9de9" + integrity sha512-t9ubVlPuJVfbXH9Agt9ftR7UXxcIg36an8CIzm7gn/yRO0ZQY9xqi/3gEXFKJt6R68i3m0+jw2gfQthI5i6igw== dependencies: "@inquirer/prompts" "^2.1.1" "@inquirer/select" "1.1.3" @@ -1722,8 +1722,8 @@ "@openzeppelin/contracts" "^4.9.2" "@uniswap/v2-periphery" "^1.1.0-beta.0" "@zetachain/faucet-cli" "^4.0.1" - "@zetachain/networks" "^3.0.0" - "@zetachain/protocol-contracts" "^3.0.2" + "@zetachain/networks" "4.0.0-rc1" + "@zetachain/protocol-contracts" "5.0.0-rc6" axios "^1.4.0" bech32 "^2.0.0" bip39 "^3.1.0" @@ -1737,6 +1737,7 @@ handlebars "4.7.7" hardhat "^2.15.0" isomorphic-fetch "^3.0.0" + lodash "^4.17.21" moment "^2.29.4" ora "5.4.1" spinnies "^0.5.1" From 1f56081eaef2e7e49c1c563a889d5110ded1e25a Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Mon, 11 Mar 2024 11:11:57 +0500 Subject: [PATCH 2/4] tsconfig module es2020 --- tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tsconfig.json b/tsconfig.json index 0474f6e..af3ba73 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { "target": "es2020", - "module": "commonjs", + "module": "es2020", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "strict": true, From d436751a770c7359735fd1f1f9b4fa50db82ea20 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Mon, 11 Mar 2024 11:15:18 +0500 Subject: [PATCH 3/4] tsconfig nodenext --- tsconfig.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tsconfig.json b/tsconfig.json index af3ba73..fb0567b 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,12 +1,11 @@ { "compilerOptions": { - "target": "es2020", - "module": "es2020", + "module": "nodenext", + "moduleResolution": "nodenext", "esModuleInterop": true, "forceConsistentCasingInFileNames": true, "strict": true, "skipLibCheck": true, - "moduleResolution": "bundler", "resolveJsonModule": true } } From 6cd5178b656fc5953a2be84aa17c41750326ca02 Mon Sep 17 00:00:00 2001 From: Denis Fadeev Date: Thu, 28 Mar 2024 14:21:54 +0900 Subject: [PATCH 4/4] toolkit v6 --- package.json | 2 +- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 76d185d..da774ba 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "@types/node": ">=12.0.0", "@typescript-eslint/eslint-plugin": "^5.59.9", "@typescript-eslint/parser": "^5.59.9", - "@zetachain/toolkit": "6.0.0-rc5", + "@zetachain/toolkit": "^6.0.0", "axios": "^1.3.6", "chai": "^4.2.0", "dotenv": "^16.0.3", diff --git a/yarn.lock b/yarn.lock index bab17c1..206d04d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1699,22 +1699,22 @@ typescript "5.0.4" zod "3.19.1" -"@zetachain/networks@4.0.0-rc1": - version "4.0.0-rc1" - resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-4.0.0-rc1.tgz#0ec6efabaa78d7124f5adb9218f25d85e252087b" - integrity sha512-Zl8cZc5PdKI46KZqPeIu7DmpSqUkXN07L9Yxy/Lp233L9pZKWUVr7RnEq2HUaN9F6gqtxlofNtKBFopphm1pEQ== +"@zetachain/networks@6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/networks/-/networks-6.0.0.tgz#ae5d3cd1678b32510edfaa71f8f4a6f4cbc1d9ab" + integrity sha512-yKFVP/yJDp76Q5lBGfZSpY/KO3TZ9ldo0lhE4MpBW43EsBxOZWixg6sqb56mcU/gg1lbWG8sHHWtYFK51SByjQ== dependencies: dotenv "^16.1.4" -"@zetachain/protocol-contracts@5.0.0-rc6": - version "5.0.0-rc6" - resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-5.0.0-rc6.tgz#1ec1419a71cdea831ac8de159bfbffae257785f5" - integrity sha512-NIN3mkR4csq1yGtv9miOWKHj2S6azTo/QET7ALKh5dxPnpCmTHx9Lgf+xuDa95W/Tbw8BAGHdRoyp0z3j72kXQ== +"@zetachain/protocol-contracts@7.0.0-rc1": + version "7.0.0-rc1" + resolved "https://registry.yarnpkg.com/@zetachain/protocol-contracts/-/protocol-contracts-7.0.0-rc1.tgz#588483d1ec70e572b7e40e84ef5b34282b0ab375" + integrity sha512-vgS+Pjh4MysOyw8WbqTQVBsHJYqKvMcdV7cNVqxaTJd/dl2ak7NNvsIeaeUnxQrp8XfQol2B8GXJpVLM6MK/dg== -"@zetachain/toolkit@6.0.0-rc5": - version "6.0.0-rc5" - resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-6.0.0-rc5.tgz#b2cdcf9823eb04fb628739e9e9d3c975eddf9de9" - integrity sha512-t9ubVlPuJVfbXH9Agt9ftR7UXxcIg36an8CIzm7gn/yRO0ZQY9xqi/3gEXFKJt6R68i3m0+jw2gfQthI5i6igw== +"@zetachain/toolkit@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@zetachain/toolkit/-/toolkit-6.0.0.tgz#385cfd11f1ac39cbb6ca6410109523e2ab6f8841" + integrity sha512-JAtl7CX8cMJ+iw/byjcbLqgCfPS87vkdYCZOPBBOudqUySPTz4owqVgGZB/xYRyXBsF0KW0F6R65sc+fleQ86A== dependencies: "@inquirer/prompts" "^2.1.1" "@inquirer/select" "1.1.3" @@ -1722,8 +1722,8 @@ "@openzeppelin/contracts" "^4.9.2" "@uniswap/v2-periphery" "^1.1.0-beta.0" "@zetachain/faucet-cli" "^4.0.1" - "@zetachain/networks" "4.0.0-rc1" - "@zetachain/protocol-contracts" "5.0.0-rc6" + "@zetachain/networks" "6.0.0" + "@zetachain/protocol-contracts" "7.0.0-rc1" axios "^1.4.0" bech32 "^2.0.0" bip39 "^3.1.0"