Quebec b

.github/workflows/main.yml

@@ -45,6 +45,10 @@ jobs:
         include:
           - testnet: parisnet
             testnet_uppercase: PARISNET
+            rpc_url: https://parisnet.ecadinfra.com
+          - testnet: quebecbnet
+            testnet_uppercase: QUEBECBNET
+            rpc_url: https://quebecbnet.ecadinfra.com/
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
@@ -58,31 +62,8 @@ 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 }}
-  integration-tests-testnet-beta-secret-key:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    strategy:
-      matrix:
-        include:
-          - testnet: betanet
-            testnet_uppercase: BETANET
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: lts/hydrogen
-      - run: npm ci
-      - run: npm run build
-      - if: ${{ !github.event.pull_request.head.repo.fork }}
-        name: Tailscale
-        uses: tailscale/github-action@v1
-        with:
-          authkey: ${{ secrets.TAILSCALE_AUTHKEY }}
-          version: 1.32.2
-      - run: npm -w integration-tests run test:betanet-secret-key
-        env:
-          RUN_${{ matrix.testnet_uppercase }}_WITH_SECRET_KEY: true
+          TEZOS_RPC_${{ matrix.testnet_uppercase }}: ${{ github.event.pull_request.head.repo.fork && matrix.rpc_url || null }}

apps/taquito-test-dapp/package.json

