From 47db68c9af34b3199bccb84065d523040c2cc56e Mon Sep 17 00:00:00 2001 From: Krishang Date: Mon, 16 Oct 2023 22:52:35 +0530 Subject: [PATCH 1/7] enforce node >=18 instead of 20 --- contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/package.json b/contracts/package.json index 800d7a2fa..c8ae602aa 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -24,6 +24,6 @@ "@thirdweb-dev/dynamic-contracts": "^1.1.2" }, "engines": { - "node": ">=20.0.0" + "node": ">=18.0.0" } } From cd6373fc9270c7e82e225e3b90d17d53d305b50f Mon Sep 17 00:00:00 2001 From: Krishang Date: Tue, 17 Oct 2023 00:40:35 +0530 Subject: [PATCH 2/7] Update github action to use node 18 --- .github/composite-actions/setup/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/composite-actions/setup/action.yml b/.github/composite-actions/setup/action.yml index a2cc33f83..a080f4495 100644 --- a/.github/composite-actions/setup/action.yml +++ b/.github/composite-actions/setup/action.yml @@ -7,7 +7,7 @@ runs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 18 registry-url: "https://registry.npmjs.org" cache: "yarn" From db4f23ec6de6656c9e7a9e4b7aa004e9f2dfe249 Mon Sep 17 00:00:00 2001 From: Krishang Date: Tue, 17 Oct 2023 00:59:11 +0530 Subject: [PATCH 3/7] pkg release 3.10.3 --- contracts/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/package.json b/contracts/package.json index c8ae602aa..48693cf4e 100644 --- a/contracts/package.json +++ b/contracts/package.json @@ -1,7 +1,7 @@ { "name": "@thirdweb-dev/contracts", "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI", - "version": "3.10.3-1", + "version": "3.10.3", "license": "Apache-2.0", "repository": { "type": "git", From 5f282d1e20613c15fb615eebcbbf1273045416fd Mon Sep 17 00:00:00 2001 From: Joaquim Verges Date: Mon, 16 Oct 2023 13:03:07 -0700 Subject: [PATCH 4/7] update SDK --- package.json | 4 ++-- yarn.lock | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index f064f0f4a..2cc66d2a6 100644 --- a/package.json +++ b/package.json @@ -11,9 +11,9 @@ "@chainlink/contracts": "^0.6.1", "@openzeppelin/contracts": "4.7.3", "@openzeppelin/contracts-upgradeable": "4.7.3", - "@thirdweb-dev/dynamic-contracts": "^1.1.2", - "@thirdweb-dev/sdk": "^4", "@thirdweb-dev/chains": "^0.1.54", + "@thirdweb-dev/dynamic-contracts": "^1.1.2", + "@thirdweb-dev/sdk": "^4.0.4", "@typechain/ethers-v5": "^10.0.0", "@types/fs-extra": "^9.0.13", "@types/mocha": "^9.1.0", diff --git a/yarn.lock b/yarn.lock index a90012b01..747387e47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -520,17 +520,17 @@ resolved "https://registry.yarnpkg.com/@thirdweb-dev/chains/-/chains-0.1.54.tgz#90e5c372a1d9cd785c51715bfbeba276ca2a203f" integrity sha512-iCuKgtN2KIdfgqbIbZYgB8ObYdOJW9iXW9b5u+WKA4zyGApw1MTOSX0W2aPnadGen1z4iQfAuUDBYQ6JVqDOjg== -"@thirdweb-dev/contracts-js@1.3.15": - version "1.3.15" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.15.tgz#1e9df70cc4333ab2d6f0af5f0e9f2e26b043d9c9" - integrity sha512-ACKwjYPgTkhwvFvAbJudCZ9tQJIKpkaTKeq/tVBt3A2OXfAb8jc33Iu78K5WYoX0E0wvGqSxU8K8vkxij+RsnA== +"@thirdweb-dev/contracts-js@1.3.16": + version "1.3.16" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts-js/-/contracts-js-1.3.16.tgz#264727b40b0f320c01eefcb4295e89c9e9947002" + integrity sha512-EpLcD5mdm8b+tvSO7gD9cxSAqjLRr7ygktMp4Pe7Wvobl5ffq8O95futxdVsYc5pyciPZYr8apHUJFYMDlaTqA== dependencies: - "@thirdweb-dev/contracts" "3.10.3-1" + "@thirdweb-dev/contracts" "3.10.3" -"@thirdweb-dev/contracts@3.10.3-1": - version "3.10.3-1" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.10.3-1.tgz#0f970fa0b9c821cd9036bb51334ab92083123a96" - integrity sha512-eiGS1Q2+Ge48yEO+kBw0DqR6eTN6ip4vrY0eBoaUrpcFAudd+aW+qszxCFBUuKSHIxvRs3Ul2b64pdYFEXzMIA== +"@thirdweb-dev/contracts@3.10.3": + version "3.10.3" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.10.3.tgz#985b890b2bac051bc69a9108ac9e9df0fd37a1c1" + integrity sha512-wSVNaEoosn0AgUtnxlvv7rgK+3EUMzJm2ZasofPgJgqGS3gYH5nDBmK29VMquA2BLc38OAPyYMWc/iQCiCikMg== dependencies: "@chainlink/contracts" "^0.6.1" "@openzeppelin/contracts" "4.7.3" @@ -548,13 +548,13 @@ resolved "https://registry.yarnpkg.com/@thirdweb-dev/generated-abis/-/generated-abis-0.0.1.tgz#0d788d6aff0ac08f11e9eeb9ae4c8321845272a8" integrity sha512-vO9/3lSLO8smyyH1QVeYravSTzFwV1nf1C/Im1NBDPdH8//YvcbhtETGGiNfHWpyCvSi0vRYwvf+/7FKdwpDGQ== -"@thirdweb-dev/sdk@^4": - version "4.0.3" - resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-4.0.3.tgz#51dc8eddca91a342467b4e712431d41cc3d8fd89" - integrity sha512-VcS0XjCxddiHYy+bavnMm0VliEnrSexp8hwzU2yBlxAXbnqm+H6EAfNHHVoJwFlWsG9y056s7YPzBlv6yZlk0w== +"@thirdweb-dev/sdk@^4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@thirdweb-dev/sdk/-/sdk-4.0.4.tgz#bcc5c4a0b349fbf1255727444a77947c7264f591" + integrity sha512-iLHP44L2h4UG2u/DKNoSA4Os21d3Wm5Sc+PEOxF5+FLr+kkQe0dSVFq4w//r7t6sQIuA1nRTZEEObrdU1EtfLA== dependencies: "@thirdweb-dev/chains" "0.1.54" - "@thirdweb-dev/contracts-js" "1.3.15" + "@thirdweb-dev/contracts-js" "1.3.16" "@thirdweb-dev/generated-abis" "0.0.1" "@thirdweb-dev/storage" "2.0.0" abitype "^0.2.5" From 27e229d1743af6d821c1eaa212eaa321ae0ed094 Mon Sep 17 00:00:00 2001 From: Joaquim Verges Date: Mon, 16 Oct 2023 13:08:04 -0700 Subject: [PATCH 5/7] fix slither --- .github/workflows/slither.yml | 2 +- .github/workflows/tests.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index e63b903d7..525c02179 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -37,7 +37,7 @@ jobs: continue-on-error: true id: slither with: - node-version: 16 + node-version: 18 sarif: results.sarif - name: Upload SARIF file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 137e4f915..7b7304a6a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: test: # The type of runner that the job will run on # 16 core paid runner - runs-on: ubuntu-latest-16 + runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: From cbec79d25111f442e3a60979ef8a99954f3e38b4 Mon Sep 17 00:00:00 2001 From: Joaquim Verges Date: Mon, 16 Oct 2023 13:22:51 -0700 Subject: [PATCH 6/7] change actions --- .github/workflows/slither.yml | 2 +- .github/workflows/tests.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index 525c02179..73a3f3650 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -23,6 +23,7 @@ jobs: with: submodules: recursive fetch-depth: 25 + node-version: 18 - name: Setup Project uses: ./.github/composite-actions/setup @@ -37,7 +38,6 @@ jobs: continue-on-error: true id: slither with: - node-version: 18 sarif: results.sarif - name: Upload SARIF file diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b7304a6a..378142f16 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: test: # The type of runner that the job will run on # 16 core paid runner - runs-on: ubuntu-latest + runs-on: ubuntu-latest-16-cores # Steps represent a sequence of tasks that will be executed as part of the job steps: @@ -30,6 +30,7 @@ jobs: with: submodules: recursive fetch-depth: 25 + node-version: 18 - name: Setup Project uses: ./.github/composite-actions/setup From 55b2867b1fe8072b1ec6eb69cc3a0278f10e92ed Mon Sep 17 00:00:00 2001 From: Joaquim Verges Date: Mon, 16 Oct 2023 13:27:02 -0700 Subject: [PATCH 7/7] revert runs-on --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 378142f16..3887fb49b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,7 @@ jobs: test: # The type of runner that the job will run on # 16 core paid runner - runs-on: ubuntu-latest-16-cores + runs-on: ubuntu-latest-16 # Steps represent a sequence of tasks that will be executed as part of the job steps: