Merge branch 'betanet0829' of https://github.com/ecadlabs/taquito int…

…o quebecA
ecadlabs · Sep 20, 2024 · d7ce3cb · d7ce3cb
2 parents e756588 + a84eebd
commit d7ce3cb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -45,6 +45,7 @@ jobs:
         include:
           - testnet: parisnet
             testnet_uppercase: PARISNET
+            rpc_url: https://parisnet.ecadinfra.com
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -58,10 +59,11 @@ jobs:
         with:
           authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
           version: 1.32.2
-      - run: npm -w integration-tests run test:${{ matrix.testnet }} -- --maxWorkers=4
+      - id: run-tests
+        run: npm -w integration-tests run test:${{ matrix.testnet }} -- --maxWorkers=4
         env:
           # Ternary operator workaround
-          TEZOS_RPC_${{ matrix.testnet_uppercase }}: ${{ github.event.pull_request.head.repo.fork && format('https://{0}.ecadinfra.com', matrix.testnet) || null }}
+          TEZOS_RPC_${{ matrix.testnet_uppercase }}: ${{ github.event.pull_request.head.repo.fork && matrix.rpc_url || null }}
   integration-tests-testnet-quebecA-secret-key:
     runs-on: ubuntu-latest
     continue-on-error: true

diff --git a/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts b/integration-tests/__tests__/rpc/get-protocol-constants.spec.ts
@@ -552,8 +552,8 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
         max_slashing_per_block: 10000,
         max_slashing_threshold: 2334,
         cache_script_size: 100000000,
-        cache_stake_distribution_cycles: 8,
-        cache_sampler_state_cycles: 8,
+        cache_stake_distribution_cycles: 5,
+        cache_sampler_state_cycles: 5,
         dal_parametric: {
           attestation_lag: 8,
           attestation_threshold: 66,

diff --git a/integration-tests/__tests__/rpc/nodes.spec.ts b/integration-tests/__tests__/rpc/nodes.spec.ts
@@ -502,7 +502,7 @@ CONFIGS().forEach(
           } else if (rpc.includes('parisnet')) {
             expect(launchCycle).toEqual(6);
           } else if (rpc.includes('mondaynet') || rpc.includes('weeklynet')) {
-            expect(launchCycle).toEqual(5);
+            expect(launchCycle).toEqual(3);
           }
         })
 

diff --git 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' : 'tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD'),
+    knownBaker: process.env[`TEZOS_BAKER`] || (networkName === 'WEEKLYNET' ? 'tz1TnEtqDV9mZyts2pfMy6Jw1BTPs4LMjL8M' : '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,
@@ -166,7 +166,7 @@ const weeklynetEphemeral: Config =
   defaultConfig({
     networkName: 'WEEKLYNET',
     protocol: Protocols.ProtoALpha,
-    defaultRpc: 'https://rpc.weeklynet-2024-09-04.teztnets.com',
+    defaultRpc: 'https://rpc.weeklynet-2024-09-18.teztnets.com',
     knownContracts: knownContractsProtoALph,
     signerConfig: defaultEphemeralConfig('http://key-gen-1.i.tez.ie:3010/mondaynet')
   });

diff --git a/integration-tests/known-contracts-ProtoALph.ts b/integration-tests/known-contracts-ProtoALph.ts
@@ -1,8 +1,8 @@
 import { KnownContracts } from './known-contracts';
 export const knownContractsProtoALph: KnownContracts = {
-  contract: "KT1XXrWDuK77kQWX55zjD347Wh6bwgmJDfJ8",
-  bigMapContract: "KT1NSDEhMTWoX2Vie98NCtQV4fVYoPfqfAN3",
-  tzip12BigMapOffChainContract: "KT1X4c8BCVSDE7dtf5jPRtpYtYcaSFknwzN5",
-  saplingContract: "KT1JKC49zUSCXJGKT2p1bHVWmg47rAgF53ff",
-  onChainViewContractAddress: "KT1FVjUZeH5KM8tMwYvrVCMC3QFyDRUBFNLk",
+  contract: "KT1FgfeADJUoUSuRCKeLAHyWY2JUWRmATMRi",
+  bigMapContract: "KT1DCUzQs2h8zhmpxY8snEo4y4jWKkstYYqr",
+  tzip12BigMapOffChainContract: "KT1AhforFgp5QWuiw9KpL24AVxZb6qY87yTF",
+  saplingContract: "KT1DeGeJGLJPWcUhyqEk9nc3DN1W3rTm7JUZ",
+  onChainViewContractAddress: "KT1LZnxVXwQG3TwMyf6yGDyqmyh5vtNDwezP",
 };