Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Housekeeping0904 #3033

Merged
merged 9 commits into from
Sep 6, 2024
2 changes: 1 addition & 1 deletion .github/workflows/bundle_webpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_test_dapp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mondaynet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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!

Expand Down Expand Up @@ -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):

Expand Down
12 changes: 6 additions & 6 deletions apps/taquito-test-dapp/src/tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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)",
Expand Down Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
const Tezos = lib;

const customHandler = new Map<string, Handler>([
['ipfs', new IpfsHttpHandler('cloudflare-ipfs.com')]
['ipfs', new IpfsHttpHandler('dweb.link')]
]);

const customMetadataProvider = new MetadataProvider(customHandler);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
const Tezos = lib;

const customHandler = new Map<string, Handler>([
['ipfs', new IpfsHttpHandler('cloudflare-ipfs.com')]
['ipfs', new IpfsHttpHandler('dweb.link')]
]);

const customMetadataProvider = new MetadataProvider(customHandler);
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/__tests__/wallet/failing-noop.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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')
});
Expand Down
Loading
Loading