@@ -1,7 +1,7 @@
 {
   "name": "taquito-test-dapp-vite",
   "private": true,
-  "version": "20.0.1",
+  "version": "21.0.0-beta.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -26,10 +26,10 @@
   "dependencies": {
     "@airgap/beacon-sdk": "^4.2.2",
     "@airgap/beacon-types": "^4.2.2",
-    "@taquito/beacon-wallet": "^20.0.1",
-    "@taquito/core": "^20.0.1",
-    "@taquito/taquito": "^20.0.1",
-    "@taquito/utils": "^20.0.1",
+    "@taquito/beacon-wallet": "^21.0.0-beta.0",
+    "@taquito/core": "^21.0.0-beta.0",
+    "@taquito/taquito": "^21.0.0-beta.0",
+    "@taquito/utils": "^21.0.0-beta.0",
     "buffer": "^6.0.3",
     "svelte-select": "^5.8.3",
     "vite-compatible-readable-stream": "^3.6.1"

example/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@taquito/example",
   "private": true,
-  "version": "20.0.1",
+  "version": "21.0.0-beta.0",
   "scripts": {
     "example": "node -r ts-node/register --preserve-symlinks example-node.ts",
     "example:activation": "node -r ts-node/register --preserve-symlinks example-activate.ts",
@@ -42,16 +42,16 @@
   },
   "dependencies": {
     "@ledgerhq/hw-transport-node-hid": "^6.29.3",
-    "@taquito/ledger-signer": "^20.0.1",
-    "@taquito/local-forging": "^20.0.1",
-    "@taquito/michel-codec": "^20.0.1",
-    "@taquito/michelson-encoder": "^20.0.1",
-    "@taquito/rpc": "^20.0.1",
-    "@taquito/sapling": "^20.0.1",
-    "@taquito/signer": "^20.0.1",
-    "@taquito/taquito": "^20.0.1",
-    "@taquito/tzip16": "^20.0.1",
-    "@taquito/utils": "^20.0.1",
+    "@taquito/ledger-signer": "^21.0.0-beta.0",
+    "@taquito/local-forging": "^21.0.0-beta.0",
+    "@taquito/michel-codec": "^21.0.0-beta.0",
+    "@taquito/michelson-encoder": "^21.0.0-beta.0",
+    "@taquito/rpc": "^21.0.0-beta.0",
+    "@taquito/sapling": "^21.0.0-beta.0",
+    "@taquito/signer": "^21.0.0-beta.0",
+    "@taquito/taquito": "^21.0.0-beta.0",
+    "@taquito/tzip16": "^21.0.0-beta.0",
+    "@taquito/utils": "^21.0.0-beta.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {

integration-tests/__tests__/contract/operations/failing-noop.spec.ts

@@ -7,7 +7,7 @@ CONFIGS().forEach(({ setup, rpc, lib }) => {
   let signerAlice = new InMemorySigner('edsk3QoqBuvdamxouPhin7swCvkQNgq4jP5KZPbwWNnwdZpSpJiEbq')
 
   describe(`Test failing_noop through wallet api using: ${rpc}`, () => {
-    let Tezos = lib
+    const Tezos = lib
     beforeAll(async () => {
       setup(true)
       if (rpc.includes('paris')) {

integration-tests/__tests__/contract/operations/staking.spec.ts

@@ -6,7 +6,7 @@ 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
+      // There is no baker accept staking in quebecbnet and weeklylnet hence tests will fail
       // Currently TF is a baker that allows staking on parisnet.
       if (rpc.includes('paris')) {
         knownBaker = 'tz3Q67aMz7gSMiQRcW729sXSfuMtkyAHYfqc' // TF

integration-tests/__tests__/rpc/get-protocol-constants.spec.ts

@@ -6,7 +6,7 @@ import { ConstantsResponseProto020, ConstantsResponseProto021 } from '@taquito/r
 CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
   const Tezos = lib;
   const parisnet = (networkType == NetworkType.TESTNET && protocol === Protocols.PsParisCZ) ? test : test.skip;
-  const betanet = (networkType == NetworkType.TESTNET && protocol === Protocols.PtBetaaEZ) ? test : test.skip;
+  const quebecbnet = (networkType == NetworkType.TESTNET && protocol === Protocols.PsQuebecB) ? test : test.skip;
   const weeklynet = (networkType == NetworkType.TESTNET && protocol === Protocols.ProtoALpha) ? test : test.skip;
   describe('Test fetching constants for all protocols on Mainnet', () => {
     const rpcUrl = 'https://mainnet.ecadinfra.com/';
@@ -304,7 +304,7 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
       });
     });
 
-    betanet(`should successfully fetch all constants for Betanet
+    quebecbnet(`should successfully fetch all constants for quebecbnet
       using ${rpc}`, async () => {
      Tezos.setRpcProvider(rpc);
      const constants: ConstantsResponseProto021 = await Tezos.rpc.getConstants();
@@ -385,7 +385,7 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
          vdf_revelation_tip_weight: 1,
        },
        min_proposal_quorum: 500,
-       edge_of_staking_over_delegation: 2,
+       edge_of_staking_over_delegation: 3,
        global_limit_of_staking_over_baking: 5,
        liquidity_baking_toggle_ema_threshold: 100000,
        max_operations_time_to_live: 187,
@@ -443,7 +443,7 @@ CONFIGS().forEach(({ lib, protocol, rpc, networkType }) => {
        smart_rollup_riscv_pvm_enable: true,
        smart_rollup_stake_amount: '32000000',
        smart_rollup_timeout_period_in_blocks: 781,
-       testnet_dictator: 'tz1Xf8zdT3DbAX9cHw3c3CXh79rc4nK4gCe8',
+       testnet_dictator: 'tz1e1TX7KghsqWUBXWmBTAAtPK3W6JTbNc82',
        vdf_difficulty: new BigNumber(10000000),
        zk_rollup_enable: true,
        zk_rollup_max_ticket_payload_size: 2048,

integration-tests/__tests__/rpc/nodes.spec.ts

@@ -19,8 +19,8 @@ CONFIGS().forEach(
     knownViewContract,
   }) => {
     const Tezos = lib;
-    const unrestrictedRPCNode = rpc.endsWith("ecadinfra.com") ? test.skip : test;
-    const betanet = protocol === Protocols.PtBetaaEZ ? test : test.skip;
+    const unrestrictedRPCNode = rpc.includes("i.ecadinfra.com") ? test : test.skip;
+    const quebecbnet = protocol === Protocols.PsQuebecB ? test : test.skip;
     let ticketContract: DefaultContractType;
 
     beforeAll(async () => {
@@ -66,7 +66,7 @@ CONFIGS().forEach(
           expect(balance).toBeDefined();
         });
 
-        betanet(`Verify that rpcClient.getSpendable for knownBaker returns the spendable balance excluding frozen bonds`, async () => {
+        quebecbnet(`Verify that rpcClient.getSpendable for knownBaker returns the spendable balance excluding frozen bonds`, async () => {
           const balance = await rpcClient.getSpendable(knownBaker);
           expect(balance).toBeDefined();
         });
@@ -76,7 +76,7 @@ CONFIGS().forEach(
           expect(balance).toBeDefined();
         });
 
-        betanet(`Verify that rpcClient.getSpendableAndFrozenBonds for knownBaker returns the full balance`, async () => {
+        quebecbnet(`Verify that rpcClient.getSpendableAndFrozenBonds for knownBaker returns the full balance`, async () => {
           const balance = await rpcClient.getSpendableAndFrozenBonds(knownBaker);
           expect(balance).toBeDefined();
         });
@@ -165,7 +165,7 @@ CONFIGS().forEach(
           expect(bigMapValue).toBeDefined();
         });
 
-        it(`Verify that rpcClient.getAllDelegates returns all delegates from RPC`, async () => {
+        unrestrictedRPCNode(`Verify that rpcClient.getAllDelegates returns all delegates from RPC`, async () => {
           const allDelegates = await rpcClient.getAllDelegates();
           expect(allDelegates).toBeDefined();
 

integration-tests/__tests__/wallet/failing-noop.spec.ts

@@ -7,7 +7,7 @@ CONFIGS().forEach(({ setup, rpc, lib }) => {
   let signerAlice = new InMemorySigner('edsk3QoqBuvdamxouPhin7swCvkQNgq4jP5KZPbwWNnwdZpSpJiEbq')
 
   describe(`Test failing_noop through wallet api using: ${rpc}`, () => {
-    let Tezos = lib
+    const Tezos = lib
     beforeAll(async () => {
       setup(true)
       if (rpc.includes('paris')) {

integration-tests/__tests__/wallet/staking-pseudo-operations.spec.ts

@@ -7,7 +7,7 @@ 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
+        // There is no baker accept staking in quebecbnet and weeklylnet hence tests will fail
         // Currently TF is a baker that allows staking on parisnet.
         if (rpc.includes('paris')) {
           knownBaker = 'tz3Q67aMz7gSMiQRcW729sXSfuMtkyAHYfqc' // TF

integration-tests/config.ts

@@ -8,7 +8,7 @@ import { KnownContracts } from './known-contracts';
 import { knownContractsProtoALph } from './known-contracts-ProtoALph';
 import { knownContractsPtGhostnet } from './known-contracts-PtGhostnet';
 import { knownContractsPsParisCZ } from './known-contracts-PsParisCZ';
-import { knownContractsPtBetaaEZ } from './known-contracts-PtBetaaEZ';
+import { knownContractsPsQuebecB } from './known-contracts-PsQuebecB';
 
 const nodeCrypto = require('crypto');
 
@@ -139,16 +139,19 @@ const parisnetEphemeral: Config =
   });
 
 const parisnetSecretKey: Config =
-  { ...parisnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'https://rpc.pariscnet.teztnets.com/' } };
+  { ...parisnetEphemeral, ...{ signerConfig: defaultSecretKey } };
 
-const betanetSecretKey: Config =
+  const quebecbnetEphemeral: Config =
   defaultConfig({
-    networkName: 'BETANET',
-    protocol: Protocols.PtBetaaEZ,
-    defaultRpc: 'https://rpc.betanet-2024-08-29.teztnets.com',
-    knownContracts: knownContractsPtBetaaEZ,
-    signerConfig: defaultSecretKey
-  })
+    networkName: 'QUEBECBNET',
+    protocol: Protocols.PsQuebecB,
+    defaultRpc: 'https://rpc.quebecbnet.teztnets.com/',
+    knownContracts: knownContractsPsQuebecB,
+    signerConfig: defaultEphemeralConfig('https://keygen.ecadinfra.com/quebecbnet')
+  });
+
+const quebecbnetSecretKey: Config =
+  { ...quebecbnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'https://quebecbnet.ecadinfra.com/' } };
 
 const ghostnetEphemeral: Config =
   defaultConfig({
@@ -160,7 +163,7 @@ const ghostnetEphemeral: Config =
   });
 
 const ghostnetSecretKey: Config =
-  { ...ghostnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'http://ecad-tezos-ghostnet-rolling-1.i.ecadinfra.com/' } };
+  { ...ghostnetEphemeral, ...{ signerConfig: defaultSecretKey }, ...{ defaultRpc: 'https://ghostnet.ecadinfra.com/' } };
 
 const weeklynetEphemeral: Config =
   defaultConfig({
@@ -182,12 +185,14 @@ if (process.env['RUN_WITH_SECRET_KEY']) {
   providers.push(parisnetSecretKey);
 } else if (process.env['RUN_GHOSTNET_WITH_SECRET_KEY']) {
   providers.push(ghostnetSecretKey);
-} else if (process.env['RUN_BETANET_WITH_SECRET_KEY']) {
-  providers.push(betanetSecretKey);
+} else if (process.env['RUN_QUEBECBNET_WITH_SECRET_KEY']) {
+  providers.push(quebecbnetSecretKey);
 } else if (process.env['RUN_WEEKLYNET_WITH_SECRET_KEY']) {
   providers.push(weeklynetSecretKey);
 } else if (process.env['PARISNET']) {
   providers.push(parisnetEphemeral);
+} else if (process.env['QUEBECBNET']) {
+  providers.push(quebecbnetEphemeral);
 } else if (process.env['GHOSTNET']) {
   providers.push(ghostnetEphemeral);
 } else if (process.env['WEEKLYNET']) {

integration-tests/known-contracts-PsQuebecB.ts

@@ -0,0 +1,8 @@
+import { KnownContracts } from './known-contracts';
+export const knownContractsPsQuebecB: KnownContracts = {
+  contract: "KT1KAK4KbpyzfPBhy4g46iCdB4eAFZwPKyaH",
+  bigMapContract: "KT1AHDjPEfoiyCvQBPXZEkoXR26h8J6LsiU2",
+  tzip12BigMapOffChainContract: "KT1SGSDiRRu5qHSKFVpDBBXDBxKUxdRnzbRQ",
+  saplingContract: "KT1PF3ePtD7Q45SaDVFdfYtqybbURqBd1wgz",
+  onChainViewContractAddress: "KT1LKW5sryVUqEygK2n59RzPHHJSJofBVzzm",
+};

integration-tests/package.json

@@ -5,34 +5,35 @@
     "test:secret-key": "RUN_WITH_SECRET_KEY=true jest --runInBand",
     "test:parisnet": "PARISNET=true jest",
     "test:parisnet-secret-key": "RUN_PARISNET_WITH_SECRET_KEY=true jest --runInBand",
-    "test:betanet-secret-key": "RUN_BETANET_WITH_SECRET_KEY=true jest --runInBand",
+    "test:quebecbnet": "QUEBECBNET=true jest",
+    "test:quebecbnet-secret-key": "RUN_QUEBECBNET_WITH_SECRET_KEY=true jest --runInBand",
     "test:weeklynet": "WEEKLYNET=true jest",
     "test:weeklynet-secret-key": "RUN_WEEKLYNET_WITH_SECRET_KEY=true jest --runInBand",
     "test:ghostnet": "GHOSTNET=true jest",
     "test:ghostnet-secret-key": "RUN_GHOSTNET_WITH_SECRET_KEY=true jest --runInBand",
     "originate-known-contracts": "node -r ts-node/register originate-known-contracts.ts",
     "originate-known-contracts-and-run-test": "node -r ts-node/register originate-known-contracts.ts && jest"
   },
-  "version": "20.0.1",
+  "version": "21.0.0-beta.0",
   "dependencies": {
     "@ledgerhq/devices": "8.4.2",
     "@ledgerhq/hw-transport": "6.31.2",
     "@ledgerhq/hw-transport-node-hid": "6.29.3",
     "@ledgerhq/hw-transport-node-hid-noevents": "6.30.3",
-    "@taquito/contracts-library": "^20.0.1",
-    "@taquito/core": "^20.0.1",
-    "@taquito/http-utils": "^20.0.1",
-    "@taquito/local-forging": "^20.0.1",
-    "@taquito/michel-codec": "^20.0.1",
-    "@taquito/michelson-encoder": "^20.0.1",
-    "@taquito/remote-signer": "^20.0.1",
-    "@taquito/rpc": "^20.0.1",
-    "@taquito/sapling": "^20.0.1",
-    "@taquito/signer": "^20.0.1",
-    "@taquito/taquito": "^20.0.1",
-    "@taquito/tzip12": "^20.0.1",
-    "@taquito/tzip16": "^20.0.1",
-    "@taquito/utils": "^20.0.1",
+    "@taquito/contracts-library": "^21.0.0-beta.0",
+    "@taquito/core": "^21.0.0-beta.0",
+    "@taquito/http-utils": "^21.0.0-beta.0",
+    "@taquito/local-forging": "^21.0.0-beta.0",
+    "@taquito/michel-codec": "^21.0.0-beta.0",
+    "@taquito/michelson-encoder": "^21.0.0-beta.0",
+    "@taquito/remote-signer": "^21.0.0-beta.0",
+    "@taquito/rpc": "^21.0.0-beta.0",
+    "@taquito/sapling": "^21.0.0-beta.0",
+    "@taquito/signer": "^21.0.0-beta.0",
+    "@taquito/taquito": "^21.0.0-beta.0",
+    "@taquito/tzip12": "^21.0.0-beta.0",
+    "@taquito/tzip16": "^21.0.0-beta.0",
+    "@taquito/utils": "^21.0.0-beta.0",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1"

lerna.json

@@ -1,4 +1,4 @@
 {
   "useNx": true,
-  "version": "20.0.1"
-}
+  "version": "21.0.0-beta.0"
+}