From 9329a70a63531cb8cad93bcde7330174b0fa2332 Mon Sep 17 00:00:00 2001 From: huianyang Date: Wed, 4 Sep 2024 17:08:51 -0700 Subject: [PATCH 1/7] chore: updated package.json with node20 and license Apache --- package-lock.json | 38 +++++++++---------- packages/taquito-beacon-wallet/package.json | 2 +- .../taquito-contracts-library/package.json | 2 +- packages/taquito-core/package.json | 2 +- packages/taquito-http-utils/package.json | 2 +- packages/taquito-ledger-signer/package.json | 2 +- packages/taquito-local-forging/package.json | 2 +- packages/taquito-michel-codec/package.json | 4 +- .../taquito-michelson-encoder/package.json | 2 +- packages/taquito-remote-signer/package.json | 2 +- packages/taquito-rpc/package.json | 2 +- packages/taquito-sapling/package.json | 2 +- packages/taquito-signer/package.json | 2 +- packages/taquito-timelock/package.json | 2 +- packages/taquito-tzip12/package.json | 2 +- packages/taquito-tzip16/package.json | 2 +- packages/taquito-utils/package.json | 2 +- packages/taquito/package.json | 2 +- 18 files changed, 37 insertions(+), 37 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50b8d24a12..6093a959cd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,5 +1,5 @@ { - "name": "proj", + "name": "taquito", "lockfileVersion": 3, "requires": true, "packages": { @@ -27382,7 +27382,7 @@ "webpack-subresource-integrity": "^5.1.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-beacon-wallet": { @@ -27427,7 +27427,7 @@ "webpack-cli": "^5.1.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-beacon-wallet/node_modules/@types/chrome": { @@ -27481,7 +27481,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-core": { @@ -27497,7 +27497,7 @@ "rollup-plugin-typescript2": "^0.36.0" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-http-utils": { @@ -27538,7 +27538,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-http-utils/node_modules/node-fetch": { @@ -27602,7 +27602,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-ledger-signer/node_modules/buffer": { @@ -27672,13 +27672,13 @@ "webpack-cli": "^5.1.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-michel-codec": { "name": "@taquito/michel-codec", "version": "20.0.1", - "license": "MIT", + "license": "Apache-2.0", "dependencies": { "@taquito/core": "^20.0.1" }, @@ -27705,7 +27705,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-michel-codec/pack-test-tool": { @@ -27755,7 +27755,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-remote-signer": { @@ -27800,7 +27800,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-rpc": { @@ -27841,7 +27841,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-sapling": { @@ -27892,7 +27892,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-sapling/node_modules/node-fetch": { @@ -27966,7 +27966,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-timelock": { @@ -28007,7 +28007,7 @@ "typescript": "^5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-tzip12": { @@ -28049,7 +28049,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-tzip16": { @@ -28096,7 +28096,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-utils": { @@ -28144,7 +28144,7 @@ "typescript": "~5.5.4" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "packages/taquito-utils/node_modules/buffer": { diff --git a/packages/taquito-beacon-wallet/package.json b/packages/taquito-beacon-wallet/package.json index dfc1161cf4..a271b27979 100644 --- a/packages/taquito-beacon-wallet/package.json +++ b/packages/taquito-beacon-wallet/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-contracts-library/package.json b/packages/taquito-contracts-library/package.json index 3a7815248e..2e43471fa2 100644 --- a/packages/taquito-contracts-library/package.json +++ b/packages/taquito-contracts-library/package.json @@ -22,7 +22,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-core/package.json b/packages/taquito-core/package.json index 9d3a038ebb..f90b09f0f7 100644 --- a/packages/taquito-core/package.json +++ b/packages/taquito-core/package.json @@ -23,7 +23,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito-http-utils/package.json b/packages/taquito-http-utils/package.json index f7892678fe..a8fe0d1c84 100644 --- a/packages/taquito-http-utils/package.json +++ b/packages/taquito-http-utils/package.json @@ -22,7 +22,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito-ledger-signer/package.json b/packages/taquito-ledger-signer/package.json index 62977ec7e8..4252709ac8 100644 --- a/packages/taquito-ledger-signer/package.json +++ b/packages/taquito-ledger-signer/package.json @@ -20,7 +20,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito-local-forging/package.json b/packages/taquito-local-forging/package.json index a239f713c2..03b5410d74 100644 --- a/packages/taquito-local-forging/package.json +++ b/packages/taquito-local-forging/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-michel-codec/package.json b/packages/taquito-michel-codec/package.json index 4813257a73..51681c8402 100644 --- a/packages/taquito-michel-codec/package.json +++ b/packages/taquito-michel-codec/package.json @@ -22,9 +22,9 @@ "type": "git", "url": "git+https://github.com/ecadlabs/taquito.git" }, - "license": "MIT", + "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-michelson-encoder/package.json b/packages/taquito-michelson-encoder/package.json index f5799aae5d..a2631285c9 100644 --- a/packages/taquito-michelson-encoder/package.json +++ b/packages/taquito-michelson-encoder/package.json @@ -25,7 +25,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-remote-signer/package.json b/packages/taquito-remote-signer/package.json index 7e66ec118c..6dc36a6e6c 100644 --- a/packages/taquito-remote-signer/package.json +++ b/packages/taquito-remote-signer/package.json @@ -23,7 +23,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-rpc/package.json b/packages/taquito-rpc/package.json index 9bdbbd437c..ca610b7175 100644 --- a/packages/taquito-rpc/package.json +++ b/packages/taquito-rpc/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-sapling/package.json b/packages/taquito-sapling/package.json index 557deb4ec8..42968fe031 100644 --- a/packages/taquito-sapling/package.json +++ b/packages/taquito-sapling/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-signer/package.json b/packages/taquito-signer/package.json index c25eb2bbac..6436d4d20e 100644 --- a/packages/taquito-signer/package.json +++ b/packages/taquito-signer/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-timelock/package.json b/packages/taquito-timelock/package.json index 6c7cb0ac0f..e2f43208b9 100644 --- a/packages/taquito-timelock/package.json +++ b/packages/taquito-timelock/package.json @@ -19,7 +19,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", diff --git a/packages/taquito-tzip12/package.json b/packages/taquito-tzip12/package.json index cbb219d4d4..16184f9071 100644 --- a/packages/taquito-tzip12/package.json +++ b/packages/taquito-tzip12/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito-tzip16/package.json b/packages/taquito-tzip16/package.json index f7b841cd8f..1e627cc56f 100644 --- a/packages/taquito-tzip16/package.json +++ b/packages/taquito-tzip16/package.json @@ -24,7 +24,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito-utils/package.json b/packages/taquito-utils/package.json index 4a72790bda..4a51e8f768 100644 --- a/packages/taquito-utils/package.json +++ b/packages/taquito-utils/package.json @@ -25,7 +25,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "lint": "eslint --ext .js,.ts .", diff --git a/packages/taquito/package.json b/packages/taquito/package.json index 4584ed2de4..0d0b7b0e93 100644 --- a/packages/taquito/package.json +++ b/packages/taquito/package.json @@ -28,7 +28,7 @@ }, "license": "Apache-2.0", "engines": { - "node": ">=18" + "node": ">=20" }, "scripts": { "test": "jest --coverage", From 02e7967ca4c507f094a9b487e2d65c18519d919f Mon Sep 17 00:00:00 2001 From: huianyang Date: Wed, 4 Sep 2024 17:11:15 -0700 Subject: [PATCH 2/7] test: replaced obsolete cloudflare-ipfs.com with dweb.link, error handling assertion and config --- .../__tests__/http-backend-request-error-handling.spec.ts | 4 ++-- ...ntract-having-metadata-on-IPFS-and-fetch-those.spec.ts | 2 +- ...wallet-having-metadata-on-IPFS-and-fetch-those.spec.ts | 2 +- integration-tests/config.ts | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/integration-tests/__tests__/http-backend-request-error-handling.spec.ts b/integration-tests/__tests__/http-backend-request-error-handling.spec.ts index 612cbed9fa..7d6039ffe9 100644 --- a/integration-tests/__tests__/http-backend-request-error-handling.spec.ts +++ b/integration-tests/__tests__/http-backend-request-error-handling.spec.ts @@ -27,9 +27,9 @@ describe('HttpBackend request', () => { }); } catch (err: any) { expect(err.name).toEqual('HttpResponseError'); - expect(err.status).toEqual(403); + expect(err.status).toEqual(404); expect(err.url).toEqual('https://mainnet.ecadinfra.com/chains/main/blocks/head/helpers/baking_rights?level=0'); - expect(err.message).toContain('Not authorized'); + expect(err.message).toContain('Not Found'); } }); }); diff --git a/integration-tests/__tests__/tzip-metadata/tzip16-originate-contract-having-metadata-on-IPFS-and-fetch-those.spec.ts b/integration-tests/__tests__/tzip-metadata/tzip16-originate-contract-having-metadata-on-IPFS-and-fetch-those.spec.ts index 44e95f9d1c..d7ccc46956 100644 --- a/integration-tests/__tests__/tzip-metadata/tzip16-originate-contract-having-metadata-on-IPFS-and-fetch-those.spec.ts +++ b/integration-tests/__tests__/tzip-metadata/tzip16-originate-contract-having-metadata-on-IPFS-and-fetch-those.spec.ts @@ -7,7 +7,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => { const Tezos = lib; const customHandler = new Map([ - ['ipfs', new IpfsHttpHandler('cloudflare-ipfs.com')] + ['ipfs', new IpfsHttpHandler('dweb.link')] ]); const customMetadataProvider = new MetadataProvider(customHandler); diff --git a/integration-tests/__tests__/tzip-metadata/tzip16-originate-wallet-having-metadata-on-IPFS-and-fetch-those.spec.ts b/integration-tests/__tests__/tzip-metadata/tzip16-originate-wallet-having-metadata-on-IPFS-and-fetch-those.spec.ts index 1042155bfe..20612172b0 100644 --- a/integration-tests/__tests__/tzip-metadata/tzip16-originate-wallet-having-metadata-on-IPFS-and-fetch-those.spec.ts +++ b/integration-tests/__tests__/tzip-metadata/tzip16-originate-wallet-having-metadata-on-IPFS-and-fetch-those.spec.ts @@ -7,7 +7,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => { const Tezos = lib; const customHandler = new Map([ - ['ipfs', new IpfsHttpHandler('cloudflare-ipfs.com')] + ['ipfs', new IpfsHttpHandler('dweb.link')] ]); const customMetadataProvider = new MetadataProvider(customHandler); diff --git a/integration-tests/config.ts b/integration-tests/config.ts index 85d05f6b79..290e13880b 100644 --- a/integration-tests/config.ts +++ b/integration-tests/config.ts @@ -117,7 +117,7 @@ const defaultConfig = ({ rpc: process.env[`TEZOS_RPC_${networkName}`] || defaultRpc, pollingIntervalMilliseconds: process.env[`POLLING_INTERVAL_MILLISECONDS`] || undefined, rpcCacheMilliseconds: process.env[`RPC_CACHE_MILLISECONDS`] || '1000', - knownBaker: process.env[`TEZOS_BAKER`] || (networkName === 'WEEKLYNET' ? 'tz1ck3EJwzFpbLVmXVuEn5Ptwzc6Aj14mHSH' : 'tz1TGKSrZrBpND3PELJ43nVdyadoeiM1WMzb'), // tz1TGKSrZrBpND3PELJ43nVdyadoeiM1WMzbn(Germán - TT) is a placeholder for til tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD accepts external staking + knownBaker: process.env[`TEZOS_BAKER`] || (networkName === 'WEEKLYNET' ? 'tz1ck3EJwzFpbLVmXVuEn5Ptwzc6Aj14mHSH' : 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD'), knownContract: process.env[`TEZOS_${networkName}_CONTRACT_ADDRESS`] || knownContracts.contract, knownBigMapContract: process.env[`TEZOS_${networkName}_BIGMAPCONTRACT_ADDRESS`] || knownContracts.bigMapContract, knownTzip1216Contract: process.env[`TEZOS_${networkName}_TZIP1216CONTRACT_ADDRESS`] || knownContracts.tzip12BigMapOffChainContract, @@ -154,19 +154,19 @@ const ghostnetEphemeral: Config = defaultConfig({ networkName: 'GHOSTNET', protocol: Protocols.PtParisBx, - defaultRpc: 'http://ecad-ghostnet-rolling-2.i.tez.ie:8732', + defaultRpc: 'http://ecad-tezos-ghostnet-rolling-1.i.ecadinfra.com/', knownContracts: knownContractsPtGhostnet, signerConfig: defaultEphemeralConfig('https://keygen.ecadinfra.com/ghostnet') }); const ghostnetSecretKey: Config = - { ...ghostnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'http://ecad-ghostnet-rolling-2.i.tez.ie:8732' } }; + { ...ghostnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'http://ecad-tezos-ghostnet-rolling-1.i.ecadinfra.com/' } }; const weeklynetEphemeral: Config = defaultConfig({ networkName: 'WEEKLYNET', protocol: Protocols.ProtoALpha, - defaultRpc: 'http://mondaynet.ecadinfra.com:8732', + defaultRpc: 'https://rpc.weeklynet-2024-09-04.teztnets.com', knownContracts: knownContractsProtoALph, signerConfig: defaultEphemeralConfig('http://key-gen-1.i.tez.ie:3010/mondaynet') }); From 2be4263847400e040c0f3eb371568f1f6d5acd14 Mon Sep 17 00:00:00 2001 From: huianyang Date: Wed, 4 Sep 2024 17:23:12 -0700 Subject: [PATCH 3/7] docs: readme node20 update --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ac60686ad9..0446d3bac9 100644 --- a/README.md +++ b/README.md @@ -39,11 +39,11 @@ Taquito currently supports the following versions of Node.js®: | Version | Supported? | | ---------------- | ---------- | -| v12 LTS | ❌ | | v14 LTS | ❌ | | v16 LTS/Gallium | ❌ | -| v18 LTS/Hydrogen | ✅ | +| v18 LTS/Hydrogen | ❌ | | v20 LTS/Iron | ✅ | +| v22 | ✅ | While other versions often work, the above are what we officially support. YMMV! @@ -128,7 +128,7 @@ You would like to make a contribution to Taquito? Wonderful! Please read on. * Install/use a suitable version of **Node.js** (_as listed above_), for example: - `nvm use lts/gallium` + `nvm use lts/iron` * Install `lerna` **globally** (used by our blazingly-fast nx-based build system): From 086b61902907e7da16671d7960abb29a53491ffc Mon Sep 17 00:00:00 2001 From: huianyang Date: Wed, 4 Sep 2024 17:52:46 -0700 Subject: [PATCH 4/7] test: updating staking delegate by pariscnet --- .../__tests__/contract/operations/staking.spec.ts | 7 +++++-- .../__tests__/wallet/staking-pseudo-operations.spec.ts | 5 +++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/integration-tests/__tests__/contract/operations/staking.spec.ts b/integration-tests/__tests__/contract/operations/staking.spec.ts index e9e11bda5b..f1cebad17d 100644 --- a/integration-tests/__tests__/contract/operations/staking.spec.ts +++ b/integration-tests/__tests__/contract/operations/staking.spec.ts @@ -6,12 +6,15 @@ CONFIGS().forEach(({ lib, rpc, setup, knownBaker }) => { beforeAll(async () => { await setup(true); - + // There is no baker accept staking in betanet and weeklylnet hence tests will fail + // Currently TF is a baker that allows staking on parisnet. + if (rpc.includes('pariscnet')) { + knownBaker = 'tz3Q67aMz7gSMiQRcW729sXSfuMtkyAHYfqc' // TF + } const delegateOp = await Tezos.contract.setDelegate({ delegate: knownBaker, source: await Tezos.signer.publicKeyHash() }); - await delegateOp.confirmation(); }); diff --git a/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts b/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts index 879f56a684..66f01da3dd 100644 --- a/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts +++ b/integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts @@ -7,6 +7,11 @@ CONFIGS().forEach(({ lib, rpc, setup, knownBaker }) => { beforeAll(async () => { await setup(true); try { + // There is no baker accept staking in betanet and weeklylnet hence tests will fail + // Currently TF is a baker that allows staking on parisnet. + if (rpc.includes('pariscnet')) { + knownBaker = 'tz3Q67aMz7gSMiQRcW729sXSfuMtkyAHYfqc' // TF + } const delegateOp = await Tezos.contract.setDelegate({ delegate: knownBaker, source: await Tezos.signer.publicKeyHash() From dc80cfafff9bdd237970fd7028a1d62c506e769a Mon Sep 17 00:00:00 2001 From: huianyang Date: Thu, 5 Sep 2024 08:50:54 -0700 Subject: [PATCH 5/7] docs: removed testdapp parisnet label --- apps/taquito-test-dapp/src/tests.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/taquito-test-dapp/src/tests.ts b/apps/taquito-test-dapp/src/tests.ts index 0afd1eab3e..f80e7488a7 100644 --- a/apps/taquito-test-dapp/src/tests.ts +++ b/apps/taquito-test-dapp/src/tests.ts @@ -628,9 +628,9 @@ const saplingShielded = async ( export const list = [ "Send tez", "Set Delegate", - "[parisnet] Stake", - "[parisnet] Unstake", - "[parisnet] Finalize Unstake", + "Stake", + "Unstake", + "Finalize Unstake", "[ghostnet] Send tez from Ghostnet to Etherlink", "Contract call with int", "Contract call with (pair nat string)", @@ -680,7 +680,7 @@ export const init = ( }, { id: "stake", - name: "[parisnet] Stake", + name: "Stake", description: "This test stakes your spendable balance into your frozen staked balance.", documentation: 'https://taquito.io/docs/staking', keyword: 'stake', @@ -692,7 +692,7 @@ export const init = ( }, { id: "unstake", - name: "[parisnet] Unstake", + name: "Unstake", description: "This test unstakes a portion of your frozen staked balance, converting it into an unstaked frozen balance. After 5 cycles, this balance will become an unstaked finalizable balance.", documentation: 'https://taquito.io/docs/staking', keyword: 'unstake', @@ -704,7 +704,7 @@ export const init = ( }, { id: "finalize-unstake", - name: "[parisnet] Finalize unstake", + name: "Finalize unstake", description: "This test transfers all unstaked finalizable balance back into your spendable balance.", documentation: 'https://taquito.io/docs/staking', keyword: 'finalizeUnstake', From 19220d63d22b557ac9a736be656563e1187a694e Mon Sep 17 00:00:00 2001 From: huianyang Date: Thu, 5 Sep 2024 13:29:10 -0700 Subject: [PATCH 6/7] test: updated failing-noop test to be more robust --- .../__tests__/contract/operations/failing-noop.spec.ts | 4 ++-- integration-tests/__tests__/wallet/failing-noop.spec.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/integration-tests/__tests__/contract/operations/failing-noop.spec.ts b/integration-tests/__tests__/contract/operations/failing-noop.spec.ts index 223b985eb1..ee61075441 100644 --- a/integration-tests/__tests__/contract/operations/failing-noop.spec.ts +++ b/integration-tests/__tests__/contract/operations/failing-noop.spec.ts @@ -10,9 +10,9 @@ CONFIGS().forEach(({ lib, setup, rpc }) => { beforeAll(async () => { setup(true); if (rpc.includes('parisnet')) { - Tezos.setProvider({ rpc: 'https://rpc.tzkt.io/parisnet' }); // public archive node to fetch genesis block + Tezos.setRpcProvider('https://rpc.tzkt.io/parisnet'); // public archive node to fetch genesis block } else if (rpc.includes('ghostnet')) { - Tezos.setProvider({ rpc: 'https://rpc.tzkt.io/ghostnet' }); // public archive node to fetch genesis block + Tezos.setRpcProvider('https://rpc.tzkt.io/ghostnet'); // public archive node to fetch genesis block } }); diff --git a/integration-tests/__tests__/wallet/failing-noop.spec.ts b/integration-tests/__tests__/wallet/failing-noop.spec.ts index edc9cb99ee..546115454c 100644 --- a/integration-tests/__tests__/wallet/failing-noop.spec.ts +++ b/integration-tests/__tests__/wallet/failing-noop.spec.ts @@ -10,9 +10,9 @@ CONFIGS().forEach(({ lib, setup, rpc }) => { beforeAll(async () => { setup(true) if (rpc.includes('parisnet')) { - Tezos.setProvider({ rpc: 'https://rpc.tzkt.io/parisnet' }); // public archive node to fetch genesis block + Tezos.setRpcProvider('https://rpc.tzkt.io/parisnet'); // public archive node to fetch genesis block } else if (rpc.includes('ghostnet')) { - Tezos.setProvider({ rpc: 'https://rpc.tzkt.io/ghostnet' }); // public archive node to fetch genesis block + Tezos.setRpcProvider('https://rpc.tzkt.io/ghostnet'); // public archive node to fetch genesis block } }); From 6c079bf3ffe89f3575b758da8ae3083167ed7250 Mon Sep 17 00:00:00 2001 From: huianyang Date: Thu, 5 Sep 2024 17:29:02 -0700 Subject: [PATCH 7/7] ci: updated ci script with node iron and 22 --- .github/workflows/bundle_webpack.yml | 2 +- .github/workflows/deploy_edge.yml | 2 +- .github/workflows/deploy_test_dapp.yml | 2 +- .github/workflows/main.yml | 4 ++-- .github/workflows/mondaynet.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bundle_webpack.yml b/.github/workflows/bundle_webpack.yml index ca3693c330..db356dea86 100644 --- a/.github/workflows/bundle_webpack.yml +++ b/.github/workflows/bundle_webpack.yml @@ -17,7 +17,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts/hydrogen + node-version: lts/iron - run: npm ci - run: npm run build - run: npm -w packages/taquito-local-forging run build-webpack diff --git a/.github/workflows/deploy_edge.yml b/.github/workflows/deploy_edge.yml index f197a03c20..e3e6a6d042 100644 --- a/.github/workflows/deploy_edge.yml +++ b/.github/workflows/deploy_edge.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts/hydrogen + node-version: lts/iron - run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_ENV - run: echo "PACKAGE_VERSION=`node -p "require('./packages/taquito/package.json').version"`" >> $GITHUB_ENV - run: echo "BRANCH_NAME=$(git branch --show-current)" >> $GITHUB_ENV diff --git a/.github/workflows/deploy_test_dapp.yml b/.github/workflows/deploy_test_dapp.yml index 69312e13f9..a5efa81242 100644 --- a/.github/workflows/deploy_test_dapp.yml +++ b/.github/workflows/deploy_test_dapp.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts/hydrogen + node-version: lts/iron - run: npm ci - run: npm run build - run: npm -w taquito-test-dapp-vite run build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfd18969e9..f1b8ddde52 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,8 +17,8 @@ jobs: fail-fast: false matrix: node: - - 'lts/hydrogen' - 'lts/iron' + - '22' steps: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 @@ -49,7 +49,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts/hydrogen + node-version: lts/iron - run: npm ci - run: npm run build - if: ${{ !github.event.pull_request.head.repo.fork }} diff --git a/.github/workflows/mondaynet.yml b/.github/workflows/mondaynet.yml index 635d3a1ab2..e6aa73a46b 100644 --- a/.github/workflows/mondaynet.yml +++ b/.github/workflows/mondaynet.yml @@ -39,7 +39,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: lts/hydrogen + node-version: lts/iron - run: npm ci - run: npm run build - id: originate-contracts-mondaynet