From 88a5dfbbd3aa5a98c05cf229f4248d36034fca86 Mon Sep 17 00:00:00 2001
From: hui-an-yang <106410553+hui-an-yang@users.noreply.github.com>
Date: Wed, 15 May 2024 16:45:12 -0700
Subject: [PATCH 1/3] Beacon 4.2.2 (#2924)

* feat: updated beacon to 4.2.2-beta.0

* feat: feat: updated beacon to 4.2.2-beta.1

* feat: feat: updated beacon to 4.2.2-beta.2

* chore(releng) bump version to 19.2.1-beta.0

* feat: updated beacon to 4.2.2-beta.3

* feat: updating to private prc nodes

* reverted config to use public testnets instead

* fix: updating back to public node

* chore(releng) bump version to 19.2.1-beta.1

* feat: updated beacon to 4.2.2-beta.4

* Revert "Merge branch 'master' of https://github.com/ecadlabs/taquito into beacon-4.2.2"

This reverts commit caf851adcb77d344ed42145fe63e824e9feb9b19, reversing
changes made to ecd6f5a7885458ea20f80a371de652cd0aad5eee.

* chore(releng) bump version to 19.2.1-beta.2

* 2958 eventsub (#2960)

* updated taquito-beacon-wallet to use eventsub

* removed comments

* removed console log

* trigger ci build

* updated beacon version to v4.2.2

* chore(releng) bump version to 19.2.1

---------

Co-authored-by: Davis Sawali <davis.sawali@ecadlabs.com>
---
 apps/taquito-test-dapp/package.json           |  14 +-
 .../src/lib/TestContainer.svelte              |  24 +-
 apps/taquito-test-dapp/src/lib/Wallet.svelte  |  13 +-
 apps/taquito-test-dapp/src/tests.ts           |  42 +-
 apps/taquito-test-dapp/src/types.ts           |   2 +-
 cspell.json                                   |   1 -
 docs/dapp_prelaunch.md                        |   2 +-
 docs/rpc_nodes.md                             |   3 -
 docs/signing.md                               |   2 +-
 example/package.json                          |  24 +-
 ...ations-call-by-index-methodsObject.spec.ts | 100 +--
 integration-tests/package.json                |  30 +-
 lerna.json                                    |   2 +-
 package-lock.json                             | 437 +++++-----
 packages/taquito-beacon-wallet/package.json   |   8 +-
 .../src/taquito-beacon-wallet.ts              |  21 +-
 packages/taquito-beacon-wallet/src/version.ts |   4 +-
 .../taquito-contracts-library/package.json    |  10 +-
 .../taquito-contracts-library/src/version.ts  |   4 +-
 packages/taquito-core/package.json            |   2 +-
 packages/taquito-core/src/version.ts          |   4 +-
 packages/taquito-http-utils/package.json      |   4 +-
 packages/taquito-http-utils/src/version.ts    |   4 +-
 packages/taquito-ledger-signer/package.json   |   8 +-
 packages/taquito-ledger-signer/src/version.ts |   4 +-
 packages/taquito-local-forging/package.json   |   8 +-
 packages/taquito-local-forging/src/version.ts |   4 +-
 .../pack-test-tool/package.json               |   4 +-
 packages/taquito-michel-codec/package.json    |   4 +-
 packages/taquito-michel-codec/src/version.ts  |   4 +-
 .../taquito-michelson-encoder/package.json    |   8 +-
 .../src/taquito-michelson-encoder.ts          |   2 +-
 .../src/tokens/createToken.ts                 |  15 +-
 .../src/tokens/or.ts                          |  66 +-
 .../src/tokens/pair.ts                        |  37 +-
 .../src/tokens/token.ts                       |  39 +-
 .../taquito-michelson-encoder/src/version.ts  |   4 +-
 .../test/sample1.spec.ts                      | 415 +++------
 .../test/sample11_dexter.spec.ts              | 594 +++----------
 .../test/sample9_lambda.spec.ts               | 117 +--
 .../test/tokens/map.spec.ts                   |  66 +-
 .../test/tokens/or.spec.ts                    | 798 ++----------------
 packages/taquito-remote-signer/package.json   |  10 +-
 packages/taquito-remote-signer/src/version.ts |   4 +-
 packages/taquito-rpc/package.json             |   8 +-
 packages/taquito-rpc/src/version.ts           |   4 +-
 packages/taquito-sapling/package.json         |  10 +-
 packages/taquito-sapling/src/version.ts       |   4 +-
 packages/taquito-signer/package.json          |   8 +-
 packages/taquito-signer/src/version.ts        |   4 +-
 packages/taquito-timelock/package.json        |   8 +-
 packages/taquito-timelock/src/version.ts      |   4 +-
 packages/taquito-tzip12/package.json          |  10 +-
 packages/taquito-tzip12/src/version.ts        |   4 +-
 packages/taquito-tzip16/package.json          |  14 +-
 packages/taquito-tzip16/src/version.ts        |   4 +-
 packages/taquito-utils/package.json           |   4 +-
 packages/taquito-utils/src/version.ts         |   4 +-
 packages/taquito/README.md                    |   2 +-
 packages/taquito/assets-manifest.json         |   2 +-
 packages/taquito/package.json                 |  16 +-
 packages/taquito/src/taquito.ts               |  11 +-
 packages/taquito/src/version.ts               |   4 +-
 .../test/contract/contractAbstraction.spec.ts |   4 +-
 waku-helpers.sh                               |   2 +-
 website/package-lock.json                     | 104 +--
 66 files changed, 854 insertions(+), 2349 deletions(-)

diff --git a/apps/taquito-test-dapp/package.json b/apps/taquito-test-dapp/package.json
index 6aee4c753a..bf4f665881 100644
--- a/apps/taquito-test-dapp/package.json
+++ b/apps/taquito-test-dapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taquito-test-dapp-vite",
   "private": true,
-  "version": "19.2.0",
+  "version": "19.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,12 +24,12 @@
     "vite": "^4.4.11"
   },
   "dependencies": {
-    "@airgap/beacon-sdk": "^4.2.1",
-    "@airgap/beacon-types": "^4.2.1",
-    "@taquito/beacon-wallet": "^19.2.0",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@airgap/beacon-sdk": "^4.2.2",
+    "@airgap/beacon-types": "^4.2.2",
+    "@taquito/beacon-wallet": "^19.2.1",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "buffer": "^6.0.3",
     "svelte-select": "^5.7.0",
     "vite-compatible-readable-stream": "^3.6.1"
diff --git a/apps/taquito-test-dapp/src/lib/TestContainer.svelte b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
index d748260eef..3191c3aade 100644
--- a/apps/taquito-test-dapp/src/lib/TestContainer.svelte
+++ b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
@@ -11,7 +11,7 @@
   let loading = false;
   let success: boolean | undefined;
   let opHash = "";
-  let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320, amount: 0, address: "" };
+  let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320 };
   let testResult: { id: string; title: string; body: any };
 
   const run = async () => {
@@ -28,7 +28,6 @@
         test.id === "sign-payload-and-send" ||
         test.id === "sign-failingNoop" ||
         test.id === "verify-signature" ||
-        test.id === "send-tez-to-etherlink" ||
         test.id === "set-transaction-limits"
       ) {
         result = await test.run(input);
@@ -189,7 +188,7 @@
   /* ----------------------------------------------
  * Generated by Animista on 2022-4-21 9:31:8
  * Licensed under FreeBSD License.
- * See http://animista.net/license for more info.
+ * See http://animista.net/license for more info. 
  * w: http://animista.net, t: @cssanimista
  * ---------------------------------------------- */
 
@@ -303,19 +302,6 @@
             bind:value={input.text}
           />
         </div>
-      {:else if test.inputRequired && test.inputType === "etherlink"}
-        <div class="test-input test-send-tez-to-etherlink">
-          <label for="etherlink-address">
-            <span>Etherlink address</span>
-            <input type="string" id="etherlink-address" bind:value={input.address} />
-          </label>
-          <br />
-          <br />
-          <label for="send-amount">
-            <span>amount</span>
-            <input type="number" id="send-amount" bind:value={input.amount} />
-          </label>
-        </div>
       {:else if test.inputRequired && test.inputType === "set-limits"}
         <div class="test-input test-limits">
           <label for="set-limit-fee">
@@ -352,11 +338,7 @@
               {#if $store.networkType === NetworkType.CUSTOM}
                 {shortenHash(opHash)}
               {:else}
-                <a
-                  href={`${getTzKtUrl($store.networkType)}/${opHash}`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
+                <a href={`${getTzKtUrl($store.networkType)}/${opHash}`} target="_blank" rel="noopener noreferrer">
                   {shortenHash(opHash)}
                 </a>
               {/if}
diff --git a/apps/taquito-test-dapp/src/lib/Wallet.svelte b/apps/taquito-test-dapp/src/lib/Wallet.svelte
index 38719e5966..c78b97430c 100644
--- a/apps/taquito-test-dapp/src/lib/Wallet.svelte
+++ b/apps/taquito-test-dapp/src/lib/Wallet.svelte
@@ -6,15 +6,18 @@
   import { BeaconEvent, type DAppClientOptions } from "@airgap/beacon-sdk";
   import store from "../store";
   import { formatTokenAmount, shortenHash } from "../utils";
-  import { defaultMatrixNode, getRpcUrl, defaultNetworkType, type SupportedNetworks } from "../config";
+  import {
+    defaultMatrixNode,
+    getRpcUrl,
+    defaultNetworkType,
+    type SupportedNetworks,
+  } from "../config";
   import type { TezosAccountAddress } from "../types";
 
   let showDialog = false;
   let connectedWallet = "";
 
-  const createNewWallet = (config: {
-    networkType: SupportedNetworks,
-  }) => {
+  const createNewWallet = (config: { networkType: SupportedNetworks }) => {
     const options: DAppClientOptions = {
       name: "Taquito Test Dapp",
       matrixNodes: [defaultMatrixNode] as any,
@@ -23,7 +26,7 @@
         rpcUrl: getRpcUrl(config.networkType),
       },
       walletConnectOptions: {
-        projectId: 'ba97fd7d1e89eae02f7c330e14ce1f36',
+        projectId: "ba97fd7d1e89eae02f7c330e14ce1f36",
       },
       enableMetrics: $store.enableMetrics,
     };
diff --git a/apps/taquito-test-dapp/src/tests.ts b/apps/taquito-test-dapp/src/tests.ts
index 823c59ac13..d1c277bc8d 100644
--- a/apps/taquito-test-dapp/src/tests.ts
+++ b/apps/taquito-test-dapp/src/tests.ts
@@ -36,25 +36,6 @@ const preparePayloadToSign = (
   };
 };
 
-const sendTezToEtherlink = async (
-  amount: number,
-  address: string,
-  tezos: TezosToolkit,
-): Promise<TestResult> => {
-  let opHash = "";
-  try {
-    const contract = await tezos.wallet.at('KT1VEjeQfDBSfpDH5WeBM5LukHPGM2htYEh3')
-    let op = await contract.methodsObject.deposit({ evm_address: 'sr18wx6ezkeRjt1SZSeZ2UQzQN3Uc3YLMLqg', l2_address: address }).send({ amount });
-    await op.confirmation()
-    opHash = op.hasOwnProperty("opHash") ? op["opHash"] : op["hash"];
-    console.log("Operation successful with op hash:", opHash);
-    return { success: true, opHash };
-  } catch (error) {
-    console.log(error);
-    return { success: false, opHash: "" };
-  }
-};
-
 const sendTez = async (Tezos: TezosToolkit): Promise<TestResult> => {
   let opHash = "";
   try {
@@ -321,7 +302,7 @@ const signPayloadAndSend = async (
     const publicKey = activeAccount.publicKey;
     // sends transaction to contract
     const op = await contract.methodsObject
-      .check_signature({ 0: publicKey, 1: signedPayload.signature, 2: payload.payload })
+      .check_signature({0: publicKey, 1: signedPayload.signature, 2: payload.payload})
       .send();
     await op.confirmation();
     return {
@@ -474,7 +455,7 @@ const permit = async (Tezos: TezosToolkit, wallet: BeaconWallet) => {
     const contract = await Tezos.wallet.at(contractAddress);
     // hashes the parameter for the contract call
     const mintParam: any = contract.methodsObject
-      .mint({ 0: store.userAddress, 1: 100 })
+      .mint({0: store.userAddress, 1: 100})
       .toTransferParams().parameter?.value;
     const mintParamType = contract.entrypoints.entrypoints["mint"];
     // packs the entrypoint call
@@ -567,7 +548,6 @@ const saplingShielded = async (
 
 export const list = [
   "Send tez",
-  "Send tez from Ghostnet to Etherlink",
   "Contract call with int",
   "Contract call with (pair nat string)",
   "Contract call that fails",
@@ -602,24 +582,6 @@ export const init = (
       inputRequired: false,
       lastResult: { option: "none", val: false }
     },
-    {
-      id: "send-tez-to-etherlink",
-      name: "Send tez from Ghostnet to Etherlink",
-      description:
-        "This test allows you send your ghostnet tez to etherlink address",
-      documentation: '',
-      keyword: 'etherlink',
-      run: input =>
-        sendTezToEtherlink(
-          input.amount,
-          input.address,
-          Tezos
-        ),
-      showExecutionTime: false,
-      inputRequired: true,
-      inputType: "etherlink",
-      lastResult: { option: "none", val: false }
-    },
     {
       id: "contract-call-simple-type",
       name: "Contract call with int",
diff --git a/apps/taquito-test-dapp/src/types.ts b/apps/taquito-test-dapp/src/types.ts
index eaf412dd8e..0d30f426c4 100644
--- a/apps/taquito-test-dapp/src/types.ts
+++ b/apps/taquito-test-dapp/src/types.ts
@@ -15,7 +15,7 @@ export interface TestSettings {
   run: (input?: any) => Promise<TestResult>;
   showExecutionTime: boolean;
   inputRequired: boolean;
-  inputType?: "string" | "set-limits" | "sapling" | "etherlink";
+  inputType?: "string" | "set-limits" | "sapling";
   lastResult: { option: "none" | "some"; val: boolean };
 }
 
diff --git a/cspell.json b/cspell.json
index c035e310f0..f1ed6f1a4c 100644
--- a/cspell.json
+++ b/cspell.json
@@ -30,7 +30,6 @@
     "edsk",
     "Ejara",
     "entrypoints",
-    "etherlink",
     "eztz",
     "FAILWITH",
     "flextesa",
diff --git a/docs/dapp_prelaunch.md b/docs/dapp_prelaunch.md
index 10c0067e5c..f4c0a892f5 100644
--- a/docs/dapp_prelaunch.md
+++ b/docs/dapp_prelaunch.md
@@ -11,7 +11,7 @@ author: Claude Barde
 - Did you enable `Local Pack` in your dapp? Local Pack reduces the search time in bigmaps by 50%, and you can easily add it to your dapp by providing a new instance of the `MichelCodecPacker` class to the `setPackerProvider` method of the `TezosToolkit`.
 - Are you creating a single instance of the `BeaconWallet` that you can reuse throughout the different components of your dapp? The JavaScript frameworks generally offer a solution to easily share data between components (the Context API in React, Provide/Inject in Vue, or a Svelte store). The instance of the `BeaconWallet` must be saved there in order to use the same one in every component. Creating multiple instances of the `BeaconWallet` may create errors when forging new transactions.
 - Is your dapp making HTTP requests on update only when necessary? The JavaScript frameworks provide different solutions to rerender the DOM when internal data is updated (React `useEffect`, Vue `beforeUpdate` and Svelte `afterUpdate`). These data may be based on call responses to Tezos nodes or indexers, which is why it is crucial to optimize them. Unnecessary HTTP requests increase the traffic to Tezos nodes and indexer servers and slow down your dapp.
-- Does your application wait for a confirmation of an operation, and does it check if the operation was successful or failed when receiving the transaction receipt? This piece of information is crucial to your users in order to know if the transaction went through or not.
+- Does your application wait for a confirmation of an operation, and does it check if the operation was successfull or failed when receiving the transaction receipt? This piece of information is crucial to your users in order to know if the transaction went through or not.
 - Do you display user-friendly error messages, for example, when a transaction fails? A lack of visual feedback when transactions don't go through as expected can be confusing for users. Users must be informed about skipped, backtracked, and failed transactions.
 - Are you handling big numbers? Because numbers in Michelson are arbitrary-precision, they can become quite long, and JavaScript switches to the scientific notation to represent them, which can be confusing for users. You can use the `bignumber.js` library to handle potentially long numbers coming from the blockchain.
 - Do you have error reporting enabled on your dapp? An error reporting tool like [BugSnag](https://www.bugsnag.com/platforms/javascript) allows you to understand the issues your users face when using your dapp.
diff --git a/docs/rpc_nodes.md b/docs/rpc_nodes.md
index 7cd09f7543..6ce4048300 100644
--- a/docs/rpc_nodes.md
+++ b/docs/rpc_nodes.md
@@ -29,9 +29,6 @@ values={[
 | SmartPy          | Mainnet      | https://mainnet.smartpy.io               | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header)              |
 | SmartPy          | Ghostnet     | https://ghostnet.smartpy.io              | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header)             |
 | Tezos Foundation | Mainnet      | https://rpc.tzbeta.net/                  | [Check](https://rpc.tzbeta.net/chains/main/blocks/head/header)                  |
-| Tezos Foundation | Ghostnet     | https://rpc.ghostnet.teztnets.com/       | [Check](https://rpc.ghostnet.teztnets.com/chains/main/blocks/head/header)       |
-| Tezos Foundation | Oxfordnet    | https://rpc.oxfordnet.teztnets.com/      | [Check](https://rpc.oxfordnet.teztnets.com/chains/main/blocks/head/header)      |
-| Tezos Foundation | Parisnet     | https://rpc.parisnet.teztnets.com/       | [Check](https://rpc.parisnet.teztnets.com/chains/main/blocks/head/header)       |
 | Marigold         | Mainnet      | https://mainnet.tezos.marigold.dev/      | [Check](https://mainnet.tezos.marigold.dev/chains/main/blocks/head/header)      |
 | Marigold         | Ghostnet     | https://ghostnet.tezos.marigold.dev/     | [Check](https://ghostnet.tezos.marigold.dev/chains/main/blocks/head/header)     |
 | Marigold         | Oxfordnet    | https://oxfordnet.tezos.marigold.dev/    | [Check](https://oxfordnet.tezos.marigold.dev/chains/main/blocks/head/header)    |
diff --git a/docs/signing.md b/docs/signing.md
index 022ee1021a..54903020f2 100644
--- a/docs/signing.md
+++ b/docs/signing.md
@@ -143,7 +143,7 @@ const isVerified = verifySignature(
 
 ## Signing Michelson data
 
-Taquito also offers the possibility to sign Michelson code. This feature can be useful, for example, if you need to send a lambda to a contract to be executed but want to restrict the number of users who can submit a lambda by verifying the signer's address. The signing of Michelson code requires the use of the `michel-codec` package:
+Taquito also offers the possibility to sign Michelson code. This feature can be useful, for example, if you need to send a lambda to a contract to be executed but want to restrict the number of users who can submit a lambda by verifiying the signer's address. The signing of Michelson code requires the use of the `michel-codec` package:
 
 ```js live noInline
 // import { TezosToolkit } from '@taquito/taquito';
diff --git a/example/package.json b/example/package.json
index ebfa3a03ec..9059ade30c 100644
--- a/example/package.json
+++ b/example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@taquito/example",
   "private": true,
-  "version": "19.2.0",
+  "version": "19.2.1",
   "scripts": {
     "example": "node -r ts-node/register --preserve-symlinks example-node.ts",
     "example:activation": "node -r ts-node/register --preserve-symlinks example-activate.ts",
@@ -41,17 +41,17 @@
     "example:scan-path-ledger": "node -r ts-node/register --preserve-symlinks scan-path-ledger.ts"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^6.28.5",
-    "@taquito/ledger-signer": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/sapling": "^19.2.0",
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@ledgerhq/hw-transport-node-hid": "^6.27.21",
+    "@taquito/ledger-signer": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/sapling": "^19.2.1",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts b/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
index daee5318df..096976adb9 100644
--- a/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
+++ b/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
@@ -1,4 +1,3 @@
-import { FieldNumberingStrategy } from "@taquito/michelson-encoder";
 import { CONFIGS } from "../../config";
 import { noAnnotCode, noAnnotInit } from "../../data/token_without_annotation";
 
@@ -11,70 +10,59 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
     beforeEach(async () => {
       await setup()
     })
+    it('Verify contract.originate for a contract with no annotations for methods using methodObjects', async () => {
+      // Constants to replace annotations
+      const ACCOUNTS = '0';
+      const BALANCE = '0';
+      const ALLOWANCES = '1';
+      const TRANSFER = '0';
+      const APPROVE = '2';
 
-    // Constants to replace annotations
-    const ACCOUNTS = '0';
-    const BALANCE = '0';
-    const ALLOWANCES = '1';
-    const TRANSFER = '0';
-    const APPROVE = '2';
+      // Actual tests
 
-    // Actual tests
+      const ACCOUNT1_ADDRESS = await Tezos.signer.publicKeyHash()
+      const ACCOUNT2_ADDRESS = 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu'
 
-    const ACCOUNT2_ADDRESS = 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu'
-    
-    // Runs the entire tests for a given fieldNumberingStrategy
-    const testContract = (strategy: FieldNumberingStrategy, innerObjectStartingIndex: number) => {
-      it(`Verify contract.originate for a contract with no annotations for methods using methodObjects with fieldNumberingStrategy: ${strategy}`, async () => {
-        Tezos.setFieldNumberingStrategy(strategy);
-        const ACCOUNT1_ADDRESS = await Tezos.signer.publicKeyHash()
-        // Originate a contract with a known state
-        const op = await Tezos.contract.originate({
-          balance: "1",
-          code: noAnnotCode,
-          init: noAnnotInit(await Tezos.signer.publicKeyHash())
-        })
-        await op.confirmation()
-        const contract = await op.contract()
+      // Originate a contract with a known state
+      const op = await Tezos.contract.originate({
+        balance: "1",
+        code: noAnnotCode,
+        init: noAnnotInit(await Tezos.signer.publicKeyHash())
+      })
+      await op.confirmation()
+      const contract = await op.contract()
 
-        // Make a transfer
+      // Make a transfer
 
-        const operation = await contract.methodsObject[TRANSFER]({
-          0: ACCOUNT1_ADDRESS,
-          1: ACCOUNT2_ADDRESS,
-          2: "1"
-        }).send();
+      const operation = await contract.methodsObject[TRANSFER]({
+        0: ACCOUNT1_ADDRESS,
+        1: ACCOUNT2_ADDRESS,
+        2: "1"
+      }).send();
 
-        await operation.confirmation();
-        expect(operation.status).toEqual('applied')
+      await operation.confirmation();
+      expect(operation.status).toEqual('applied')
 
-        // Verify that the transfer was done as expected
-        const storage = await contract.storage<any>()
-        let account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
-        expect(account1[BALANCE].toString()).toEqual('16')
+      // Verify that the transfer was done as expected
+      const storage = await contract.storage<any>()
+      let account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
+      expect(account1[BALANCE].toString()).toEqual('16')
 
-        const account2 = await storage[ACCOUNTS].get(ACCOUNT2_ADDRESS)
-        expect(account2[BALANCE].toString()).toEqual('1')
+      const account2 = await storage[ACCOUNTS].get(ACCOUNT2_ADDRESS)
+      expect(account2[BALANCE].toString()).toEqual('1')
 
-        // Approve
-        const operation2 = await contract.methodsObject[APPROVE]({
-          [innerObjectStartingIndex]: ACCOUNT2_ADDRESS,
-          [innerObjectStartingIndex + 1]: "1"
-        }).send();
+      // Approve
+      const operation2 = await contract.methodsObject[APPROVE]({
+        2: ACCOUNT2_ADDRESS,
+        3: "1"
+      }).send();
 
-        await operation2.confirmation();
-        expect(operation2.status).toEqual('applied')
-
-        // Verify that the allowance was done as expected
-        account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
-        expect(account1[ALLOWANCES].get(ACCOUNT2_ADDRESS).toString()).toEqual('1')
-      });
-    };
-    
-    // Run the tests for all fieldNumberingStrategies
-    testContract('Legacy', 2);
-    testContract('ResetFieldNumbersInNestedObjects', 0);
-    testContract('Latest', 0);
+      await operation2.confirmation();
+      expect(operation2.status).toEqual('applied')
 
+      // Verify that the allowance was done as expected
+      account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
+      expect(account1[ALLOWANCES].get(ACCOUNT2_ADDRESS).toString()).toEqual('1')
+    })
   });
-});
+})
diff --git a/integration-tests/package.json b/integration-tests/package.json
index ccb2bc9682..06f450e345 100644
--- a/integration-tests/package.json
+++ b/integration-tests/package.json
@@ -13,26 +13,26 @@
     "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": "19.2.0",
+  "version": "19.2.1",
   "dependencies": {
     "@ledgerhq/devices": "8.2.2",
     "@ledgerhq/hw-transport": "6.30.5",
     "@ledgerhq/hw-transport-node-hid": "6.28.5",
     "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-    "@taquito/contracts-library": "^19.2.0",
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/remote-signer": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/sapling": "^19.2.0",
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip12": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/contracts-library": "^19.2.1",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/remote-signer": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/sapling": "^19.2.1",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip12": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1"
diff --git a/lerna.json b/lerna.json
index 3c6da77aa3..a537c45977 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
 {
   "useNx": true,
-  "version": "19.2.0"
+  "version": "19.2.1"
 }
diff --git a/package-lock.json b/package-lock.json
index fadffed0cb..7ddfdbb3a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,14 +56,14 @@
     },
     "apps/taquito-test-dapp": {
       "name": "taquito-test-dapp-vite",
-      "version": "19.2.0",
-      "dependencies": {
-        "@airgap/beacon-sdk": "^4.2.1",
-        "@airgap/beacon-types": "^4.2.1",
-        "@taquito/beacon-wallet": "^19.2.0",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+      "version": "19.2.1",
+      "dependencies": {
+        "@airgap/beacon-sdk": "^4.2.2",
+        "@airgap/beacon-types": "^4.2.2",
+        "@taquito/beacon-wallet": "^19.2.1",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "buffer": "^6.0.3",
         "svelte-select": "^5.7.0",
         "vite-compatible-readable-stream": "^3.6.1"
@@ -85,19 +85,19 @@
     },
     "example": {
       "name": "@taquito/example",
-      "version": "19.2.0",
-      "dependencies": {
-        "@ledgerhq/hw-transport-node-hid": "^6.28.5",
-        "@taquito/ledger-signer": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/sapling": "^19.2.0",
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+      "version": "19.2.1",
+      "dependencies": {
+        "@ledgerhq/hw-transport-node-hid": "^6.27.21",
+        "@taquito/ledger-signer": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/sapling": "^19.2.1",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -106,26 +106,26 @@
       }
     },
     "integration-tests": {
-      "version": "19.2.0",
+      "version": "19.2.1",
       "dependencies": {
         "@ledgerhq/devices": "8.2.2",
         "@ledgerhq/hw-transport": "6.30.5",
         "@ledgerhq/hw-transport-node-hid": "6.28.5",
         "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-        "@taquito/contracts-library": "^19.2.0",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/remote-signer": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/sapling": "^19.2.0",
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip12": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/contracts-library": "^19.2.1",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/remote-signer": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/sapling": "^19.2.1",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip12": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1"
@@ -156,30 +156,30 @@
       }
     },
     "node_modules/@airgap/beacon-blockchain-substrate": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.1.tgz",
-      "integrity": "sha512-Zaggh3QdYYlXV8DsdbPcLuKCLCG9mqSBCQSrLZphaHi9phL16GuAcM7UnuQTnN9UbAS1gkLe3I1IIXZHNpMTig==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.2.tgz",
+      "integrity": "sha512-7G5HvZBM03zDwWh0OfXxKkE4WVrtacIEq7Ks1W33Yrtk7M2fliJu8FplYwn4EyasBXtt5WQfd2/3OkJOjbNmXw==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-blockchain-tezos": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.1.tgz",
-      "integrity": "sha512-vVwROjzt70MjiSDKbsUV2gHxFT8YMfCnn9t/FR04nn/DIxWrnxmRPoWh8lnqJOx2SHuqQgVDTE0i4kxBYuW94Q==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.2.tgz",
+      "integrity": "sha512-VeS9nNwgwic9uIO4dF2KCQr673qos/vhf528H2dy5NwITFSSRwT/lPT5YCDvmCQ5roYQF7+qY1tTE0VBKONEhg==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-core": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.1.tgz",
-      "integrity": "sha512-rOfvmxTcfoPfC40G2RoPxp9HtQjeNZGuecvmsGAkbEcJHZpgNXoyp5zt8YeBBpxA8KsV156FcUDjyHadSFjaWw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.2.tgz",
+      "integrity": "sha512-pvp6T57fL734Yi81ZOvAo6oQmw7PPsj5BLC/brg17ic2uGCF0aFgYrExTDxVz5SoM93v5NJCPvg1TRkitTcvtA==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/utf8": "^1.0.1",
@@ -214,91 +214,91 @@
       }
     },
     "node_modules/@airgap/beacon-dapp": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.1.tgz",
-      "integrity": "sha512-lt1B8JL2yQkun0imhQv/Fz/LhHTrXo1xdBlYUopOGi6KHtXXyGZpMTrAqEUWn/nKYcygjx+zNI5NaMxDn2Ejlg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.2.tgz",
+      "integrity": "sha512-kXH9gwjkbZKlt1irg/QGOWJeUwvR+ffa/3m39F8Mv5uIdS/PnOU4QMso6F4VVbtk6RmAGFr1gG/Q6pIkkWPFxg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-transport-walletconnect": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-transport-walletconnect": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-sdk": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.1.tgz",
-      "integrity": "sha512-/NhrQBETARyB3UT1c7/IEAItV1RmCpdGd2m32Dn8MsyAmHki+y+BuKBuWuywjKOZHqVntkeqIWvh9thmBnih/w==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.2.tgz",
+      "integrity": "sha512-F99zhXUp1EXDOqESqjPglBGzv0WSKVcmf62PYbW5B3HyhstbC3gdu8pcu/rEkMyyF3dLUFzX91cE/COBgh3qRA==",
       "dependencies": {
-        "@airgap/beacon-blockchain-substrate": "4.2.1",
-        "@airgap/beacon-blockchain-tezos": "4.2.1",
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-dapp": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
-        "@airgap/beacon-wallet": "4.2.1"
+        "@airgap/beacon-blockchain-substrate": "4.2.2",
+        "@airgap/beacon-blockchain-tezos": "4.2.2",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-dapp": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-wallet": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-transport-matrix": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.1.tgz",
-      "integrity": "sha512-ggvKQPreXVrm5t3kPV/RGBTIxo8ujSrE6tb6kpUAQyMC+mfMPY5WeP8qwqgMT+yzRMYUlkJa3u+hNxoSQIKK+A==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.2.tgz",
+      "integrity": "sha512-lCwFo6laGQbowvQoGU5tlkgrdBx9S9Nyk/OjJUE5Db9DgvQZhRR77zA0jl7lPdYDYcKeklHahBz6vwkiN/ferA==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "axios": "^1.6.2"
       }
     },
     "node_modules/@airgap/beacon-transport-postmessage": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.1.tgz",
-      "integrity": "sha512-/sq2yz90scWNwb93nhe9hXQZpetXLuc/BRJcyg3W3Sv53wEQ5yPb9XmedFhuFo/Tc8nTt5kZgz5ORXgDnlATJg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.2.tgz",
+      "integrity": "sha512-xLFeTEw6Yydq+4cr8IISxFprEQm3Us1QKNI/zNTAy1ssTxML1MZGAoLXWm/3adXKc8kzeR7dZH9blNEKhZWGcQ==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-transport-walletconnect": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.1.tgz",
-      "integrity": "sha512-HTjKXtXP3z/Xg2yViE2o4gi556ickOTHjFz7t9ftp75qARP+XOW0uWcwTTV8YVK4mW5fXe0lM2M5nGXWD6nE8g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.2.tgz",
+      "integrity": "sha512-ftwUDhQdjLPtyX1ESUp9VkFS5vyEvp377eL4lVFaEdqf4mCpxg/XxHffO/o7OeRD1NI0nZfCxsKOWU2plg+ghg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@walletconnect/sign-client": "2.11.2"
       }
     },
     "node_modules/@airgap/beacon-types": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.1.tgz",
-      "integrity": "sha512-6PBO/FCb2kDgfJdLVhImcK9oXq3Pa444/xOW3a5WEbVqq+q9qo5OjdscJFAviQgRMz8NJJvOn8/5RbRJBy2uWw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.2.tgz",
+      "integrity": "sha512-4sX5QEZTanQ5E6FiY7lp6ilv6rlzu5eNrWa3KdygpHm0NFfkJCY7YRPWo4V5LkCCkILa9QF5TS9tVKMORNcocQ==",
       "dependencies": {
         "@types/chrome": "0.0.246"
       }
     },
     "node_modules/@airgap/beacon-ui": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.1.tgz",
-      "integrity": "sha512-doCNbi9iaJQmNWKr54/i39VkgO/IFdxArdyxrUYAT2Z6bcLa+cJu3ttNjVQKoAhm8Z07QFWneMnS7RbYZRNbWg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.2.tgz",
+      "integrity": "sha512-iuVH8ZgyejRo61vwZP4gTju+FfRxtEvA+Y9CanizlkJY3UcPa2ATx9Bmz8fGOeo5bkohxS1Ny36WEQ81z5cpIw==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@walletconnect/utils": "2.11.2",
         "qrcode-svg": "^1.1.0",
         "solid-js": "^1.7.11"
       }
     },
     "node_modules/@airgap/beacon-utils": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.1.tgz",
-      "integrity": "sha512-Ob9OE1w9jnytC9s9UYuClBef1lmJnKFnB8NsqeLPur2AHC+9M2aeua92cS6KY8GkQo3EN4KzaCguC3QFo3nsVw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.2.tgz",
+      "integrity": "sha512-TwDJ8O8/Lky6qdpczVJKWACu3BWEE49hMyCylXYJPnLlCZtpaqByD6awc+BEooJkC2c8Bj4V3JfcwBJGNzMs6w==",
       "dependencies": {
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
@@ -334,13 +334,13 @@
       }
     },
     "node_modules/@airgap/beacon-wallet": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.1.tgz",
-      "integrity": "sha512-YnEKbLVGlqZ2YwkD+bIKu6ZqMpIje2QtKccpnYbLsOSqZHY0+0n5iu63qkKw8Wy6PWDp1JN4CFVQVnGrRo7f9g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.2.tgz",
+      "integrity": "sha512-UnyxUg++ip8Hqfa7lnnZH623MraPfGtMqGLt22aYvZHrRA9ypBcJRVhBqWDeD3WUdGrVdSjtCQ0I+mHn7jIGSg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2"
       }
     },
     "node_modules/@airgap/sapling-wasm": {
@@ -6871,33 +6871,22 @@
       }
     },
     "node_modules/@walletconnect/logger": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.0.1.tgz",
-      "integrity": "sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.1.2.tgz",
+      "integrity": "sha512-aAb28I3S6pYXZHQm5ESB+V6rDqIYfsnHaQyzFbwUUBFY4H0OXx/YtTl8lvhUNhMMfb9UxbwEBS253TlXUYJWSw==",
       "dependencies": {
-        "pino": "7.11.0",
-        "tslib": "1.14.1"
+        "@walletconnect/safe-json": "^1.0.2",
+        "pino": "7.11.0"
       }
     },
-    "node_modules/@walletconnect/logger/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@walletconnect/relay-api": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.9.tgz",
-      "integrity": "sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.10.tgz",
+      "integrity": "sha512-tqrdd4zU9VBNqUaXXQASaexklv6A54yEyQQEXYOCr+Jz8Ket0dmPBDyg19LVSNUN2cipAghQc45/KVmfFJ0cYw==",
       "dependencies": {
-        "@walletconnect/jsonrpc-types": "^1.0.2",
-        "tslib": "1.14.1"
+        "@walletconnect/jsonrpc-types": "^1.0.2"
       }
     },
-    "node_modules/@walletconnect/relay-api/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@walletconnect/relay-auth": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz",
@@ -9166,6 +9155,11 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/confbox": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA=="
+    },
     "node_modules/consola": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
@@ -12965,9 +12959,9 @@
       "dev": true
     },
     "node_modules/iron-webcrypto": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.1.0.tgz",
-      "integrity": "sha512-5vgYsCakNlaQub1orZK5QmNYhwYtcllTkZBp5sfIaCqY93Cf6l+v2rtE+E4TMbcfjxDMCdrO8wmp7+ZvhDECLA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
+      "integrity": "sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==",
       "funding": {
         "url": "https://github.com/sponsors/brc-dd"
       }
@@ -14422,7 +14416,8 @@
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
@@ -16377,14 +16372,14 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "node_modules/mlly": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
-      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz",
+      "integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==",
       "dependencies": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.2"
+        "pkg-types": "^1.1.0",
+        "ufo": "^1.5.3"
       }
     },
     "node_modules/modify-values": {
@@ -18282,13 +18277,13 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+      "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
       "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
+        "confbox": "^0.1.7",
+        "mlly": "^1.7.0",
+        "pathe": "^1.1.2"
       }
     },
     "node_modules/pkg-up": {
@@ -20697,9 +20692,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.8.16",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.16.tgz",
-      "integrity": "sha512-rja94MNU9flF3qQRLNsu60QHKBDKBkVE1DldJZPIfn2ypIn3NV2WpSbGTQIvsyGPBo+9E2IMjwqnqpbgfWuzeg==",
+      "version": "1.8.17",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.17.tgz",
+      "integrity": "sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==",
       "dependencies": {
         "csstype": "^3.1.0",
         "seroval": "^1.0.4",
@@ -22511,9 +22506,9 @@
       }
     },
     "node_modules/unstorage/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -23405,17 +23400,17 @@
     },
     "packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -23463,12 +23458,12 @@
     },
     "packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0"
+        "@airgap/beacon-dapp": "^4.2.2",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23508,13 +23503,13 @@
     },
     "packages/taquito-contracts-library": {
       "name": "@taquito/contracts-library",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23551,7 +23546,7 @@
     },
     "packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.1.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -23567,10 +23562,10 @@
     },
     "packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -23627,14 +23622,14 @@
     },
     "packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -23671,15 +23666,15 @@
     },
     "packages/taquito-local-forging": {
       "name": "@taquito/local-forging",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
-        "@taquito/rpc": "^19.2.0",
+        "@taquito/rpc": "^19.2.1",
         "@types/bluebird": "^3.5.40",
         "@types/estree": "^1.0.2",
         "@types/jest": "^29.5.5",
@@ -23717,10 +23712,10 @@
     },
     "packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.1.0"
+        "@taquito/core": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23749,21 +23744,21 @@
       }
     },
     "packages/taquito-michel-codec/pack-test-tool": {
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/rpc": "^19.2.0",
+        "@taquito/rpc": "^19.2.1",
         "yargs": "^17.7.2"
       }
     },
     "packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -23800,15 +23795,15 @@
     },
     "packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -23845,12 +23840,12 @@
     },
     "packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23886,17 +23881,17 @@
     },
     "packages/taquito-sapling": {
       "name": "@taquito/sapling",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@airgap/sapling-wasm": "0.0.9",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/random": "^1.0.2",
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1",
@@ -23956,7 +23951,7 @@
     },
     "packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -23965,9 +23960,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -24010,7 +24005,7 @@
     },
     "packages/taquito-timelock": {
       "name": "@taquito/timelock",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -24018,9 +24013,9 @@
         "big-integer": "^1.6.52"
       },
       "devDependencies": {
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "@types/node": "^20.11.20",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
@@ -24064,13 +24059,13 @@
     },
     "packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0"
+        "@taquito/core": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -24106,15 +24101,15 @@
     },
     "packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -24153,12 +24148,12 @@
     },
     "packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",
diff --git a/packages/taquito-beacon-wallet/package.json b/packages/taquito-beacon-wallet/package.json
index 3da826a3e4..b662998c05 100644
--- a/packages/taquito-beacon-wallet/package.json
+++ b/packages/taquito-beacon-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/beacon-wallet",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Beacon wallet provider",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@airgap/beacon-dapp": "^4.2.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0"
+    "@airgap/beacon-dapp": "^4.2.2",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
index a683acae70..6a883f9825 100644
--- a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
+++ b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
@@ -10,6 +10,8 @@ import {
   PermissionScope,
   getDAppClientInstance,
   SigningType,
+  AccountInfo,
+  BeaconEvent,
 } from '@airgap/beacon-dapp';
 import { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 import toBuffer from 'typedarray-to-buffer';
@@ -32,9 +34,13 @@ export { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 
 export class BeaconWallet implements WalletProvider {
   public client: DAppClient;
+  public account: AccountInfo | undefined;
 
   constructor(options: DAppClientOptions) {
     this.client = getDAppClientInstance(options);
+    this.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, async (data) => {
+      this.account = data;
+    });
   }
 
   private validateRequiredScopesOrFail(
@@ -59,19 +65,17 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async getPKH() {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    return account.address;
+    return this.account.address;
   }
 
   async getPK() {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    return account.publicKey ?? '';
+    return this.account.publicKey ?? '';
   }
 
   async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {
@@ -167,11 +171,10 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async sendOperations(params: any[]) {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    const permissions = account.scopes;
+    const permissions = this.account.scopes;
     this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);
 
     const { transactionHash } = await this.client.requestOperation({ operationDetails: params });
diff --git a/packages/taquito-beacon-wallet/src/version.ts b/packages/taquito-beacon-wallet/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-beacon-wallet/src/version.ts
+++ b/packages/taquito-beacon-wallet/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-contracts-library/package.json b/packages/taquito-contracts-library/package.json
index d3f25a610d..e2043a29c4 100644
--- a/packages/taquito-contracts-library/package.json
+++ b/packages/taquito-contracts-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/contracts-library",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Can be used as an extension on the TezosToolkit to provide contracts data",
   "keywords": [
     "tezos"
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-contracts-library/src/version.ts b/packages/taquito-contracts-library/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-contracts-library/src/version.ts
+++ b/packages/taquito-contracts-library/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-core/package.json b/packages/taquito-core/package.json
index 5131b41f99..914e76b44f 100644
--- a/packages/taquito-core/package.json
+++ b/packages/taquito-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/core",
-  "version": "19.1.0",
+  "version": "19.2.1",
   "description": "Classes, interfaces, and types shared across Taquito packages",
   "keywords": [
     "tezos",
diff --git a/packages/taquito-core/src/version.ts b/packages/taquito-core/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-core/src/version.ts
+++ b/packages/taquito-core/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-http-utils/package.json b/packages/taquito-http-utils/package.json
index 7e090bea79..f456826318 100644
--- a/packages/taquito-http-utils/package.json
+++ b/packages/taquito-http-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/http-utils",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "",
   "keywords": [
     "tezos"
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
+    "@taquito/core": "^19.2.1",
     "node-fetch": "^2.7.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-http-utils/src/version.ts b/packages/taquito-http-utils/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-http-utils/src/version.ts
+++ b/packages/taquito-http-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-ledger-signer/package.json b/packages/taquito-ledger-signer/package.json
index d57c0fc3a7..e501110b3f 100644
--- a/packages/taquito-ledger-signer/package.json
+++ b/packages/taquito-ledger-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/ledger-signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Ledger signer provider",
   "keywords": [
     "tezos",
@@ -59,9 +59,9 @@
   "dependencies": {
     "@ledgerhq/hw-transport": "^6.30.5",
     "@stablelib/blake2b": "^1.0.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "buffer": "^6.0.3"
   },
   "devDependencies": {
diff --git a/packages/taquito-ledger-signer/src/version.ts b/packages/taquito-ledger-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-ledger-signer/src/version.ts
+++ b/packages/taquito-ledger-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-local-forging/package.json b/packages/taquito-local-forging/package.json
index 9c28876742..9517bf00d4 100644
--- a/packages/taquito-local-forging/package.json
+++ b/packages/taquito-local-forging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/local-forging",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provide local forging functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -67,12 +67,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
-    "@taquito/rpc": "^19.2.0",
+    "@taquito/rpc": "^19.2.1",
     "@types/bluebird": "^3.5.40",
     "@types/estree": "^1.0.2",
     "@types/jest": "^29.5.5",
diff --git a/packages/taquito-local-forging/src/version.ts b/packages/taquito-local-forging/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-local-forging/src/version.ts
+++ b/packages/taquito-local-forging/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-michel-codec/pack-test-tool/package.json b/packages/taquito-michel-codec/pack-test-tool/package.json
index 906642aef2..c9ebc97f9e 100644
--- a/packages/taquito-michel-codec/pack-test-tool/package.json
+++ b/packages/taquito-michel-codec/pack-test-tool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pack-test-tool",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Generate pack test data via Tezos RPC",
   "main": "pack-test-tool.js",
   "private": true,
@@ -8,7 +8,7 @@
   "author": "Eugene Zagidullin <eugene@ecadlabs.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@taquito/rpc": "^19.2.0",
+    "@taquito/rpc": "^19.2.1",
     "yargs": "^17.7.2"
   }
 }
diff --git a/packages/taquito-michel-codec/package.json b/packages/taquito-michel-codec/package.json
index e48a5cb7ab..367d4c5ec1 100644
--- a/packages/taquito-michel-codec/package.json
+++ b/packages/taquito-michel-codec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michel-codec",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Michelson parser/validator/formatter",
   "keywords": [
     "tezos",
@@ -66,7 +66,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0"
+    "@taquito/core": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-michel-codec/src/version.ts b/packages/taquito-michel-codec/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-michel-codec/src/version.ts
+++ b/packages/taquito-michel-codec/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-michelson-encoder/package.json b/packages/taquito-michelson-encoder/package.json
index 719ec9aa56..eda1273735 100644
--- a/packages/taquito-michelson-encoder/package.json
+++ b/packages/taquito-michelson-encoder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michelson-encoder",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "fast-json-stable-stringify": "^2.1.0"
   },
diff --git a/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts b/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
index 92fead1cfb..eca1e3d16f 100644
--- a/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
+++ b/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
@@ -16,4 +16,4 @@ export const UnitValue = Symbol();
 export const SaplingStateValue = {};
 export * from './michelson-map';
 export { VERSION } from './version';
-export { FieldNumberingStrategy, Token } from './tokens/token';
+export { Token } from './tokens/token';
diff --git a/packages/taquito-michelson-encoder/src/tokens/createToken.ts b/packages/taquito-michelson-encoder/src/tokens/createToken.ts
index c0a30bd303..1f269d2e6a 100644
--- a/packages/taquito-michelson-encoder/src/tokens/createToken.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/createToken.ts
@@ -9,10 +9,7 @@ import { TaquitoError } from '@taquito/core';
  */
 export class InvalidTokenError extends TaquitoError {
   name = 'Invalid token error';
-  constructor(
-    public message: string,
-    public data: any
-  ) {
+  constructor(public message: string, public data: any) {
     super(message);
   }
 }
@@ -22,13 +19,9 @@ export class InvalidTokenError extends TaquitoError {
  * @description Create a token from a value
  * @throws {@link InvalidTokenError} If the value passed is not supported by the Michelson Encoder
  */
-export function createToken(
-  val: any,
-  idx: number,
-  parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
-): Token {
+export function createToken(val: any, idx: number): Token {
   if (Array.isArray(val)) {
-    return new PairToken(val, idx, createToken, parentTokenType);
+    return new PairToken(val, idx, createToken);
   }
 
   const t = tokens.find((x) => x.prim === val.prim);
@@ -38,5 +31,5 @@ export function createToken(
       val
     );
   }
-  return new t(val, idx, createToken, parentTokenType);
+  return new t(val, idx, createToken);
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/or.ts b/packages/taquito-michelson-encoder/src/tokens/or.ts
index 8b748e5b8c..1d3b25ac86 100644
--- a/packages/taquito-michelson-encoder/src/tokens/or.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/or.ts
@@ -14,11 +14,7 @@ import {
  */
 export class OrValidationError extends TokenValidationError {
   name = 'OrValidationError';
-  constructor(
-    public value: any,
-    public token: OrToken,
-    message: string
-  ) {
+  constructor(public value: any, public token: OrToken, message: string) {
     super(value, token, message);
   }
 }
@@ -29,26 +25,21 @@ export class OrToken extends ComparableToken {
   constructor(
     protected val: { prim: string; args: any[]; annots: any[] },
     protected idx: number,
-    protected fac: TokenFactory,
-    protected parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
+    protected fac: TokenFactory
   ) {
-    super(val, idx, fac, parentTokenType);
+    super(val, idx, fac);
   }
 
   public Encode(args: any[]): any {
     const label = args[args.length - 1];
 
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
 
     if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
       args.pop();
@@ -75,17 +66,13 @@ export class OrToken extends ComparableToken {
   }
 
   public ExtractSignature(): any {
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
 
     const newSig = [];
 
@@ -115,17 +102,13 @@ export class OrToken extends ComparableToken {
     this.validateJavascriptObject(args);
     const label = Object.keys(args)[0];
 
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
 
     if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
       return { prim: 'Left', args: [leftToken.EncodeObject(args[label], semantic)] };
@@ -171,16 +154,12 @@ export class OrToken extends ComparableToken {
    * @throws {@link OrValidationError}
    */
   public Execute(val: any, semantics?: Semantic): any {
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
 
     if (val.prim === 'Right') {
       if (rightToken instanceof OrToken) {
@@ -211,7 +190,7 @@ export class OrToken extends ComparableToken {
     getRightValue: (token: Token) => any,
     concat: (left: any, right: any) => any
   ) {
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     let leftValue;
     if (leftToken instanceof OrToken) {
@@ -221,11 +200,7 @@ export class OrToken extends ComparableToken {
       leftValue = { [leftToken.annot()]: getLeftValue(leftToken) };
     }
 
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
     let rightValue;
     if (rightToken instanceof OrToken) {
       rightValue = getRightValue(rightToken);
@@ -280,17 +255,13 @@ export class OrToken extends ComparableToken {
   }
 
   private findToken(label: any): Token | null {
-    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
+    const leftToken = this.createToken(this.val.args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(
-      this.val.args[1],
-      this.getIdxForChildren() + keyCount,
-      'Or'
-    );
+    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
 
     if (
       String(leftToken.annot()) === String(label) &&
@@ -363,11 +334,4 @@ export class OrToken extends ComparableToken {
     );
     return tokens;
   }
-
-  protected getIdxForChildren(): number {
-    if (Token.fieldNumberingStrategy === 'Legacy') {
-      return this.idx;
-    }
-    return this.parentTokenType === 'Or' ? this.idx : 0;
-  }
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/pair.ts b/packages/taquito-michelson-encoder/src/tokens/pair.ts
index 7d73aaa166..47f76093cb 100644
--- a/packages/taquito-michelson-encoder/src/tokens/pair.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/pair.ts
@@ -65,12 +65,7 @@ function collapse(val: Token['val'] | any[], prim: string = PairToken.prim): [an
 export class PairToken extends ComparableToken {
   static prim: 'pair' = 'pair' as const;
 
-  constructor(
-    val: MichelsonV1Expression,
-    idx: number,
-    fac: TokenFactory,
-    parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
-  ) {
+  constructor(val: MichelsonV1Expression, idx: number, fac: TokenFactory) {
     super(
       Array.isArray(val)
         ? {
@@ -78,14 +73,13 @@ export class PairToken extends ComparableToken {
             args: val,
           }
         : (val as MichelsonV1ExpressionExtended).prim
-          ? (val as MichelsonV1ExpressionExtended)
-          : ({
-              prim: PairToken.prim,
-              args: val,
-            } as MichelsonV1ExpressionExtended),
+        ? (val as MichelsonV1ExpressionExtended)
+        : ({
+            prim: PairToken.prim,
+            args: val,
+          } as MichelsonV1ExpressionExtended),
       idx,
-      fac,
-      parentTokenType
+      fac
     );
   }
 
@@ -97,7 +91,7 @@ export class PairToken extends ComparableToken {
   private tokens(): [Token, Token] {
     let cnt = 0;
     return this.args().map((a) => {
-      const tok = this.createToken(a, this.getIdxForChildren() + cnt, 'Pair');
+      const tok = this.createToken(a, this.idx + cnt);
       if (tok instanceof PairToken) {
         cnt += Object.keys(tok.ExtractSchema()).length;
       } else {
@@ -116,13 +110,13 @@ export class PairToken extends ComparableToken {
 
   public ExtractSignature(): any {
     const args = this.args();
-    const leftToken = this.createToken(args[0], this.getIdxForChildren(), 'Pair');
+    const leftToken = this.createToken(args[0], this.idx);
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(args[1], this.getIdxForChildren() + keyCount, 'Pair');
+    const rightToken = this.createToken(args[1], this.idx + keyCount);
 
     const newSig = [];
 
@@ -175,7 +169,7 @@ export class PairToken extends ComparableToken {
   private traversal(getLeftValue: (token: Token) => any, getRightValue: (token: Token) => any) {
     const args = this.args();
 
-    const leftToken = this.createToken(args[0], this.getIdxForChildren(), 'Pair');
+    const leftToken = this.createToken(args[0], this.idx);
     let keyCount = 1;
     let leftValue;
     if (leftToken instanceof PairToken && !leftToken.hasAnnotations()) {
@@ -187,7 +181,7 @@ export class PairToken extends ComparableToken {
       leftValue = { [leftToken.annot()]: getLeftValue(leftToken) };
     }
 
-    const rightToken = this.createToken(args[1], this.getIdxForChildren() + keyCount, 'Pair');
+    const rightToken = this.createToken(args[1], this.idx + keyCount);
     let rightValue;
     if (rightToken instanceof PairToken && !rightToken.hasAnnotations()) {
       rightValue = getRightValue(rightToken);
@@ -281,11 +275,4 @@ export class PairToken extends ComparableToken {
     this.tokens().map((t) => t.findAndReturnTokens(tokenToFind, tokens));
     return tokens;
   }
-
-  protected getIdxForChildren(): number {
-    if (Token.fieldNumberingStrategy === 'Legacy') {
-      return this.idx;
-    }
-    return this.parentTokenType === 'Pair' ? this.idx : 0;
-  }
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/token.ts b/packages/taquito-michelson-encoder/src/tokens/token.ts
index de71d7ba58..c39dd35a38 100644
--- a/packages/taquito-michelson-encoder/src/tokens/token.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/token.ts
@@ -9,11 +9,7 @@ import { TaquitoError } from '@taquito/core';
 export abstract class TokenValidationError extends TaquitoError {
   name = 'TokenValidationError';
 
-  constructor(
-    public readonly value: any,
-    public readonly token: Token,
-    baseMessage: string
-  ) {
+  constructor(public readonly value: any, public readonly token: Token, baseMessage: string) {
     super();
     const annot = this.token.annot();
     const annotText = annot ? `[${annot}] ` : '';
@@ -21,11 +17,7 @@ export abstract class TokenValidationError extends TaquitoError {
   }
 }
 
-export type TokenFactory = (
-  val: any,
-  idx: number,
-  parentTokenType?: 'Or' | 'Pair' | 'Other'
-) => Token;
+export type TokenFactory = (val: any, idx: number) => Token;
 
 export interface Semantic {
   [key: string]: (value: MichelsonV1Expression, schema: MichelsonV1Expression) => any;
@@ -35,36 +27,11 @@ export interface SemanticEncoding {
   [key: string]: (value: any, type?: MichelsonV1Expression) => MichelsonV1Expression;
 }
 
-/**
- * @description Possible strategies for mapping between javascript classes and Michelson values
- * Legacy: The old behaviour: { annot1: 'some value', annot2: 'other Value', annot3: { 2: 'yet another value', 3: 'also some value' }}
- * ResetFieldNumbersInNestedObjects: { annot1: 'some value', annot2: 'other Value', annot3: { 0: 'yet another value', 1: 'also some value' }}
- * Latest: This will include new changes as we might implement in the future. This is the suggested value if it does not break your code
- */
-export type FieldNumberingStrategy = 'Legacy' | 'ResetFieldNumbersInNestedObjects' | 'Latest';
-
 export abstract class Token {
-  private static _fieldNumberingStrategy: FieldNumberingStrategy = 'Latest';
-
-  /**
-   * @description Gets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects, returns a value of type {@link FieldNumberingStrategy} that controls how field numbers are calculated
-   */
-  static get fieldNumberingStrategy() {
-    return Token._fieldNumberingStrategy;
-  }
-
-  /**
-   * @description Sets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects, accepts a value of type {@link FieldNumberingStrategy} that controls how field numbers are calculated
-   */
-  static set fieldNumberingStrategy(value: FieldNumberingStrategy) {
-    Token._fieldNumberingStrategy = value;
-  }
-
   constructor(
     protected val: MichelsonV1ExpressionExtended,
     protected idx: number,
-    protected fac: TokenFactory,
-    protected parentTokenType?: 'Or' | 'Pair' | 'Other'
+    protected fac: TokenFactory
   ) {}
 
   protected typeWithoutAnnotations() {
diff --git a/packages/taquito-michelson-encoder/src/version.ts b/packages/taquito-michelson-encoder/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-michelson-encoder/src/version.ts
+++ b/packages/taquito-michelson-encoder/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-michelson-encoder/test/sample1.spec.ts b/packages/taquito-michelson-encoder/test/sample1.spec.ts
index 415fa11f03..2ab346d56c 100644
--- a/packages/taquito-michelson-encoder/test/sample1.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample1.spec.ts
@@ -4,7 +4,6 @@ import { ParameterSchema } from '../src/schema/parameter';
 import { Schema } from '../src/schema/storage';
 import { MichelsonMap } from '../src/michelson-map';
 import { expectMichelsonMap } from './utils';
-import { Token } from '../src/taquito-michelson-encoder';
 
 describe('Schema test', () => {
   it('Should extract schema properly', () => {
@@ -13,7 +12,7 @@ describe('Schema test', () => {
     expect(s).toEqual({
       accounts: {
         big_map: {
-          key: 'address',
+          key: "address",
           value: {
             allowances: {
               map: {
@@ -33,60 +32,60 @@ describe('Schema test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: 'pair',
+      __michelsonType: "pair",
       schema: {
         accounts: {
-          __michelsonType: 'big_map',
+          __michelsonType: "big_map",
           schema: {
             key: {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             value: {
-              __michelsonType: 'pair',
+              __michelsonType: "pair",
               schema: {
                 allowances: {
-                  __michelsonType: 'map',
+                  __michelsonType: "map",
                   schema: {
                     key: {
-                      __michelsonType: 'address',
-                      schema: 'address',
+                      __michelsonType: "address",
+                      schema: "address"
                     },
                     value: {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
+                      __michelsonType: "nat",
+                      schema: "nat"
                     },
                   },
                 },
                 balance: {
-                  __michelsonType: 'nat',
-                  schema: 'nat',
-                },
-              },
+                  __michelsonType: "nat",
+                  schema: "nat"
+                }
+              }
             },
           },
         },
         name: {
-          __michelsonType: 'string',
-          schema: 'string',
+          __michelsonType: "string",
+          schema: "string"
         },
         owner: {
-          __michelsonType: 'address',
-          schema: 'address',
+          __michelsonType: "address",
+          schema: "address"
         },
         symbol: {
-          __michelsonType: 'string',
-          schema: 'string',
+          __michelsonType: "string",
+          schema: "string"
         },
         totalSupply: {
-          __michelsonType: 'nat',
-          schema: 'nat',
+          __michelsonType: "nat",
+          schema: "nat"
         },
         version: {
-          __michelsonType: 'nat',
-          schema: 'nat',
+          __michelsonType: "nat",
+          schema: "nat"
         },
-      },
+      }
     });
   });
 
@@ -203,7 +202,8 @@ describe('Schema test', () => {
 
   it('Should build parameter schema properly', () => {
     const schema = new ParameterSchema(params);
-    const extractSchema_Legacy = {
+    const s = schema.ExtractSchema();
+    expect(s).toEqual({
       allowance: {
         '4': 'address',
         '5': 'address',
@@ -223,8 +223,8 @@ describe('Schema test', () => {
       },
       createAccounts: {
         list: {
-          '6': 'address',
-          '7': 'nat',
+          "6": "address",
+          "7": "nat",
         },
       },
       transfer: {
@@ -236,305 +236,134 @@ describe('Schema test', () => {
         '3': 'address',
         '4': 'nat',
       },
-    };
-    const extractSchema_ResetFields = {
-      allowance: {
-        '0': 'address',
-        '1': 'address',
-        NatNatContract: 'contract',
-      },
-      approve: {
-        '0': 'address',
-        '1': 'nat',
-      },
-      balanceOf: {
-        '0': 'address',
-        NatContract: 'contract',
-      },
-      createAccount: {
-        '0': 'address',
-        '1': 'nat',
-      },
-      createAccounts: {
-        list: {
-          '0': 'address',
-          '1': 'nat',
-        },
-      },
-      transfer: {
-        '0': 'address',
-        '1': 'nat',
-      },
-      transferFrom: {
-        '0': 'address',
-        '1': 'address',
-        '2': 'nat',
-      },
-    };
+    });
 
-    const generateSchema_Legacy = {
-      __michelsonType: 'or',
+    expect(schema.generateSchema()).toEqual({
+      __michelsonType: "or",
       schema: {
         allowance: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '4': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '5': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             NatNatContract: {
-              __michelsonType: 'contract',
+              __michelsonType: "contract",
               schema: {
                 parameter: {
-                  __michelsonType: 'pair',
+                  __michelsonType: "pair",
                   schema: {
                     '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
+                      __michelsonType: "nat",
+                      schema: "nat"
                     },
                     '1': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                  },
-                },
-              },
-            },
-          },
+                      __michelsonType: "nat",
+                      schema: "nat"
+                    }
+                  }
+                }
+              }
+            }
+          }
         },
         approve: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '1': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '2': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
+              __michelsonType: "nat",
+              schema: "nat"
+            }
+          }
         },
         balanceOf: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '3': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             NatContract: {
-              __michelsonType: 'contract',
+              __michelsonType: "contract",
               schema: {
                 parameter: {
-                  __michelsonType: 'nat',
-                  schema: 'nat',
-                },
-              },
+                  __michelsonType: "nat",
+                  schema: "nat"
+                }
+              }
             },
-          },
+          }
         },
         createAccount: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '5': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '6': {
-              __michelsonType: 'nat',
-              schema: 'nat',
+              __michelsonType: "nat",
+              schema: "nat"
             },
-          },
+          }
         },
         createAccounts: {
-          __michelsonType: 'list',
+          __michelsonType: "list",
           schema: {
-            __michelsonType: 'pair',
+            __michelsonType: "pair",
             schema: {
-              '6': {
-                __michelsonType: 'address',
-                schema: 'address',
+              "6": {
+                __michelsonType: "address",
+                schema: "address"
               },
-              '7': {
-                __michelsonType: 'nat',
-                schema: 'nat',
+              "7": {
+                __michelsonType: "nat",
+                schema: "nat"
               },
-            },
+            }
           },
         },
         transfer: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '0': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '1': {
-              __michelsonType: 'nat',
-              schema: 'nat',
+              __michelsonType: "nat",
+              schema: "nat"
             },
-          },
+          }
         },
         transferFrom: {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '2': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '3': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             '4': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
-        },
-      },
-    };
-
-    const generateSchema_ResetFields = {
-      __michelsonType: 'or',
-      schema: {
-        allowance: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            NatNatContract: {
-              __michelsonType: 'contract',
-              schema: {
-                parameter: {
-                  __michelsonType: 'pair',
-                  schema: {
-                    '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '1': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-        approve: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
-        },
-        balanceOf: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            NatContract: {
-              __michelsonType: 'contract',
-              schema: {
-                parameter: {
-                  __michelsonType: 'nat',
-                  schema: 'nat',
-                },
-              },
-            },
-          },
-        },
-        createAccount: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
-        },
-        createAccounts: {
-          __michelsonType: 'list',
-          schema: {
-            __michelsonType: 'pair',
-            schema: {
-              '0': {
-                __michelsonType: 'address',
-                schema: 'address',
-              },
-              '1': {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-            },
-          },
-        },
-        transfer: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
-        },
-        transferFrom: {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "nat",
+              schema: "nat"
             },
-            '2': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
+          }
         },
-      },
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
-    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+      }
+    });
   });
 
   it('Should extract signature properly', () => {
@@ -544,29 +373,12 @@ describe('Schema test', () => {
     expect(sig).toContainEqual(['approve', 'address', 'nat']);
     expect(sig).toContainEqual(['balanceOf', 'address', 'contract']);
     expect(sig).toContainEqual(['createAccount', 'address', 'nat']);
-    const createAccount_Legacy = {
-      list: {
-        '6': 'address',
-        '7': 'nat',
-      },
-    };
-    const createAccount_ResetFields = {
+    expect(sig).toContainEqual(["createAccounts", {
       list: {
-        '0': 'address',
-        '1': 'nat',
-      },
-    };
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.ExtractSignatures()).toContainEqual(['createAccounts', createAccount_Legacy]);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.ExtractSignatures()).toContainEqual([
-      'createAccounts',
-      createAccount_ResetFields,
-    ]);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.ExtractSignatures()).toContainEqual([
-      'createAccounts',
-      createAccount_ResetFields,
+        "6": "address",
+        "7": "nat"
+      }
+    }
     ]);
     expect(sig).toContainEqual(['transfer', 'address', 'nat']);
     expect(sig).toContainEqual(['transferFrom', 'address', 'address', 'nat']);
@@ -574,33 +386,20 @@ describe('Schema test', () => {
 
   it('Should parse parameter properly', () => {
     const schema = new ParameterSchema(params);
-    const execute_Legacy = {
+    const s = schema.Execute(txParams);
+    expect(s).toEqual({
       approve: {
         '1': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
         '2': new BigNumber('60'),
       },
-    };
-    const execute_ResetFields = {
-      approve: {
-        '0': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
-        '1': new BigNumber('60'),
-      },
-    };
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.Execute(txParams)).toEqual(execute_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.Execute(txParams)).toEqual(execute_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.Execute(txParams)).toEqual(execute_ResetFields);
+    });
   });
 
   it(`Should find the value that corresponds to the type ({ prim: 'string', annots: ['%name'] }) in top-level pairs of the storage`, () => {
     const typeOfValueToFind = { prim: 'string', annots: ['%name'] };
     const storageSchema = new Schema(storage);
-    const valueFound = storageSchema.FindFirstInTopLevelPair(
-      rpcContractResponse.script.storage,
-      typeOfValueToFind
-    );
+    const valueFound = storageSchema.FindFirstInTopLevelPair(rpcContractResponse.script.storage, typeOfValueToFind);
     expect(valueFound).toEqual({ string: 'Token B' });
   });
+
 });
diff --git a/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts b/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
index f0f90c0c49..11ef24ee48 100644
--- a/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
@@ -9,16 +9,15 @@ import BigNumber from 'bignumber.js';
 import { ParameterSchema } from '../src/schema/parameter';
 import { MichelsonMap } from '../src/michelson-map';
 import { expectMichelsonMap } from './utils';
-import { Token } from '../src/taquito-michelson-encoder';
 describe('Exchange contract test', () => {
   it('Test storage schema', () => {
     const schema = new Schema(storageDexter);
-    const extractSchema_Legacy = {
+    expect(schema.ExtractSchema()).toEqual({
       '0': {
         big_map: {
-          key: 'address',
-          value: 'nat',
-        },
+          key: "address",
+          value: "nat"
+        }
       },
       '1': 'contract',
       '2': 'contract',
@@ -50,68 +49,23 @@ describe('Exchange contract test', () => {
           },
         },
       },
-    };
-    const extractSchema_ResetFields = {
-      '0': {
-        big_map: {
-          key: 'address',
-          value: 'nat',
-        },
-      },
-      '1': 'contract',
-      '2': 'contract',
-      '3': 'nat',
-      '4': {
-        map: {
-          key: 'address',
-          value: {
-            '0': {
-              '0': 'nat',
-              '1': 'nat',
-              '2': 'timestamp',
-            },
-            '1': {
-              '0': 'nat',
-              '1': 'mutez',
-              '2': 'nat',
-              '3': 'timestamp',
-            },
-            '2': {
-              '0': 'nat',
-              '1': 'timestamp',
-            },
-            '3': {
-              '0': 'nat',
-              '1': 'mutez',
-              '2': 'timestamp',
-            },
-          },
-        },
-      },
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    });
 
-    const generateSchema_Legacy = {
+    expect(schema.generateSchema()).toEqual({
       __michelsonType: 'pair',
       schema: {
         '0': {
-          __michelsonType: 'big_map',
+          __michelsonType: "big_map",
           schema: {
             key: {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             value: {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
+              __michelsonType: "nat",
+              schema: "nat"
+            }
+          }
         },
         '1': {
           __michelsonType: 'contract',
@@ -124,7 +78,7 @@ describe('Exchange contract test', () => {
                   schema: {
                     0: {
                       __michelsonType: 'address',
-                      schema: 'address',
+                      schema: 'address'
                     },
                     1: {
                       __michelsonType: 'contract',
@@ -137,351 +91,155 @@ describe('Exchange contract test', () => {
                               schema: {
                                 0: {
                                   __michelsonType: 'address',
-                                  schema: 'address',
+                                  schema: 'address'
                                 },
                                 1: {
                                   __michelsonType: 'address',
-                                  schema: 'address',
+                                  schema: 'address'
                                 },
                                 2: {
                                   __michelsonType: 'nat',
-                                  schema: 'nat',
+                                  schema: 'nat'
                                 },
-                              },
+                              }
                             },
                             1: {
                               __michelsonType: 'address',
-                              schema: 'address',
-                            },
-                          },
-                        },
-                      },
-                    },
-                  },
+                              schema: 'address'
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
                 },
                 1: {
                   __michelsonType: 'nat',
-                  schema: 'nat',
-                },
-              },
-            },
-          },
+                  schema: 'nat'
+                }
+              }
+            }
+          }
         },
         '2': {
           __michelsonType: 'contract',
           schema: {
             parameter: {
-              __michelsonType: 'or',
+              __michelsonType: "or",
               schema: {
                 0: {
-                  __michelsonType: 'pair',
+                  __michelsonType: "pair",
                   schema: {
                     0: {
                       __michelsonType: 'address',
-                      schema: 'address',
+                      schema: 'address'
                     },
                     1: {
                       __michelsonType: 'address',
-                      schema: 'address',
+                      schema: 'address'
                     },
                     2: {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
-                  },
+                  }
                 },
                 1: {
                   __michelsonType: 'address',
-                  schema: 'address',
-                },
-              },
-            },
-          },
+                  schema: 'address'
+                }
+              }
+            }
+          }
         },
         '3': {
           __michelsonType: 'nat',
-          schema: 'nat',
+          schema: 'nat'
         },
         '4': {
-          __michelsonType: 'map',
+          __michelsonType: "map",
           schema: {
             key: {
               __michelsonType: 'address',
-              schema: 'address',
+              schema: 'address'
             },
             value: {
-              __michelsonType: 'or',
+              __michelsonType: "or",
               schema: {
                 '0': {
-                  __michelsonType: 'pair',
+                  __michelsonType: "pair",
                   schema: {
                     '0': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '1': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '2': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp',
+                      schema: 'timestamp'
                     },
-                  },
+                  }
                 },
                 '1': {
                   __michelsonType: 'pair',
                   schema: {
                     '1': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '2': {
                       __michelsonType: 'mutez',
-                      schema: 'mutez',
+                      schema: 'mutez'
                     },
                     '3': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '4': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp',
+                      schema: 'timestamp'
                     },
-                  },
+                  }
                 },
                 '2': {
                   __michelsonType: 'pair',
                   schema: {
                     '2': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '3': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp',
+                      schema: 'timestamp'
                     },
-                  },
+                  }
                 },
                 '3': {
                   __michelsonType: 'pair',
                   schema: {
                     '3': {
                       __michelsonType: 'nat',
-                      schema: 'nat',
+                      schema: 'nat'
                     },
                     '4': {
                       __michelsonType: 'mutez',
-                      schema: 'mutez',
+                      schema: 'mutez'
                     },
                     '5': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp',
-                    },
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    };
-    const generateSchema_ResetFields = {
-      __michelsonType: 'pair',
-      schema: {
-        '0': {
-          __michelsonType: 'big_map',
-          schema: {
-            key: {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            value: {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-          },
-        },
-        '1': {
-          __michelsonType: 'contract',
-          schema: {
-            parameter: {
-              __michelsonType: 'or',
-              schema: {
-                0: {
-                  __michelsonType: 'pair',
-                  schema: {
-                    0: {
-                      __michelsonType: 'address',
-                      schema: 'address',
-                    },
-                    1: {
-                      __michelsonType: 'contract',
-                      schema: {
-                        parameter: {
-                          __michelsonType: 'or',
-                          schema: {
-                            0: {
-                              __michelsonType: 'pair',
-                              schema: {
-                                0: {
-                                  __michelsonType: 'address',
-                                  schema: 'address',
-                                },
-                                1: {
-                                  __michelsonType: 'address',
-                                  schema: 'address',
-                                },
-                                2: {
-                                  __michelsonType: 'nat',
-                                  schema: 'nat',
-                                },
-                              },
-                            },
-                            1: {
-                              __michelsonType: 'address',
-                              schema: 'address',
-                            },
-                          },
-                        },
-                      },
-                    },
-                  },
-                },
-                1: {
-                  __michelsonType: 'nat',
-                  schema: 'nat',
-                },
-              },
-            },
-          },
-        },
-        '2': {
-          __michelsonType: 'contract',
-          schema: {
-            parameter: {
-              __michelsonType: 'or',
-              schema: {
-                0: {
-                  __michelsonType: 'pair',
-                  schema: {
-                    0: {
-                      __michelsonType: 'address',
-                      schema: 'address',
-                    },
-                    1: {
-                      __michelsonType: 'address',
-                      schema: 'address',
-                    },
-                    2: {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                  },
-                },
-                1: {
-                  __michelsonType: 'address',
-                  schema: 'address',
-                },
-              },
-            },
-          },
-        },
-        '3': {
-          __michelsonType: 'nat',
-          schema: 'nat',
-        },
-        '4': {
-          __michelsonType: 'map',
-          schema: {
-            key: {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            value: {
-              __michelsonType: 'or',
-              schema: {
-                '0': {
-                  __michelsonType: 'pair',
-                  schema: {
-                    '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '1': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '2': {
-                      __michelsonType: 'timestamp',
-                      schema: 'timestamp',
-                    },
-                  },
-                },
-                '1': {
-                  __michelsonType: 'pair',
-                  schema: {
-                    '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '1': {
-                      __michelsonType: 'mutez',
-                      schema: 'mutez',
-                    },
-                    '2': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '3': {
-                      __michelsonType: 'timestamp',
-                      schema: 'timestamp',
-                    },
-                  },
-                },
-                '2': {
-                  __michelsonType: 'pair',
-                  schema: {
-                    '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '1': {
-                      __michelsonType: 'timestamp',
-                      schema: 'timestamp',
-                    },
-                  },
-                },
-                '3': {
-                  __michelsonType: 'pair',
-                  schema: {
-                    '0': {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
-                    },
-                    '1': {
-                      __michelsonType: 'mutez',
-                      schema: 'mutez',
-                    },
-                    '2': {
-                      __michelsonType: 'timestamp',
-                      schema: 'timestamp',
+                      schema: 'timestamp'
                     },
-                  },
+                  }
                 },
-              },
+              }
             },
           },
         },
-      },
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+      }
+    });
   });
 
   it('Test storage parsing', () => {
@@ -513,7 +271,7 @@ describe('Exchange contract test', () => {
 
   it('Test parameter schema', () => {
     const schema = new ParameterSchema(params);
-    const extractSchema_Legacy = {
+    expect(schema.ExtractSchema()).toEqual({
       '0': {
         '0': 'nat',
         '1': 'nat',
@@ -535,199 +293,85 @@ describe('Exchange contract test', () => {
         '5': 'timestamp',
       },
       '4': 'nat',
-    };
-    const extractSchema_ResetFields = {
-      '0': {
-        '0': 'nat',
-        '1': 'nat',
-        '2': 'timestamp',
-      },
-      '1': {
-        '0': 'nat',
-        '1': 'mutez',
-        '2': 'nat',
-        '3': 'timestamp',
-      },
-      '2': {
-        '0': 'nat',
-        '1': 'timestamp',
-      },
-      '3': {
-        '0': 'nat',
-        '1': 'mutez',
-        '2': 'timestamp',
-      },
-      '4': 'nat',
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    });
 
-    const generateSchema_Legacy = {
-      __michelsonType: 'or',
+    expect(schema.generateSchema()).toEqual({
+      __michelsonType: "or",
       schema: {
         '0': {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '0': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '1': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '2': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp',
+              schema: 'timestamp'
             },
-          },
+          }
         },
         '1': {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '1': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '2': {
               __michelsonType: 'mutez',
-              schema: 'mutez',
+              schema: 'mutez'
             },
             '3': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '4': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp',
+              schema: 'timestamp'
             },
-          },
+          }
         },
         '2': {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '2': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '3': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp',
+              schema: 'timestamp'
             },
-          },
+          }
         },
         '3': {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '3': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             '4': {
               __michelsonType: 'mutez',
-              schema: 'mutez',
+              schema: 'mutez'
             },
             '5': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp',
-            },
-          },
-        },
-        '4': {
-          __michelsonType: 'nat',
-          schema: 'nat',
-        },
-      },
-    };
-    const generateSchema_ResetFields = {
-      __michelsonType: 'or',
-      schema: {
-        '0': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '1': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '2': {
-              __michelsonType: 'timestamp',
-              schema: 'timestamp',
-            },
-          },
-        },
-        '1': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '1': {
-              __michelsonType: 'mutez',
-              schema: 'mutez',
-            },
-            '2': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '3': {
-              __michelsonType: 'timestamp',
-              schema: 'timestamp',
-            },
-          },
-        },
-        '2': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '1': {
-              __michelsonType: 'timestamp',
-              schema: 'timestamp',
-            },
-          },
-        },
-        '3': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'nat',
-              schema: 'nat',
-            },
-            '1': {
-              __michelsonType: 'mutez',
-              schema: 'mutez',
-            },
-            '2': {
-              __michelsonType: 'timestamp',
-              schema: 'timestamp',
+              schema: 'timestamp'
             },
-          },
+          }
         },
         '4': {
           __michelsonType: 'nat',
-          schema: 'nat',
+          schema: 'nat'
         },
-      },
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+      }
+    });
   });
 
   it('Encode parameter properly func 0', () => {
@@ -881,7 +525,7 @@ describe('Exchange contract test', () => {
     expect(schema.ExtractSchema()).toEqual({
       '0': {
         big_map: {
-          key: 'address',
+          key: "address",
           value: {
             '0': 'nat',
             '1': {
@@ -899,52 +543,52 @@ describe('Exchange contract test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: 'pair',
+      __michelsonType: "pair",
       schema: {
         '0': {
-          __michelsonType: 'big_map',
+          __michelsonType: "big_map",
           schema: {
             key: {
-              __michelsonType: 'address',
-              schema: 'address',
+              __michelsonType: "address",
+              schema: "address"
             },
             value: {
               __michelsonType: 'pair',
               schema: {
                 '0': {
-                  __michelsonType: 'nat',
-                  schema: 'nat',
+                  __michelsonType: "nat",
+                  schema: "nat"
                 },
                 '1': {
                   __michelsonType: 'map',
                   schema: {
                     key: {
-                      __michelsonType: 'address',
-                      schema: 'address',
+                      __michelsonType: "address",
+                      schema: "address"
                     },
                     value: {
-                      __michelsonType: 'nat',
-                      schema: 'nat',
+                      __michelsonType: "nat",
+                      schema: "nat"
                     },
                   },
                 },
-              },
+              }
             },
           },
         },
         '1': {
-          __michelsonType: 'nat',
-          schema: 'nat',
+          __michelsonType: "nat",
+          schema: "nat"
         },
         '2': {
-          __michelsonType: 'string',
-          schema: 'string',
+          __michelsonType: "string",
+          schema: "string"
         },
         '3': {
-          __michelsonType: 'string',
-          schema: 'string',
+          __michelsonType: "string",
+          schema: "string"
         },
-      },
+      }
     });
   });
 
@@ -970,30 +614,30 @@ describe('Exchange contract test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: 'or',
+      __michelsonType: "or",
       schema: {
         '0': {
-          __michelsonType: 'pair',
+          __michelsonType: "pair",
           schema: {
             '0': {
               __michelsonType: 'address',
-              schema: 'address',
+              schema: "address"
             },
             '1': {
               __michelsonType: 'address',
-              schema: 'address',
+              schema: "address"
             },
             '2': {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: "nat"
             },
-          },
+          }
         },
         '1': {
           __michelsonType: 'address',
-          schema: 'address',
+          schema: "address"
         },
-      },
+      }
     });
 
     expect(schema.ExtractSignatures()).toContainEqual(['1', 'address']);
diff --git a/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts b/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
index 8b025b4d7c..b7fc84630a 100644
--- a/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
@@ -2,17 +2,17 @@
 
 import { params as params9 } from '../data/sample9';
 import { ParameterSchema } from '../src/schema/parameter';
-import { Token } from '../src/taquito-michelson-encoder';
 
 describe('Schema test', () => {
   it('Should parse storage properly', () => {
     const schema = new ParameterSchema(params9);
+    const storage = schema.ExtractSchema();
 
     expect(schema.ExtractSignatures()).toContainEqual(['0', 'address', 'string', 'bytes']);
     expect(schema.ExtractSignatures()).toContainEqual(['1', 'mutez']);
     expect(schema.ExtractSignatures()).toContainEqual(['2', 'address', 'bool']);
 
-    const extractSchema_Legacy = {
+    expect(storage).toEqual({
       '0': {
         '0': 'address',
         '1': 'string',
@@ -33,38 +33,9 @@ describe('Schema test', () => {
           returns: 'operation',
         },
       },
-    };
-    const extractSchema_ResetFields = {
-      '0': {
-        '0': 'address',
-        '1': 'string',
-        '2': { Some: 'bytes' },
-      },
-      '1': 'mutez',
-      '2': {
-        '0': 'address',
-        '1': 'bool',
-      },
-      '3': {
-        lambda: {
-          parameters: {
-            0: 'address',
-            1: 'string',
-            2: { Some: 'bytes' },
-          },
-          returns: 'operation',
-        },
-      },
-    };
+    });
 
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
-
-    const generateSchema_Legacy = {
+    expect(schema.generateSchema()).toEqual({
       __michelsonType: 'or',
       schema: {
         '0': {
@@ -134,85 +105,7 @@ describe('Schema test', () => {
           },
         },
       },
-    };
-    const generateSchema_ResetFields = {
-      __michelsonType: 'or',
-      schema: {
-        '0': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'string',
-              schema: 'string',
-            },
-            '2': {
-              __michelsonType: 'option',
-              schema: {
-                __michelsonType: 'bytes',
-                schema: 'bytes',
-              },
-            },
-          },
-        },
-        '1': {
-          __michelsonType: 'mutez',
-          schema: 'mutez',
-        },
-        '2': {
-          __michelsonType: 'pair',
-          schema: {
-            '0': {
-              __michelsonType: 'address',
-              schema: 'address',
-            },
-            '1': {
-              __michelsonType: 'bool',
-              schema: 'bool',
-            },
-          },
-        },
-        '3': {
-          __michelsonType: 'lambda',
-          schema: {
-            parameters: {
-              __michelsonType: 'pair',
-              schema: {
-                0: {
-                  __michelsonType: 'address',
-                  schema: 'address',
-                },
-                1: {
-                  __michelsonType: 'string',
-                  schema: 'string',
-                },
-                2: {
-                  __michelsonType: 'option',
-                  schema: {
-                    __michelsonType: 'bytes',
-                    schema: 'bytes',
-                  },
-                },
-              },
-            },
-            returns: {
-              __michelsonType: 'operation',
-              schema: 'operation',
-            },
-          },
-        },
-      },
-    };
-
-    Token.fieldNumberingStrategy = 'Legacy';
-    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
-    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
-    Token.fieldNumberingStrategy = 'Latest';
-    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+    });
 
     expect({
       args: [
diff --git a/packages/taquito-michelson-encoder/test/tokens/map.spec.ts b/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
index eaeecf6169..8e85cc432d 100644
--- a/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
+++ b/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
@@ -192,7 +192,7 @@ describe('Map token', () => {
       map.set({ myBytes: 'cccc' }, 15); //LLR
       map.set({ myAddress: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu' }, 5); //LLL
       map.set({ myNat: 48 }, 16); //LRR
-      map.set({ myPair: { 0: 12, 1: 6 } }, 3); //RLL
+      map.set({ myPair: { 4: 12, 5: 6 } }, 3); //RLL
       map.set({ myInt: 4 }, 6); //LRL
       map.set({ myString: 'test' }, 3); //RLR
       map.set({ myBytes: 'aaaa' }, 5); //LLR
@@ -351,7 +351,7 @@ describe('Map token', () => {
       map.set({ 1: 'cccc' }, 15); //LLR
       map.set({ 0: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu' }, 5); //LLL
       map.set({ 3: 48 }, 16); //LRR
-      map.set({ 4: { 0: 12, 1: 6 } }, 3); //RLL
+      map.set({ 4: { 4: 12, 5: 6 } }, 3); //RLL
       map.set({ 2: 4 }, 6); //LRL
       map.set({ 5: 'test' }, 3); //RLR
       map.set({ 1: 'aaaa' }, 5); //LLR
@@ -642,13 +642,13 @@ describe('Map token', () => {
         schema: {
           key: {
             __michelsonType: 'string',
-            schema: 'string',
+            schema: 'string'
           },
           value: {
             __michelsonType: 'int',
-            schema: 'int',
-          },
-        },
+            schema: 'int'
+          }
+        }
       });
     });
   });
@@ -760,19 +760,19 @@ describe('Map token with pair', () => {
             schema: {
               0: {
                 __michelsonType: 'string',
-                schema: 'string',
+                schema: 'string'
               },
               1: {
                 __michelsonType: 'string',
-                schema: 'string',
-              },
-            },
+                schema: 'string'
+              }
+            }
           },
           value: {
             __michelsonType: 'int',
-            schema: 'int',
-          },
-        },
+            schema: 'int'
+          }
+        }
       });
     });
   });
@@ -890,19 +890,19 @@ describe('Map token with annotated pair', () => {
           schema: {
             test: {
               __michelsonType: 'string',
-              schema: 'string',
+              schema: 'string'
             },
             test2: {
               __michelsonType: 'string',
-              schema: 'string',
-            },
-          },
+              schema: 'string'
+            }
+          }
         },
         value: {
           __michelsonType: 'int',
-          schema: 'int',
-        },
-      },
+          schema: 'int'
+        }
+      }
     });
   });
 });
@@ -1176,47 +1176,47 @@ describe('Map token with complex pair', () => {
           schema: {
             0: {
               __michelsonType: 'int',
-              schema: 'int',
+              schema: 'int'
             },
             1: {
               __michelsonType: 'nat',
-              schema: 'nat',
+              schema: 'nat'
             },
             2: {
               __michelsonType: 'string',
-              schema: 'string',
+              schema: 'string'
             },
             3: {
               __michelsonType: 'bytes',
-              schema: 'bytes',
+              schema: 'bytes'
             },
             4: {
               __michelsonType: 'mutez',
-              schema: 'mutez',
+              schema: 'mutez'
             },
             5: {
               __michelsonType: 'bool',
-              schema: 'bool',
+              schema: 'bool'
             },
             6: {
               __michelsonType: 'key_hash',
-              schema: 'key_hash',
+              schema: 'key_hash'
             },
             7: {
               __michelsonType: 'timestamp',
-              schema: 'timestamp',
+              schema: 'timestamp'
             },
             8: {
               __michelsonType: 'address',
-              schema: 'address',
+              schema: 'address'
             },
-          },
+          }
         },
         value: {
           __michelsonType: 'int',
-          schema: 'int',
-        },
-      },
+          schema: 'int'
+        }
+      }
     });
   });
 });
diff --git a/packages/taquito-michelson-encoder/test/tokens/or.spec.ts b/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
index ba784290d4..df501340e5 100644
--- a/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
+++ b/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
@@ -10,7 +10,6 @@ import {
   tokenNoAnnots,
   tokenOrWithOption,
 } from '../data/or-tokens';
-import { Schema, Token } from '../../src/taquito-michelson-encoder';
 
 describe('Or token', () => {
   describe('generateSchema, EncodeObject, Execute', () => {
@@ -152,8 +151,11 @@ describe('Or token', () => {
           },
         ],
       });
-
-      let encode_Expected: object = {
+      expect(
+        tokenComplexNoAnnots.EncodeObject({
+          1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' },
+        })
+      ).toEqual({
         prim: 'Left',
         args: [
           {
@@ -172,17 +174,8 @@ describe('Or token', () => {
             ],
           },
         ],
-      };
-      let object_Legacy: object = { 1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' } };
-      let object_ResetFields: object = { 1: { 0: 3, 1: 4, 2: 31, 3: '2019-09-06T15:08:29.000Z' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-
-      encode_Expected = {
+      });
+      expect(tokenComplexNoAnnots.EncodeObject({ 2: { 2: 3, 3: 'test' } })).toEqual({
         prim: 'Right',
         args: [
           {
@@ -190,17 +183,12 @@ describe('Or token', () => {
             args: [{ prim: 'Pair', args: [{ int: '3' }, { string: 'test' }] }],
           },
         ],
-      };
-      object_Legacy = { 2: { 2: 3, 3: 'test' } };
-      object_ResetFields = { 2: { 0: 3, 1: 'test' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-
-      encode_Expected = {
+      });
+      expect(
+        tokenComplexNoAnnots.EncodeObject({
+          3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' },
+        })
+      ).toEqual({
         prim: 'Right',
         args: [
           {
@@ -224,15 +212,7 @@ describe('Or token', () => {
             ],
           },
         ],
-      };
-      object_Legacy = { 3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' } };
-      object_ResetFields = { 3: { 0: 4, 1: 3, 2: '2019-09-06T15:08:29.000Z' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      });
       expect(tokenComplexNoAnnots.EncodeObject({ 4: 4 })).toEqual({
         prim: 'Right',
         args: [{ prim: 'Right', args: [{ prim: 'Right', args: [{ int: '4' }] }] }],
@@ -262,8 +242,11 @@ describe('Or token', () => {
           },
         ],
       });
-
-      encode_Expected = {
+      expect(
+        tokenComplex.EncodeObject({
+          option1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' },
+        })
+      ).toEqual({
         prim: 'Left',
         args: [
           {
@@ -282,17 +265,8 @@ describe('Or token', () => {
             ],
           },
         ],
-      };
-      object_Legacy = { option1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' } };
-      object_ResetFields = { option1: { 0: 3, 1: 4, 2: 31, 3: '2019-09-06T15:08:29.000Z' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-
-      encode_Expected = {
+      });
+      expect(tokenComplex.EncodeObject({ option2: { 2: 3, 3: 'test' } })).toEqual({
         prim: 'Right',
         args: [
           {
@@ -300,17 +274,12 @@ describe('Or token', () => {
             args: [{ prim: 'Pair', args: [{ int: '3' }, { string: 'test' }] }],
           },
         ],
-      };
-      object_Legacy = { option2: { 2: 3, 3: 'test' } };
-      object_ResetFields = { option2: { 0: 3, 1: 'test' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-
-      encode_Expected = {
+      });
+      expect(
+        tokenComplex.EncodeObject({
+          option3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' },
+        })
+      ).toEqual({
         prim: 'Right',
         args: [
           {
@@ -334,16 +303,7 @@ describe('Or token', () => {
             ],
           },
         ],
-      };
-      object_Legacy = { option3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' } };
-      object_ResetFields = { option3: { 0: 4, 1: 3, 2: '2019-09-06T15:08:29.000Z' } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
-
+      });
       expect(tokenComplex.EncodeObject({ option4: 4 })).toEqual({
         prim: 'Right',
         args: [{ prim: 'Right', args: [{ prim: 'Right', args: [{ int: '4' }] }] }],
@@ -614,28 +574,15 @@ describe('Or token', () => {
         },
       });
 
-      let extractSchema_Legacy: object = {
+      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual({
         0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
         1: { 1: 'nat', 2: 'mutez', 3: 'nat', 4: 'timestamp' },
         2: { 2: 'nat', 3: 'timestamp' },
         3: { 3: 'nat', 4: 'mutez', 5: 'timestamp' },
         4: 'nat',
-      };
-      let extractSchema_ResetFields: object = {
-        0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
-        1: { 0: 'nat', 1: 'mutez', 2: 'nat', 3: 'timestamp' },
-        2: { 0: 'nat', 1: 'timestamp' },
-        3: { 0: 'nat', 1: 'mutez', 2: 'timestamp' },
-        4: 'nat',
-      };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_ResetFields);
+      });
 
-      let generateSchema_Legacy: object = {
+      expect(tokenComplexNoAnnots.generateSchema()).toEqual({
         __michelsonType: 'or',
         schema: {
           0: {
@@ -711,113 +658,17 @@ describe('Or token', () => {
             schema: 'nat',
           },
         },
-      };
-      let generateSchema_ResetFields: object = {
-        __michelsonType: 'or',
-        schema: {
-          0: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              2: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          1: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'mutez',
-                schema: 'mutez',
-              },
-              2: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              3: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          2: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          3: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'mutez',
-                schema: 'mutez',
-              },
-              2: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          4: {
-            __michelsonType: 'nat',
-            schema: 'nat',
-          },
-        },
-      };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_ResetFields);
+      });
 
-      extractSchema_Legacy = {
+      expect(tokenComplex.ExtractSchema()).toEqual({
         option0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
         option1: { 1: 'nat', 2: 'mutez', 3: 'nat', 4: 'timestamp' },
         option2: { 2: 'nat', 3: 'timestamp' },
         option3: { 3: 'nat', 4: 'mutez', 5: 'timestamp' },
         option4: 'nat',
-      };
-      extractSchema_ResetFields = {
-        option0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
-        option1: { 0: 'nat', 1: 'mutez', 2: 'nat', 3: 'timestamp' },
-        option2: { 0: 'nat', 1: 'timestamp' },
-        option3: { 0: 'nat', 1: 'mutez', 2: 'timestamp' },
-        option4: 'nat',
-      };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_ResetFields);
+      });
 
-      generateSchema_Legacy = {
+      expect(tokenComplex.generateSchema()).toEqual({
         __michelsonType: 'or',
         schema: {
           option0: {
@@ -893,90 +744,7 @@ describe('Or token', () => {
             schema: 'nat',
           },
         },
-      };
-      generateSchema_ResetFields = {
-        __michelsonType: 'or',
-        schema: {
-          option0: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              2: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          option1: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'mutez',
-                schema: 'mutez',
-              },
-              2: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              3: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          option2: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          option3: {
-            __michelsonType: 'pair',
-            schema: {
-              0: {
-                __michelsonType: 'nat',
-                schema: 'nat',
-              },
-              1: {
-                __michelsonType: 'mutez',
-                schema: 'mutez',
-              },
-              2: {
-                __michelsonType: 'timestamp',
-                schema: 'timestamp',
-              },
-            },
-          },
-          option4: {
-            __michelsonType: 'nat',
-            schema: 'nat',
-          },
-        },
-      };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenComplex.generateSchema()).toEqual(generateSchema_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenComplex.generateSchema()).toEqual(generateSchema_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenComplex.generateSchema()).toEqual(generateSchema_ResetFields);
+      });
 
       expect(tokenOrWithOption.generateSchema()).toEqual({
         __michelsonType: 'or',
@@ -1072,29 +840,22 @@ describe('Or token', () => {
           ],
         })
       ).toEqual({ myNat: new BigNumber(6) }); // { 0: '6'  }
-      let michelson: object = {
-        prim: 'Right',
-        args: [
-          {
-            prim: 'Left',
-            args: [
-              {
-                prim: 'Left',
-                args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
-              },
-            ],
-          },
-        ],
-      };
-      let execute_Legacy: object = { myPair: { 4: new BigNumber(3), 5: new BigNumber(4) } };
-      let execute_ResetFields: object = { myPair: { 0: new BigNumber(3), 1: new BigNumber(4) } };
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_ResetFields);
-
+      expect(
+        tokenNestedOr.Execute({
+          prim: 'Right',
+          args: [
+            {
+              prim: 'Left',
+              args: [
+                {
+                  prim: 'Left',
+                  args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
+                },
+              ],
+            },
+          ],
+        })
+      ).toEqual({ myPair: { 4: new BigNumber(3), 5: new BigNumber(4) } }); // { 4: { myPair: { 4: '3', 5: '4'} } }
       expect(
         tokenNestedOr.Execute({
           prim: 'Right',
@@ -1162,31 +923,22 @@ describe('Or token', () => {
           ],
         })
       ).toEqual({ 3: new BigNumber(6) }); // { 0: '6'  }
-
-      michelson = {
-        prim: 'Right',
-        args: [
-          {
-            prim: 'Left',
-            args: [
-              {
-                prim: 'Left',
-                args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
-              },
-            ],
-          },
-        ],
-      };
-      execute_Legacy = { 4: { 4: new BigNumber(3), 5: new BigNumber(4) } };
-      execute_ResetFields = { 4: { 0: new BigNumber(3), 1: new BigNumber(4) } };
-
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_ResetFields);
-
+      expect(
+        tokenNestedOrWithoutAnnot.Execute({
+          prim: 'Right',
+          args: [
+            {
+              prim: 'Left',
+              args: [
+                {
+                  prim: 'Left',
+                  args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
+                },
+              ],
+            },
+          ],
+        })
+      ).toEqual({ 4: { 4: new BigNumber(3), 5: new BigNumber(4) } }); // { 4: { myPair: { 4: '3', 5: '4'} } }
       expect(
         tokenNestedOrWithoutAnnot.Execute({
           prim: 'Right',
@@ -1230,418 +982,4 @@ describe('Or token', () => {
       });
     });
   });
-
-  describe('Nesting of Pair and Or', () => {
-    it('reproducing the reported bug in #2927', () => {
-      const schemaObj = {
-        prim: 'pair',
-        args: [
-          {
-            prim: 'set',
-            args: [
-              {
-                prim: 'address',
-              },
-            ],
-            annots: ['%owners'],
-          },
-          {
-            prim: 'set',
-            args: [
-              {
-                prim: 'address',
-              },
-            ],
-            annots: ['%inheritors'],
-          },
-          {
-            prim: 'or',
-            args: [
-              {
-                prim: 'unit',
-                annots: ['%aCTIVE'],
-              },
-              {
-                prim: 'or',
-                args: [
-                  {
-                    prim: 'pair',
-                    args: [
-                      {
-                        prim: 'address',
-                      },
-                      {
-                        prim: 'timestamp',
-                      },
-                    ],
-                    annots: ['%rECOVERING'],
-                  },
-                  {
-                    prim: 'unit',
-                    annots: ['%dEAD'],
-                  },
-                ],
-              },
-            ],
-            annots: ['%status'],
-          },
-          {
-            prim: 'mutez',
-            annots: ['%quick_recovery_stake'],
-          },
-          {
-            prim: 'nat',
-            annots: ['%quick_recovery_period'],
-          },
-          {
-            prim: 'big_map',
-            args: [
-              {
-                prim: 'pair',
-                args: [
-                  {
-                    prim: 'address',
-                  },
-                  {
-                    prim: 'or',
-                    args: [
-                      {
-                        prim: 'nat',
-                        annots: ['%sECOND'],
-                      },
-                      {
-                        prim: 'or',
-                        args: [
-                          {
-                            prim: 'nat',
-                            annots: ['%mINUTE'],
-                          },
-                          {
-                            prim: 'or',
-                            args: [
-                              {
-                                prim: 'nat',
-                                annots: ['%hOUR'],
-                              },
-                              {
-                                prim: 'or',
-                                args: [
-                                  {
-                                    prim: 'nat',
-                                    annots: ['%dAY'],
-                                  },
-                                  {
-                                    prim: 'or',
-                                    args: [
-                                      {
-                                        prim: 'nat',
-                                        annots: ['%wEEK'],
-                                      },
-                                      {
-                                        prim: 'or',
-                                        args: [
-                                          {
-                                            prim: 'nat',
-                                            annots: ['%mONTH'],
-                                          },
-                                          {
-                                            prim: 'nat',
-                                            annots: ['%yEAR'],
-                                          },
-                                        ],
-                                      },
-                                    ],
-                                  },
-                                ],
-                              },
-                            ],
-                          },
-                        ],
-                      },
-                    ],
-                  },
-                ],
-              },
-              {
-                prim: 'mutez',
-              },
-            ],
-            annots: ['%direct_debit_mandates'],
-          },
-          {
-            prim: 'big_map',
-            args: [
-              {
-                prim: 'pair',
-                args: [
-                  {
-                    prim: 'address',
-                  },
-                  {
-                    prim: 'or',
-                    args: [
-                      {
-                        prim: 'nat',
-                        annots: ['%sECOND'],
-                      },
-                      {
-                        prim: 'or',
-                        args: [
-                          {
-                            prim: 'nat',
-                            annots: ['%mINUTE'],
-                          },
-                          {
-                            prim: 'or',
-                            args: [
-                              {
-                                prim: 'nat',
-                                annots: ['%hOUR'],
-                              },
-                              {
-                                prim: 'or',
-                                args: [
-                                  {
-                                    prim: 'nat',
-                                    annots: ['%dAY'],
-                                  },
-                                  {
-                                    prim: 'or',
-                                    args: [
-                                      {
-                                        prim: 'nat',
-                                        annots: ['%wEEK'],
-                                      },
-                                      {
-                                        prim: 'or',
-                                        args: [
-                                          {
-                                            prim: 'nat',
-                                            annots: ['%mONTH'],
-                                          },
-                                          {
-                                            prim: 'nat',
-                                            annots: ['%yEAR'],
-                                          },
-                                        ],
-                                      },
-                                    ],
-                                  },
-                                ],
-                              },
-                            ],
-                          },
-                        ],
-                      },
-                    ],
-                  },
-                ],
-              },
-              {
-                prim: 'timestamp',
-              },
-            ],
-            annots: ['%direct_debit_mandates_history'],
-          },
-        ],
-      };
-      const dataObj = {
-        prim: 'Pair',
-        args: [
-          [
-            {
-              string: 'tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6',
-            },
-          ],
-          [],
-          {
-            prim: 'Right',
-            args: [
-              {
-                prim: 'Left',
-                args: [
-                  {
-                    prim: 'Pair',
-                    args: [
-                      {
-                        string: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-                      },
-                      {
-                        string: '2024-04-19T13:53:22Z',
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-          {
-            int: '1000000',
-          },
-          {
-            int: '0',
-          },
-          {
-            int: '414522',
-          },
-          {
-            int: '414523',
-          },
-        ],
-      };
-      const execute_Legacy = {
-        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
-        inheritors: [],
-        status: {
-          rECOVERING: {
-            3: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-            4: '2024-04-19T13:53:22.000Z',
-          },
-        },
-        quick_recovery_stake: BigNumber(1000000),
-        quick_recovery_period: BigNumber(0),
-        direct_debit_mandates: '414522',
-        direct_debit_mandates_history: '414523',
-      };
-      const execte_ResetFields = {
-        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
-        inheritors: [],
-        status: {
-          rECOVERING: {
-            0: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-            1: '2024-04-19T13:53:22.000Z',
-          },
-        },
-        quick_recovery_stake: BigNumber(1000000),
-        quick_recovery_period: BigNumber(0),
-        direct_debit_mandates: '414522',
-        direct_debit_mandates_history: '414523',
-      };
-
-      const schema = new Schema(schemaObj);
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(schema.Execute(dataObj)).toEqual(execute_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(schema.Execute(dataObj)).toEqual(execte_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(schema.Execute(dataObj)).toEqual(execte_ResetFields);
-    });
-
-    it('a smaller reproduction', () => {
-      const schemaObj = {
-        prim: 'pair',
-        args: [
-          {
-            prim: 'set',
-            args: [
-              {
-                prim: 'address',
-              },
-            ],
-            annots: ['%owners'],
-          },
-          {
-            prim: 'set',
-            args: [
-              {
-                prim: 'address',
-              },
-            ],
-            annots: ['%inheritors'],
-          },
-          {
-            prim: 'or',
-            args: [
-              {
-                prim: 'unit',
-                annots: ['%aCTIVE'],
-              },
-              {
-                prim: 'or',
-                args: [
-                  {
-                    prim: 'pair',
-                    args: [
-                      {
-                        prim: 'address',
-                      },
-                      {
-                        prim: 'timestamp',
-                      },
-                    ],
-                    annots: ['%rECOVERING'],
-                  },
-                  {
-                    prim: 'unit',
-                    annots: ['%dEAD'],
-                  },
-                ],
-              },
-            ],
-            annots: ['%status'],
-          },
-        ],
-      };
-      const dataObj = {
-        prim: 'Pair',
-        args: [
-          [
-            {
-              string: 'tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6',
-            },
-          ],
-          [],
-          {
-            prim: 'Right',
-            args: [
-              {
-                prim: 'Left',
-                args: [
-                  {
-                    prim: 'Pair',
-                    args: [
-                      {
-                        string: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-                      },
-                      {
-                        string: '2024-04-19T13:53:22Z',
-                      },
-                    ],
-                  },
-                ],
-              },
-            ],
-          },
-        ],
-      };
-      const execute_Legacy = {
-        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
-        inheritors: [],
-        status: {
-          rECOVERING: {
-            3: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-            4: '2024-04-19T13:53:22.000Z',
-          },
-        },
-      };
-      const execute_ResetFields = {
-        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
-        inheritors: [],
-        status: {
-          rECOVERING: {
-            0: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
-            1: '2024-04-19T13:53:22.000Z',
-          },
-        },
-      };
-
-      const schema = new Schema(schemaObj);
-      Token.fieldNumberingStrategy = 'Legacy';
-      expect(schema.Execute(dataObj)).toEqual(execute_Legacy);
-      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
-      expect(schema.Execute(dataObj)).toEqual(execute_ResetFields);
-      Token.fieldNumberingStrategy = 'Latest';
-      expect(schema.Execute(dataObj)).toEqual(execute_ResetFields);
-    });
-  });
 });
diff --git a/packages/taquito-remote-signer/package.json b/packages/taquito-remote-signer/package.json
index 84eb096103..760dc35836 100644
--- a/packages/taquito-remote-signer/package.json
+++ b/packages/taquito-remote-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/remote-signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Remote signer provider",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "typedarray-to-buffer": "^4.0.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-remote-signer/src/version.ts b/packages/taquito-remote-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-remote-signer/src/version.ts
+++ b/packages/taquito-remote-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-rpc/package.json b/packages/taquito-rpc/package.json
index 223f14420a..b167d90c30 100644
--- a/packages/taquito-rpc/package.json
+++ b/packages/taquito-rpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/rpc",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provides low level methods, and types to invoke RPC calls from a Nomadic Tezos RPC node",
   "keywords": [
     "tezos",
@@ -66,9 +66,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-rpc/src/version.ts b/packages/taquito-rpc/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-rpc/src/version.ts
+++ b/packages/taquito-rpc/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-sapling/package.json b/packages/taquito-sapling/package.json
index e8d7053bcc..b40c5126a6 100644
--- a/packages/taquito-sapling/package.json
+++ b/packages/taquito-sapling/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/sapling",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Allows reading and preparing sapling transactions",
   "keywords": [
     "tezos",
@@ -68,10 +68,10 @@
     "@airgap/sapling-wasm": "0.0.9",
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/random": "^1.0.2",
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-sapling/src/version.ts b/packages/taquito-sapling/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-sapling/src/version.ts
+++ b/packages/taquito-sapling/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-signer/package.json b/packages/taquito-signer/package.json
index 12c9f076bc..878538cb75 100644
--- a/packages/taquito-signer/package.json
+++ b/packages/taquito-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provide signing functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -72,9 +72,9 @@
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/pbkdf2": "^1.0.1",
     "@stablelib/sha512": "^1.0.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "@types/bn.js": "^5.1.2",
     "bip39": "3.1.0",
     "elliptic": "^6.5.4",
diff --git a/packages/taquito-signer/src/version.ts b/packages/taquito-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-signer/src/version.ts
+++ b/packages/taquito-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-timelock/package.json b/packages/taquito-timelock/package.json
index 633a2f4039..7daef7890a 100644
--- a/packages/taquito-timelock/package.json
+++ b/packages/taquito-timelock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/timelock",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "TypeScript implementation of the Timelock feature in Tezos",
   "main": "./dist/taquito-timelock.umd.js",
   "module": "./dist/taquito-timelock.es6.js",
@@ -68,9 +68,9 @@
     "big-integer": "^1.6.52"
   },
   "devDependencies": {
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "@types/node": "^20.11.20",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
diff --git a/packages/taquito-timelock/src/version.ts b/packages/taquito-timelock/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-timelock/src/version.ts
+++ b/packages/taquito-timelock/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-tzip12/package.json b/packages/taquito-tzip12/package.json
index 8f4a4da481..ca4069b535 100644
--- a/packages/taquito-tzip12/package.json
+++ b/packages/taquito-tzip12/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip12",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Tzip12",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0"
+    "@taquito/core": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-tzip12/src/version.ts b/packages/taquito-tzip12/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-tzip12/src/version.ts
+++ b/packages/taquito-tzip12/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-tzip16/package.json b/packages/taquito-tzip16/package.json
index ed1a83b950..fb2d45bfe0 100644
--- a/packages/taquito-tzip16/package.json
+++ b/packages/taquito-tzip16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip16",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Tzip16",
   "keywords": [
     "tezos",
@@ -61,12 +61,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "crypto-js": "^4.2.0"
   },
diff --git a/packages/taquito-tzip16/src/version.ts b/packages/taquito-tzip16/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-tzip16/src/version.ts
+++ b/packages/taquito-tzip16/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-utils/package.json b/packages/taquito-utils/package.json
index b40b29c4af..39bda3d327 100644
--- a/packages/taquito-utils/package.json
+++ b/packages/taquito-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/utils",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -64,7 +64,7 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.1.0",
+    "@taquito/core": "^19.2.1",
     "@types/bs58check": "^2.1.0",
     "bignumber.js": "^9.1.2",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-utils/src/version.ts b/packages/taquito-utils/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-utils/src/version.ts
+++ b/packages/taquito-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito/README.md b/packages/taquito/README.md
index ccbab63416..36247aa85c 100644
--- a/packages/taquito/README.md
+++ b/packages/taquito/README.md
@@ -7,7 +7,7 @@ The `@taquito/taquito` package contains higher-level functionality that builds u
 ## CDN Bundle
 
 ```html
-<script src="https://unpkg.com/@taquito/taquito@19.2.0/dist/taquito.min.js"
+<script src="https://unpkg.com/@taquito/taquito@19.2.1/dist/taquito.min.js"
 crossorigin="anonymous" integrity="sha384-IxvP0ECHi5oqLyz94wF85pU9+ktcsL1HHtA42MITxZsGbsUMEu/g+0Vkjj5vqiMR"></script>
 ```
 
diff --git a/packages/taquito/assets-manifest.json b/packages/taquito/assets-manifest.json
index 2cda686ec5..b7f1f80a20 100644
--- a/packages/taquito/assets-manifest.json
+++ b/packages/taquito/assets-manifest.json
@@ -5,6 +5,6 @@
   },
   "main.js": {
     "src": "dist/taquito.min.js",
-    "integrity": "sha256-SBnOaGNmGpU2dRZi5x2Fql8ttF2HYMVJSrEn0FUrgC8= sha384-yfyuDWhL5IMuPidvT0J7Mc2a2JI8d3XEhSRvvFKN94+UVDQVjWYqqHywNO+uxa4J sha512-Xi8RDZZPlKx8kx/yJvNXokVQHpdr/0bzb+h2t2HLDayVebG2pjHqqNlYhedGRx/2My9DjVNCPJJIELGVrVCp8A=="
+    "integrity": "sha256-3JZSLgFKNJToRxyfNaSAhSlCvN/doCnV17xo8BAPM4U= sha384-TC1SFqSdiCy1bGvfza9eovd+gju0nadTBvBKfme7o753Wkw5vAPTuthB9HdtOtxH sha512-7uUujjrPUhQ0F3dIPFEPmB3YBA7og2xPdz5BfhYDzsVzjXEvR+/plvqKBOe7z4pmltinwXXc8Le1Fiiwz6TVZA=="
   }
 }
\ No newline at end of file
diff --git a/packages/taquito/package.json b/packages/taquito/package.json
index 268d2ebeec..764ba58b03 100644
--- a/packages/taquito/package.json
+++ b/packages/taquito/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/taquito",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "High level functionality that builds upon the other packages in the Tezos Typescript Library Suite.",
   "keywords": [
     "tezos",
@@ -77,13 +77,13 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "rxjs": "^7.8.1"
   },
diff --git a/packages/taquito/src/taquito.ts b/packages/taquito/src/taquito.ts
index a15025e70e..4710b76e26 100644
--- a/packages/taquito/src/taquito.ts
+++ b/packages/taquito/src/taquito.ts
@@ -32,9 +32,8 @@ import { ParserProvider } from './parser/interface';
 import { MichelCodecParser } from './parser/michel-codec-parser';
 import { Injector } from './injector/interface';
 import { RpcInjector } from './injector/rpc-injector';
-import { FieldNumberingStrategy, Token } from '@taquito/michelson-encoder';
 
-export { FieldNumberingStrategy, Token, MichelsonMap, UnitValue } from '@taquito/michelson-encoder';
+export { MichelsonMap, UnitValue } from '@taquito/michelson-encoder';
 export { Forger, ForgeParams, ForgeResponse } from '@taquito/local-forging';
 export * from './constants';
 export * from './context';
@@ -361,14 +360,6 @@ export class TezosToolkit {
     }
   }
 
-  /**
-   * @description Sets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects
-   * @param strategy a value of type FieldNumberingStrategy that controls how field numbers are calculated
-   */
-  setFieldNumberingStrategy(strategy: FieldNumberingStrategy) {
-    Token.fieldNumberingStrategy = strategy;
-  }
-
   /**
    * @description Provide access to tezos account management
    */
diff --git a/packages/taquito/src/version.ts b/packages/taquito/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito/src/version.ts
+++ b/packages/taquito/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito/test/contract/contractAbstraction.spec.ts b/packages/taquito/test/contract/contractAbstraction.spec.ts
index 15f470371f..8abc67ff6c 100644
--- a/packages/taquito/test/contract/contractAbstraction.spec.ts
+++ b/packages/taquito/test/contract/contractAbstraction.spec.ts
@@ -382,8 +382,8 @@ describe('ContractAbstraction test', () => {
       expect(method2).toBeInstanceOf(ContractMethod);
 
       const methodObject2 = contractAbs.methodsObject[2]({
-        0: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu',
-        1: '1',
+        2: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu',
+        3: '1',
       });
       expect(methodObject2).toBeInstanceOf(ContractMethodObject);
 
diff --git a/waku-helpers.sh b/waku-helpers.sh
index 62661ed51c..7b6cbe6f30 100644
--- a/waku-helpers.sh
+++ b/waku-helpers.sh
@@ -9,7 +9,7 @@
 # * Clone and build nwaku: https://is.gd/NXeAnv
 # * Add a .env file with a variable NWAKU_DIR set to your nwaku directory
 
-_err() { # write a (loud) message to stderr, if running interactively
+_err() { # write a (loud) message to stderr, if running interacively
     [[ -o interactive ]] && tput setaf 1
     echo "$@" 1>&2
 }
diff --git a/website/package-lock.json b/website/package-lock.json
index a72c7cb37d..bfdbed87e5 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -69,17 +69,17 @@
     },
     "../packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/local-forging": "^19.2.1-beta.2",
+        "@taquito/michel-codec": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -127,12 +127,12 @@
     },
     "../packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0"
+        "@airgap/beacon-dapp": "^4.2.2",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -172,7 +172,7 @@
     },
     "../packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.1.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -188,10 +188,10 @@
     },
     "../packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1-beta.2",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -229,14 +229,14 @@
     },
     "../packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -273,10 +273,10 @@
     },
     "../packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.1.0"
+        "@taquito/core": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -306,12 +306,12 @@
     },
     "../packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -348,15 +348,15 @@
     },
     "../packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -393,12 +393,12 @@
     },
     "../packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -434,7 +434,7 @@
     },
     "../packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -443,9 +443,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -488,13 +488,13 @@
     },
     "../packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0"
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/tzip16": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -530,15 +530,15 @@
     },
     "../packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -577,12 +577,12 @@
     },
     "../packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1-beta.2",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",

From 114b08307c380efaff5300f56106e2d56063d7df Mon Sep 17 00:00:00 2001
From: ac10n <alirezahaghshenas@gmail.com>
Date: Tue, 21 May 2024 14:14:33 -0700
Subject: [PATCH 2/3] Revert "Beacon 4.2.2 (#2924)" (#2967)

This reverts commit 88a5dfbbd3aa5a98c05cf229f4248d36034fca86.
---
 apps/taquito-test-dapp/package.json           |  14 +-
 .../src/lib/TestContainer.svelte              |  24 +-
 apps/taquito-test-dapp/src/lib/Wallet.svelte  |  13 +-
 apps/taquito-test-dapp/src/tests.ts           |  42 +-
 apps/taquito-test-dapp/src/types.ts           |   2 +-
 cspell.json                                   |   1 +
 docs/dapp_prelaunch.md                        |   2 +-
 docs/rpc_nodes.md                             |   3 +
 docs/signing.md                               |   2 +-
 example/package.json                          |  24 +-
 ...ations-call-by-index-methodsObject.spec.ts | 100 ++-
 integration-tests/package.json                |  30 +-
 lerna.json                                    |   2 +-
 package-lock.json                             | 437 +++++-----
 packages/taquito-beacon-wallet/package.json   |   8 +-
 .../src/taquito-beacon-wallet.ts              |  21 +-
 packages/taquito-beacon-wallet/src/version.ts |   4 +-
 .../taquito-contracts-library/package.json    |  10 +-
 .../taquito-contracts-library/src/version.ts  |   4 +-
 packages/taquito-core/package.json            |   2 +-
 packages/taquito-core/src/version.ts          |   4 +-
 packages/taquito-http-utils/package.json      |   4 +-
 packages/taquito-http-utils/src/version.ts    |   4 +-
 packages/taquito-ledger-signer/package.json   |   8 +-
 packages/taquito-ledger-signer/src/version.ts |   4 +-
 packages/taquito-local-forging/package.json   |   8 +-
 packages/taquito-local-forging/src/version.ts |   4 +-
 .../pack-test-tool/package.json               |   4 +-
 packages/taquito-michel-codec/package.json    |   4 +-
 packages/taquito-michel-codec/src/version.ts  |   4 +-
 .../taquito-michelson-encoder/package.json    |   8 +-
 .../src/taquito-michelson-encoder.ts          |   2 +-
 .../src/tokens/createToken.ts                 |  15 +-
 .../src/tokens/or.ts                          |  66 +-
 .../src/tokens/pair.ts                        |  37 +-
 .../src/tokens/token.ts                       |  39 +-
 .../taquito-michelson-encoder/src/version.ts  |   4 +-
 .../test/sample1.spec.ts                      | 415 ++++++---
 .../test/sample11_dexter.spec.ts              | 594 ++++++++++---
 .../test/sample9_lambda.spec.ts               | 117 ++-
 .../test/tokens/map.spec.ts                   |  66 +-
 .../test/tokens/or.spec.ts                    | 798 ++++++++++++++++--
 packages/taquito-remote-signer/package.json   |  10 +-
 packages/taquito-remote-signer/src/version.ts |   4 +-
 packages/taquito-rpc/package.json             |   8 +-
 packages/taquito-rpc/src/version.ts           |   4 +-
 packages/taquito-sapling/package.json         |  10 +-
 packages/taquito-sapling/src/version.ts       |   4 +-
 packages/taquito-signer/package.json          |   8 +-
 packages/taquito-signer/src/version.ts        |   4 +-
 packages/taquito-timelock/package.json        |   8 +-
 packages/taquito-timelock/src/version.ts      |   4 +-
 packages/taquito-tzip12/package.json          |  10 +-
 packages/taquito-tzip12/src/version.ts        |   4 +-
 packages/taquito-tzip16/package.json          |  14 +-
 packages/taquito-tzip16/src/version.ts        |   4 +-
 packages/taquito-utils/package.json           |   4 +-
 packages/taquito-utils/src/version.ts         |   4 +-
 packages/taquito/README.md                    |   2 +-
 packages/taquito/assets-manifest.json         |   2 +-
 packages/taquito/package.json                 |  16 +-
 packages/taquito/src/taquito.ts               |  11 +-
 packages/taquito/src/version.ts               |   4 +-
 .../test/contract/contractAbstraction.spec.ts |   4 +-
 waku-helpers.sh                               |   2 +-
 website/package-lock.json                     | 104 +--
 66 files changed, 2349 insertions(+), 854 deletions(-)

diff --git a/apps/taquito-test-dapp/package.json b/apps/taquito-test-dapp/package.json
index bf4f665881..6aee4c753a 100644
--- a/apps/taquito-test-dapp/package.json
+++ b/apps/taquito-test-dapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taquito-test-dapp-vite",
   "private": true,
-  "version": "19.2.1",
+  "version": "19.2.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,12 +24,12 @@
     "vite": "^4.4.11"
   },
   "dependencies": {
-    "@airgap/beacon-sdk": "^4.2.2",
-    "@airgap/beacon-types": "^4.2.2",
-    "@taquito/beacon-wallet": "^19.2.1",
-    "@taquito/core": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@airgap/beacon-sdk": "^4.2.1",
+    "@airgap/beacon-types": "^4.2.1",
+    "@taquito/beacon-wallet": "^19.2.0",
+    "@taquito/core": "^19.1.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "buffer": "^6.0.3",
     "svelte-select": "^5.7.0",
     "vite-compatible-readable-stream": "^3.6.1"
diff --git a/apps/taquito-test-dapp/src/lib/TestContainer.svelte b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
index 3191c3aade..d748260eef 100644
--- a/apps/taquito-test-dapp/src/lib/TestContainer.svelte
+++ b/apps/taquito-test-dapp/src/lib/TestContainer.svelte
@@ -11,7 +11,7 @@
   let loading = false;
   let success: boolean | undefined;
   let opHash = "";
-  let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320 };
+  let input = { text: "", fee: 400, storageLimit: 400, gasLimit: 1320, amount: 0, address: "" };
   let testResult: { id: string; title: string; body: any };
 
   const run = async () => {
@@ -28,6 +28,7 @@
         test.id === "sign-payload-and-send" ||
         test.id === "sign-failingNoop" ||
         test.id === "verify-signature" ||
+        test.id === "send-tez-to-etherlink" ||
         test.id === "set-transaction-limits"
       ) {
         result = await test.run(input);
@@ -188,7 +189,7 @@
   /* ----------------------------------------------
  * Generated by Animista on 2022-4-21 9:31:8
  * Licensed under FreeBSD License.
- * See http://animista.net/license for more info. 
+ * See http://animista.net/license for more info.
  * w: http://animista.net, t: @cssanimista
  * ---------------------------------------------- */
 
@@ -302,6 +303,19 @@
             bind:value={input.text}
           />
         </div>
+      {:else if test.inputRequired && test.inputType === "etherlink"}
+        <div class="test-input test-send-tez-to-etherlink">
+          <label for="etherlink-address">
+            <span>Etherlink address</span>
+            <input type="string" id="etherlink-address" bind:value={input.address} />
+          </label>
+          <br />
+          <br />
+          <label for="send-amount">
+            <span>amount</span>
+            <input type="number" id="send-amount" bind:value={input.amount} />
+          </label>
+        </div>
       {:else if test.inputRequired && test.inputType === "set-limits"}
         <div class="test-input test-limits">
           <label for="set-limit-fee">
@@ -338,7 +352,11 @@
               {#if $store.networkType === NetworkType.CUSTOM}
                 {shortenHash(opHash)}
               {:else}
-                <a href={`${getTzKtUrl($store.networkType)}/${opHash}`} target="_blank" rel="noopener noreferrer">
+                <a
+                  href={`${getTzKtUrl($store.networkType)}/${opHash}`}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
                   {shortenHash(opHash)}
                 </a>
               {/if}
diff --git a/apps/taquito-test-dapp/src/lib/Wallet.svelte b/apps/taquito-test-dapp/src/lib/Wallet.svelte
index c78b97430c..38719e5966 100644
--- a/apps/taquito-test-dapp/src/lib/Wallet.svelte
+++ b/apps/taquito-test-dapp/src/lib/Wallet.svelte
@@ -6,18 +6,15 @@
   import { BeaconEvent, type DAppClientOptions } from "@airgap/beacon-sdk";
   import store from "../store";
   import { formatTokenAmount, shortenHash } from "../utils";
-  import {
-    defaultMatrixNode,
-    getRpcUrl,
-    defaultNetworkType,
-    type SupportedNetworks,
-  } from "../config";
+  import { defaultMatrixNode, getRpcUrl, defaultNetworkType, type SupportedNetworks } from "../config";
   import type { TezosAccountAddress } from "../types";
 
   let showDialog = false;
   let connectedWallet = "";
 
-  const createNewWallet = (config: { networkType: SupportedNetworks }) => {
+  const createNewWallet = (config: {
+    networkType: SupportedNetworks,
+  }) => {
     const options: DAppClientOptions = {
       name: "Taquito Test Dapp",
       matrixNodes: [defaultMatrixNode] as any,
@@ -26,7 +23,7 @@
         rpcUrl: getRpcUrl(config.networkType),
       },
       walletConnectOptions: {
-        projectId: "ba97fd7d1e89eae02f7c330e14ce1f36",
+        projectId: 'ba97fd7d1e89eae02f7c330e14ce1f36',
       },
       enableMetrics: $store.enableMetrics,
     };
diff --git a/apps/taquito-test-dapp/src/tests.ts b/apps/taquito-test-dapp/src/tests.ts
index d1c277bc8d..823c59ac13 100644
--- a/apps/taquito-test-dapp/src/tests.ts
+++ b/apps/taquito-test-dapp/src/tests.ts
@@ -36,6 +36,25 @@ const preparePayloadToSign = (
   };
 };
 
+const sendTezToEtherlink = async (
+  amount: number,
+  address: string,
+  tezos: TezosToolkit,
+): Promise<TestResult> => {
+  let opHash = "";
+  try {
+    const contract = await tezos.wallet.at('KT1VEjeQfDBSfpDH5WeBM5LukHPGM2htYEh3')
+    let op = await contract.methodsObject.deposit({ evm_address: 'sr18wx6ezkeRjt1SZSeZ2UQzQN3Uc3YLMLqg', l2_address: address }).send({ amount });
+    await op.confirmation()
+    opHash = op.hasOwnProperty("opHash") ? op["opHash"] : op["hash"];
+    console.log("Operation successful with op hash:", opHash);
+    return { success: true, opHash };
+  } catch (error) {
+    console.log(error);
+    return { success: false, opHash: "" };
+  }
+};
+
 const sendTez = async (Tezos: TezosToolkit): Promise<TestResult> => {
   let opHash = "";
   try {
@@ -302,7 +321,7 @@ const signPayloadAndSend = async (
     const publicKey = activeAccount.publicKey;
     // sends transaction to contract
     const op = await contract.methodsObject
-      .check_signature({0: publicKey, 1: signedPayload.signature, 2: payload.payload})
+      .check_signature({ 0: publicKey, 1: signedPayload.signature, 2: payload.payload })
       .send();
     await op.confirmation();
     return {
@@ -455,7 +474,7 @@ const permit = async (Tezos: TezosToolkit, wallet: BeaconWallet) => {
     const contract = await Tezos.wallet.at(contractAddress);
     // hashes the parameter for the contract call
     const mintParam: any = contract.methodsObject
-      .mint({0: store.userAddress, 1: 100})
+      .mint({ 0: store.userAddress, 1: 100 })
       .toTransferParams().parameter?.value;
     const mintParamType = contract.entrypoints.entrypoints["mint"];
     // packs the entrypoint call
@@ -548,6 +567,7 @@ const saplingShielded = async (
 
 export const list = [
   "Send tez",
+  "Send tez from Ghostnet to Etherlink",
   "Contract call with int",
   "Contract call with (pair nat string)",
   "Contract call that fails",
@@ -582,6 +602,24 @@ export const init = (
       inputRequired: false,
       lastResult: { option: "none", val: false }
     },
+    {
+      id: "send-tez-to-etherlink",
+      name: "Send tez from Ghostnet to Etherlink",
+      description:
+        "This test allows you send your ghostnet tez to etherlink address",
+      documentation: '',
+      keyword: 'etherlink',
+      run: input =>
+        sendTezToEtherlink(
+          input.amount,
+          input.address,
+          Tezos
+        ),
+      showExecutionTime: false,
+      inputRequired: true,
+      inputType: "etherlink",
+      lastResult: { option: "none", val: false }
+    },
     {
       id: "contract-call-simple-type",
       name: "Contract call with int",
diff --git a/apps/taquito-test-dapp/src/types.ts b/apps/taquito-test-dapp/src/types.ts
index 0d30f426c4..eaf412dd8e 100644
--- a/apps/taquito-test-dapp/src/types.ts
+++ b/apps/taquito-test-dapp/src/types.ts
@@ -15,7 +15,7 @@ export interface TestSettings {
   run: (input?: any) => Promise<TestResult>;
   showExecutionTime: boolean;
   inputRequired: boolean;
-  inputType?: "string" | "set-limits" | "sapling";
+  inputType?: "string" | "set-limits" | "sapling" | "etherlink";
   lastResult: { option: "none" | "some"; val: boolean };
 }
 
diff --git a/cspell.json b/cspell.json
index f1ed6f1a4c..c035e310f0 100644
--- a/cspell.json
+++ b/cspell.json
@@ -30,6 +30,7 @@
     "edsk",
     "Ejara",
     "entrypoints",
+    "etherlink",
     "eztz",
     "FAILWITH",
     "flextesa",
diff --git a/docs/dapp_prelaunch.md b/docs/dapp_prelaunch.md
index f4c0a892f5..10c0067e5c 100644
--- a/docs/dapp_prelaunch.md
+++ b/docs/dapp_prelaunch.md
@@ -11,7 +11,7 @@ author: Claude Barde
 - Did you enable `Local Pack` in your dapp? Local Pack reduces the search time in bigmaps by 50%, and you can easily add it to your dapp by providing a new instance of the `MichelCodecPacker` class to the `setPackerProvider` method of the `TezosToolkit`.
 - Are you creating a single instance of the `BeaconWallet` that you can reuse throughout the different components of your dapp? The JavaScript frameworks generally offer a solution to easily share data between components (the Context API in React, Provide/Inject in Vue, or a Svelte store). The instance of the `BeaconWallet` must be saved there in order to use the same one in every component. Creating multiple instances of the `BeaconWallet` may create errors when forging new transactions.
 - Is your dapp making HTTP requests on update only when necessary? The JavaScript frameworks provide different solutions to rerender the DOM when internal data is updated (React `useEffect`, Vue `beforeUpdate` and Svelte `afterUpdate`). These data may be based on call responses to Tezos nodes or indexers, which is why it is crucial to optimize them. Unnecessary HTTP requests increase the traffic to Tezos nodes and indexer servers and slow down your dapp.
-- Does your application wait for a confirmation of an operation, and does it check if the operation was successfull or failed when receiving the transaction receipt? This piece of information is crucial to your users in order to know if the transaction went through or not.
+- Does your application wait for a confirmation of an operation, and does it check if the operation was successful or failed when receiving the transaction receipt? This piece of information is crucial to your users in order to know if the transaction went through or not.
 - Do you display user-friendly error messages, for example, when a transaction fails? A lack of visual feedback when transactions don't go through as expected can be confusing for users. Users must be informed about skipped, backtracked, and failed transactions.
 - Are you handling big numbers? Because numbers in Michelson are arbitrary-precision, they can become quite long, and JavaScript switches to the scientific notation to represent them, which can be confusing for users. You can use the `bignumber.js` library to handle potentially long numbers coming from the blockchain.
 - Do you have error reporting enabled on your dapp? An error reporting tool like [BugSnag](https://www.bugsnag.com/platforms/javascript) allows you to understand the issues your users face when using your dapp.
diff --git a/docs/rpc_nodes.md b/docs/rpc_nodes.md
index 6ce4048300..7cd09f7543 100644
--- a/docs/rpc_nodes.md
+++ b/docs/rpc_nodes.md
@@ -29,6 +29,9 @@ values={[
 | SmartPy          | Mainnet      | https://mainnet.smartpy.io               | [Check](https://mainnet.smartpy.io/chains/main/blocks/head/header)              |
 | SmartPy          | Ghostnet     | https://ghostnet.smartpy.io              | [Check](https://ghostnet.smartpy.io/chains/main/blocks/head/header)             |
 | Tezos Foundation | Mainnet      | https://rpc.tzbeta.net/                  | [Check](https://rpc.tzbeta.net/chains/main/blocks/head/header)                  |
+| Tezos Foundation | Ghostnet     | https://rpc.ghostnet.teztnets.com/       | [Check](https://rpc.ghostnet.teztnets.com/chains/main/blocks/head/header)       |
+| Tezos Foundation | Oxfordnet    | https://rpc.oxfordnet.teztnets.com/      | [Check](https://rpc.oxfordnet.teztnets.com/chains/main/blocks/head/header)      |
+| Tezos Foundation | Parisnet     | https://rpc.parisnet.teztnets.com/       | [Check](https://rpc.parisnet.teztnets.com/chains/main/blocks/head/header)       |
 | Marigold         | Mainnet      | https://mainnet.tezos.marigold.dev/      | [Check](https://mainnet.tezos.marigold.dev/chains/main/blocks/head/header)      |
 | Marigold         | Ghostnet     | https://ghostnet.tezos.marigold.dev/     | [Check](https://ghostnet.tezos.marigold.dev/chains/main/blocks/head/header)     |
 | Marigold         | Oxfordnet    | https://oxfordnet.tezos.marigold.dev/    | [Check](https://oxfordnet.tezos.marigold.dev/chains/main/blocks/head/header)    |
diff --git a/docs/signing.md b/docs/signing.md
index 54903020f2..022ee1021a 100644
--- a/docs/signing.md
+++ b/docs/signing.md
@@ -143,7 +143,7 @@ const isVerified = verifySignature(
 
 ## Signing Michelson data
 
-Taquito also offers the possibility to sign Michelson code. This feature can be useful, for example, if you need to send a lambda to a contract to be executed but want to restrict the number of users who can submit a lambda by verifiying the signer's address. The signing of Michelson code requires the use of the `michel-codec` package:
+Taquito also offers the possibility to sign Michelson code. This feature can be useful, for example, if you need to send a lambda to a contract to be executed but want to restrict the number of users who can submit a lambda by verifying the signer's address. The signing of Michelson code requires the use of the `michel-codec` package:
 
 ```js live noInline
 // import { TezosToolkit } from '@taquito/taquito';
diff --git a/example/package.json b/example/package.json
index 9059ade30c..ebfa3a03ec 100644
--- a/example/package.json
+++ b/example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@taquito/example",
   "private": true,
-  "version": "19.2.1",
+  "version": "19.2.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",
@@ -41,17 +41,17 @@
     "example:scan-path-ledger": "node -r ts-node/register --preserve-symlinks scan-path-ledger.ts"
   },
   "dependencies": {
-    "@ledgerhq/hw-transport-node-hid": "^6.27.21",
-    "@taquito/ledger-signer": "^19.2.1",
-    "@taquito/local-forging": "^19.2.1",
-    "@taquito/michel-codec": "^19.2.1",
-    "@taquito/michelson-encoder": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/sapling": "^19.2.1",
-    "@taquito/signer": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/tzip16": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@ledgerhq/hw-transport-node-hid": "^6.28.5",
+    "@taquito/ledger-signer": "^19.2.0",
+    "@taquito/local-forging": "^19.2.0",
+    "@taquito/michel-codec": "^19.2.0",
+    "@taquito/michelson-encoder": "^19.2.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/sapling": "^19.2.0",
+    "@taquito/signer": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/tzip16": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts b/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
index 096976adb9..daee5318df 100644
--- a/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
+++ b/integration-tests/__tests__/contract/no-annotations-call-by-index-methodsObject.spec.ts
@@ -1,3 +1,4 @@
+import { FieldNumberingStrategy } from "@taquito/michelson-encoder";
 import { CONFIGS } from "../../config";
 import { noAnnotCode, noAnnotInit } from "../../data/token_without_annotation";
 
@@ -10,59 +11,70 @@ CONFIGS().forEach(({ lib, rpc, setup }) => {
     beforeEach(async () => {
       await setup()
     })
-    it('Verify contract.originate for a contract with no annotations for methods using methodObjects', async () => {
-      // Constants to replace annotations
-      const ACCOUNTS = '0';
-      const BALANCE = '0';
-      const ALLOWANCES = '1';
-      const TRANSFER = '0';
-      const APPROVE = '2';
 
-      // Actual tests
+    // Constants to replace annotations
+    const ACCOUNTS = '0';
+    const BALANCE = '0';
+    const ALLOWANCES = '1';
+    const TRANSFER = '0';
+    const APPROVE = '2';
 
-      const ACCOUNT1_ADDRESS = await Tezos.signer.publicKeyHash()
-      const ACCOUNT2_ADDRESS = 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu'
+    // Actual tests
 
-      // Originate a contract with a known state
-      const op = await Tezos.contract.originate({
-        balance: "1",
-        code: noAnnotCode,
-        init: noAnnotInit(await Tezos.signer.publicKeyHash())
-      })
-      await op.confirmation()
-      const contract = await op.contract()
+    const ACCOUNT2_ADDRESS = 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu'
+    
+    // Runs the entire tests for a given fieldNumberingStrategy
+    const testContract = (strategy: FieldNumberingStrategy, innerObjectStartingIndex: number) => {
+      it(`Verify contract.originate for a contract with no annotations for methods using methodObjects with fieldNumberingStrategy: ${strategy}`, async () => {
+        Tezos.setFieldNumberingStrategy(strategy);
+        const ACCOUNT1_ADDRESS = await Tezos.signer.publicKeyHash()
+        // Originate a contract with a known state
+        const op = await Tezos.contract.originate({
+          balance: "1",
+          code: noAnnotCode,
+          init: noAnnotInit(await Tezos.signer.publicKeyHash())
+        })
+        await op.confirmation()
+        const contract = await op.contract()
 
-      // Make a transfer
+        // Make a transfer
 
-      const operation = await contract.methodsObject[TRANSFER]({
-        0: ACCOUNT1_ADDRESS,
-        1: ACCOUNT2_ADDRESS,
-        2: "1"
-      }).send();
+        const operation = await contract.methodsObject[TRANSFER]({
+          0: ACCOUNT1_ADDRESS,
+          1: ACCOUNT2_ADDRESS,
+          2: "1"
+        }).send();
 
-      await operation.confirmation();
-      expect(operation.status).toEqual('applied')
+        await operation.confirmation();
+        expect(operation.status).toEqual('applied')
 
-      // Verify that the transfer was done as expected
-      const storage = await contract.storage<any>()
-      let account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
-      expect(account1[BALANCE].toString()).toEqual('16')
+        // Verify that the transfer was done as expected
+        const storage = await contract.storage<any>()
+        let account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
+        expect(account1[BALANCE].toString()).toEqual('16')
 
-      const account2 = await storage[ACCOUNTS].get(ACCOUNT2_ADDRESS)
-      expect(account2[BALANCE].toString()).toEqual('1')
+        const account2 = await storage[ACCOUNTS].get(ACCOUNT2_ADDRESS)
+        expect(account2[BALANCE].toString()).toEqual('1')
 
-      // Approve
-      const operation2 = await contract.methodsObject[APPROVE]({
-        2: ACCOUNT2_ADDRESS,
-        3: "1"
-      }).send();
+        // Approve
+        const operation2 = await contract.methodsObject[APPROVE]({
+          [innerObjectStartingIndex]: ACCOUNT2_ADDRESS,
+          [innerObjectStartingIndex + 1]: "1"
+        }).send();
 
-      await operation2.confirmation();
-      expect(operation2.status).toEqual('applied')
+        await operation2.confirmation();
+        expect(operation2.status).toEqual('applied')
+
+        // Verify that the allowance was done as expected
+        account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
+        expect(account1[ALLOWANCES].get(ACCOUNT2_ADDRESS).toString()).toEqual('1')
+      });
+    };
+    
+    // Run the tests for all fieldNumberingStrategies
+    testContract('Legacy', 2);
+    testContract('ResetFieldNumbersInNestedObjects', 0);
+    testContract('Latest', 0);
 
-      // Verify that the allowance was done as expected
-      account1 = await storage[ACCOUNTS].get(ACCOUNT1_ADDRESS)
-      expect(account1[ALLOWANCES].get(ACCOUNT2_ADDRESS).toString()).toEqual('1')
-    })
   });
-})
+});
diff --git a/integration-tests/package.json b/integration-tests/package.json
index 06f450e345..ccb2bc9682 100644
--- a/integration-tests/package.json
+++ b/integration-tests/package.json
@@ -13,26 +13,26 @@
     "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": "19.2.1",
+  "version": "19.2.0",
   "dependencies": {
     "@ledgerhq/devices": "8.2.2",
     "@ledgerhq/hw-transport": "6.30.5",
     "@ledgerhq/hw-transport-node-hid": "6.28.5",
     "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-    "@taquito/contracts-library": "^19.2.1",
-    "@taquito/core": "^19.2.1",
-    "@taquito/http-utils": "^19.2.1",
-    "@taquito/local-forging": "^19.2.1",
-    "@taquito/michel-codec": "^19.2.1",
-    "@taquito/michelson-encoder": "^19.2.1",
-    "@taquito/remote-signer": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/sapling": "^19.2.1",
-    "@taquito/signer": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/tzip12": "^19.2.1",
-    "@taquito/tzip16": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/contracts-library": "^19.2.0",
+    "@taquito/core": "^19.1.0",
+    "@taquito/http-utils": "^19.2.0",
+    "@taquito/local-forging": "^19.2.0",
+    "@taquito/michel-codec": "^19.2.0",
+    "@taquito/michelson-encoder": "^19.2.0",
+    "@taquito/remote-signer": "^19.2.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/sapling": "^19.2.0",
+    "@taquito/signer": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/tzip12": "^19.2.0",
+    "@taquito/tzip16": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1"
diff --git a/lerna.json b/lerna.json
index a537c45977..3c6da77aa3 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
 {
   "useNx": true,
-  "version": "19.2.1"
+  "version": "19.2.0"
 }
diff --git a/package-lock.json b/package-lock.json
index 7ddfdbb3a7..fadffed0cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,14 +56,14 @@
     },
     "apps/taquito-test-dapp": {
       "name": "taquito-test-dapp-vite",
-      "version": "19.2.1",
-      "dependencies": {
-        "@airgap/beacon-sdk": "^4.2.2",
-        "@airgap/beacon-types": "^4.2.2",
-        "@taquito/beacon-wallet": "^19.2.1",
-        "@taquito/core": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+      "version": "19.2.0",
+      "dependencies": {
+        "@airgap/beacon-sdk": "^4.2.1",
+        "@airgap/beacon-types": "^4.2.1",
+        "@taquito/beacon-wallet": "^19.2.0",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "buffer": "^6.0.3",
         "svelte-select": "^5.7.0",
         "vite-compatible-readable-stream": "^3.6.1"
@@ -85,19 +85,19 @@
     },
     "example": {
       "name": "@taquito/example",
-      "version": "19.2.1",
-      "dependencies": {
-        "@ledgerhq/hw-transport-node-hid": "^6.27.21",
-        "@taquito/ledger-signer": "^19.2.1",
-        "@taquito/local-forging": "^19.2.1",
-        "@taquito/michel-codec": "^19.2.1",
-        "@taquito/michelson-encoder": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/sapling": "^19.2.1",
-        "@taquito/signer": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/tzip16": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+      "version": "19.2.0",
+      "dependencies": {
+        "@ledgerhq/hw-transport-node-hid": "^6.28.5",
+        "@taquito/ledger-signer": "^19.2.0",
+        "@taquito/local-forging": "^19.2.0",
+        "@taquito/michel-codec": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/sapling": "^19.2.0",
+        "@taquito/signer": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/tzip16": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -106,26 +106,26 @@
       }
     },
     "integration-tests": {
-      "version": "19.2.1",
+      "version": "19.2.0",
       "dependencies": {
         "@ledgerhq/devices": "8.2.2",
         "@ledgerhq/hw-transport": "6.30.5",
         "@ledgerhq/hw-transport-node-hid": "6.28.5",
         "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-        "@taquito/contracts-library": "^19.2.1",
-        "@taquito/core": "^19.2.1",
-        "@taquito/http-utils": "^19.2.1",
-        "@taquito/local-forging": "^19.2.1",
-        "@taquito/michel-codec": "^19.2.1",
-        "@taquito/michelson-encoder": "^19.2.1",
-        "@taquito/remote-signer": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/sapling": "^19.2.1",
-        "@taquito/signer": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/tzip12": "^19.2.1",
-        "@taquito/tzip16": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/contracts-library": "^19.2.0",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/local-forging": "^19.2.0",
+        "@taquito/michel-codec": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/remote-signer": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/sapling": "^19.2.0",
+        "@taquito/signer": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/tzip12": "^19.2.0",
+        "@taquito/tzip16": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1"
@@ -156,30 +156,30 @@
       }
     },
     "node_modules/@airgap/beacon-blockchain-substrate": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.2.tgz",
-      "integrity": "sha512-7G5HvZBM03zDwWh0OfXxKkE4WVrtacIEq7Ks1W33Yrtk7M2fliJu8FplYwn4EyasBXtt5WQfd2/3OkJOjbNmXw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.1.tgz",
+      "integrity": "sha512-Zaggh3QdYYlXV8DsdbPcLuKCLCG9mqSBCQSrLZphaHi9phL16GuAcM7UnuQTnN9UbAS1gkLe3I1IIXZHNpMTig==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-ui": "4.2.2"
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-ui": "4.2.1"
       }
     },
     "node_modules/@airgap/beacon-blockchain-tezos": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.2.tgz",
-      "integrity": "sha512-VeS9nNwgwic9uIO4dF2KCQr673qos/vhf528H2dy5NwITFSSRwT/lPT5YCDvmCQ5roYQF7+qY1tTE0VBKONEhg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.1.tgz",
+      "integrity": "sha512-vVwROjzt70MjiSDKbsUV2gHxFT8YMfCnn9t/FR04nn/DIxWrnxmRPoWh8lnqJOx2SHuqQgVDTE0i4kxBYuW94Q==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-ui": "4.2.2"
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-ui": "4.2.1"
       }
     },
     "node_modules/@airgap/beacon-core": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.2.tgz",
-      "integrity": "sha512-pvp6T57fL734Yi81ZOvAo6oQmw7PPsj5BLC/brg17ic2uGCF0aFgYrExTDxVz5SoM93v5NJCPvg1TRkitTcvtA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.1.tgz",
+      "integrity": "sha512-rOfvmxTcfoPfC40G2RoPxp9HtQjeNZGuecvmsGAkbEcJHZpgNXoyp5zt8YeBBpxA8KsV156FcUDjyHadSFjaWw==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1",
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/utf8": "^1.0.1",
@@ -214,91 +214,91 @@
       }
     },
     "node_modules/@airgap/beacon-dapp": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.2.tgz",
-      "integrity": "sha512-kXH9gwjkbZKlt1irg/QGOWJeUwvR+ffa/3m39F8Mv5uIdS/PnOU4QMso6F4VVbtk6RmAGFr1gG/Q6pIkkWPFxg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.1.tgz",
+      "integrity": "sha512-lt1B8JL2yQkun0imhQv/Fz/LhHTrXo1xdBlYUopOGi6KHtXXyGZpMTrAqEUWn/nKYcygjx+zNI5NaMxDn2Ejlg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-transport-matrix": "4.2.2",
-        "@airgap/beacon-transport-postmessage": "4.2.2",
-        "@airgap/beacon-transport-walletconnect": "4.2.2",
-        "@airgap/beacon-ui": "4.2.2"
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-transport-matrix": "4.2.1",
+        "@airgap/beacon-transport-postmessage": "4.2.1",
+        "@airgap/beacon-transport-walletconnect": "4.2.1",
+        "@airgap/beacon-ui": "4.2.1"
       }
     },
     "node_modules/@airgap/beacon-sdk": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.2.tgz",
-      "integrity": "sha512-F99zhXUp1EXDOqESqjPglBGzv0WSKVcmf62PYbW5B3HyhstbC3gdu8pcu/rEkMyyF3dLUFzX91cE/COBgh3qRA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.1.tgz",
+      "integrity": "sha512-/NhrQBETARyB3UT1c7/IEAItV1RmCpdGd2m32Dn8MsyAmHki+y+BuKBuWuywjKOZHqVntkeqIWvh9thmBnih/w==",
       "dependencies": {
-        "@airgap/beacon-blockchain-substrate": "4.2.2",
-        "@airgap/beacon-blockchain-tezos": "4.2.2",
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-dapp": "4.2.2",
-        "@airgap/beacon-transport-matrix": "4.2.2",
-        "@airgap/beacon-transport-postmessage": "4.2.2",
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-ui": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2",
-        "@airgap/beacon-wallet": "4.2.2"
+        "@airgap/beacon-blockchain-substrate": "4.2.1",
+        "@airgap/beacon-blockchain-tezos": "4.2.1",
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-dapp": "4.2.1",
+        "@airgap/beacon-transport-matrix": "4.2.1",
+        "@airgap/beacon-transport-postmessage": "4.2.1",
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-ui": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-wallet": "4.2.1"
       }
     },
     "node_modules/@airgap/beacon-transport-matrix": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.2.tgz",
-      "integrity": "sha512-lCwFo6laGQbowvQoGU5tlkgrdBx9S9Nyk/OjJUE5Db9DgvQZhRR77zA0jl7lPdYDYcKeklHahBz6vwkiN/ferA==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.1.tgz",
+      "integrity": "sha512-ggvKQPreXVrm5t3kPV/RGBTIxo8ujSrE6tb6kpUAQyMC+mfMPY5WeP8qwqgMT+yzRMYUlkJa3u+hNxoSQIKK+A==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1",
         "axios": "^1.6.2"
       }
     },
     "node_modules/@airgap/beacon-transport-postmessage": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.2.tgz",
-      "integrity": "sha512-xLFeTEw6Yydq+4cr8IISxFprEQm3Us1QKNI/zNTAy1ssTxML1MZGAoLXWm/3adXKc8kzeR7dZH9blNEKhZWGcQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.1.tgz",
+      "integrity": "sha512-/sq2yz90scWNwb93nhe9hXQZpetXLuc/BRJcyg3W3Sv53wEQ5yPb9XmedFhuFo/Tc8nTt5kZgz5ORXgDnlATJg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2"
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1"
       }
     },
     "node_modules/@airgap/beacon-transport-walletconnect": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.2.tgz",
-      "integrity": "sha512-ftwUDhQdjLPtyX1ESUp9VkFS5vyEvp377eL4lVFaEdqf4mCpxg/XxHffO/o7OeRD1NI0nZfCxsKOWU2plg+ghg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.1.tgz",
+      "integrity": "sha512-HTjKXtXP3z/Xg2yViE2o4gi556ickOTHjFz7t9ftp75qARP+XOW0uWcwTTV8YVK4mW5fXe0lM2M5nGXWD6nE8g==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1",
         "@walletconnect/sign-client": "2.11.2"
       }
     },
     "node_modules/@airgap/beacon-types": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.2.tgz",
-      "integrity": "sha512-4sX5QEZTanQ5E6FiY7lp6ilv6rlzu5eNrWa3KdygpHm0NFfkJCY7YRPWo4V5LkCCkILa9QF5TS9tVKMORNcocQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.1.tgz",
+      "integrity": "sha512-6PBO/FCb2kDgfJdLVhImcK9oXq3Pa444/xOW3a5WEbVqq+q9qo5OjdscJFAviQgRMz8NJJvOn8/5RbRJBy2uWw==",
       "dependencies": {
         "@types/chrome": "0.0.246"
       }
     },
     "node_modules/@airgap/beacon-ui": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.2.tgz",
-      "integrity": "sha512-iuVH8ZgyejRo61vwZP4gTju+FfRxtEvA+Y9CanizlkJY3UcPa2ATx9Bmz8fGOeo5bkohxS1Ny36WEQ81z5cpIw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.1.tgz",
+      "integrity": "sha512-doCNbi9iaJQmNWKr54/i39VkgO/IFdxArdyxrUYAT2Z6bcLa+cJu3ttNjVQKoAhm8Z07QFWneMnS7RbYZRNbWg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-transport-postmessage": "4.2.2",
-        "@airgap/beacon-types": "4.2.2",
-        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-transport-postmessage": "4.2.1",
+        "@airgap/beacon-types": "4.2.1",
+        "@airgap/beacon-utils": "4.2.1",
         "@walletconnect/utils": "2.11.2",
         "qrcode-svg": "^1.1.0",
         "solid-js": "^1.7.11"
       }
     },
     "node_modules/@airgap/beacon-utils": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.2.tgz",
-      "integrity": "sha512-TwDJ8O8/Lky6qdpczVJKWACu3BWEE49hMyCylXYJPnLlCZtpaqByD6awc+BEooJkC2c8Bj4V3JfcwBJGNzMs6w==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.1.tgz",
+      "integrity": "sha512-Ob9OE1w9jnytC9s9UYuClBef1lmJnKFnB8NsqeLPur2AHC+9M2aeua92cS6KY8GkQo3EN4KzaCguC3QFo3nsVw==",
       "dependencies": {
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
@@ -334,13 +334,13 @@
       }
     },
     "node_modules/@airgap/beacon-wallet": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.2.tgz",
-      "integrity": "sha512-UnyxUg++ip8Hqfa7lnnZH623MraPfGtMqGLt22aYvZHrRA9ypBcJRVhBqWDeD3WUdGrVdSjtCQ0I+mHn7jIGSg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.1.tgz",
+      "integrity": "sha512-YnEKbLVGlqZ2YwkD+bIKu6ZqMpIje2QtKccpnYbLsOSqZHY0+0n5iu63qkKw8Wy6PWDp1JN4CFVQVnGrRo7f9g==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.2",
-        "@airgap/beacon-transport-matrix": "4.2.2",
-        "@airgap/beacon-transport-postmessage": "4.2.2"
+        "@airgap/beacon-core": "4.2.1",
+        "@airgap/beacon-transport-matrix": "4.2.1",
+        "@airgap/beacon-transport-postmessage": "4.2.1"
       }
     },
     "node_modules/@airgap/sapling-wasm": {
@@ -6871,22 +6871,33 @@
       }
     },
     "node_modules/@walletconnect/logger": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.1.2.tgz",
-      "integrity": "sha512-aAb28I3S6pYXZHQm5ESB+V6rDqIYfsnHaQyzFbwUUBFY4H0OXx/YtTl8lvhUNhMMfb9UxbwEBS253TlXUYJWSw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.0.1.tgz",
+      "integrity": "sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ==",
       "dependencies": {
-        "@walletconnect/safe-json": "^1.0.2",
-        "pino": "7.11.0"
+        "pino": "7.11.0",
+        "tslib": "1.14.1"
       }
     },
+    "node_modules/@walletconnect/logger/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@walletconnect/relay-api": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.10.tgz",
-      "integrity": "sha512-tqrdd4zU9VBNqUaXXQASaexklv6A54yEyQQEXYOCr+Jz8Ket0dmPBDyg19LVSNUN2cipAghQc45/KVmfFJ0cYw==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.9.tgz",
+      "integrity": "sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg==",
       "dependencies": {
-        "@walletconnect/jsonrpc-types": "^1.0.2"
+        "@walletconnect/jsonrpc-types": "^1.0.2",
+        "tslib": "1.14.1"
       }
     },
+    "node_modules/@walletconnect/relay-api/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
+    },
     "node_modules/@walletconnect/relay-auth": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz",
@@ -9155,11 +9166,6 @@
         "typedarray": "^0.0.6"
       }
     },
-    "node_modules/confbox": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
-      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA=="
-    },
     "node_modules/consola": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
@@ -12959,9 +12965,9 @@
       "dev": true
     },
     "node_modules/iron-webcrypto": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
-      "integrity": "sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.1.0.tgz",
+      "integrity": "sha512-5vgYsCakNlaQub1orZK5QmNYhwYtcllTkZBp5sfIaCqY93Cf6l+v2rtE+E4TMbcfjxDMCdrO8wmp7+ZvhDECLA==",
       "funding": {
         "url": "https://github.com/sponsors/brc-dd"
       }
@@ -14416,8 +14422,7 @@
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
-      "dev": true
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
@@ -16372,14 +16377,14 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "node_modules/mlly": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz",
-      "integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
+      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
       "dependencies": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.1.0",
-        "ufo": "^1.5.3"
+        "pkg-types": "^1.0.3",
+        "ufo": "^1.3.2"
       }
     },
     "node_modules/modify-values": {
@@ -18277,13 +18282,13 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
-      "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
+      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
       "dependencies": {
-        "confbox": "^0.1.7",
-        "mlly": "^1.7.0",
-        "pathe": "^1.1.2"
+        "jsonc-parser": "^3.2.0",
+        "mlly": "^1.2.0",
+        "pathe": "^1.1.0"
       }
     },
     "node_modules/pkg-up": {
@@ -20692,9 +20697,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.8.17",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.17.tgz",
-      "integrity": "sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==",
+      "version": "1.8.16",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.16.tgz",
+      "integrity": "sha512-rja94MNU9flF3qQRLNsu60QHKBDKBkVE1DldJZPIfn2ypIn3NV2WpSbGTQIvsyGPBo+9E2IMjwqnqpbgfWuzeg==",
       "dependencies": {
         "csstype": "^3.1.0",
         "seroval": "^1.0.4",
@@ -22506,9 +22511,9 @@
       }
     },
     "node_modules/unstorage/node_modules/lru-cache": {
-      "version": "10.2.2",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
-      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
+      "version": "10.2.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
+      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -23400,17 +23405,17 @@
     },
     "packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/http-utils": "^19.2.1",
-        "@taquito/local-forging": "^19.2.1",
-        "@taquito/michel-codec": "^19.2.1",
-        "@taquito/michelson-encoder": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/local-forging": "^19.2.0",
+        "@taquito/michel-codec": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -23458,12 +23463,12 @@
     },
     "packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.2",
-        "@taquito/core": "^19.2.1",
-        "@taquito/taquito": "^19.2.1"
+        "@airgap/beacon-dapp": "^4.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23503,13 +23508,13 @@
     },
     "packages/taquito-contracts-library": {
       "name": "@taquito/contracts-library",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23546,7 +23551,7 @@
     },
     "packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.2.1",
+      "version": "19.1.0",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -23562,10 +23567,10 @@
     },
     "packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
+        "@taquito/core": "^19.1.0",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -23622,14 +23627,14 @@
     },
     "packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -23666,15 +23671,15 @@
     },
     "packages/taquito-local-forging": {
       "name": "@taquito/local-forging",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
-        "@taquito/rpc": "^19.2.1",
+        "@taquito/rpc": "^19.2.0",
         "@types/bluebird": "^3.5.40",
         "@types/estree": "^1.0.2",
         "@types/jest": "^29.5.5",
@@ -23712,10 +23717,10 @@
     },
     "packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.2.1"
+        "@taquito/core": "^19.1.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23744,21 +23749,21 @@
       }
     },
     "packages/taquito-michel-codec/pack-test-tool": {
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/rpc": "^19.2.1",
+        "@taquito/rpc": "^19.2.0",
         "yargs": "^17.7.2"
       }
     },
     "packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -23795,15 +23800,15 @@
     },
     "packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.2.1",
-        "@taquito/http-utils": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -23840,12 +23845,12 @@
     },
     "packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/http-utils": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23881,17 +23886,17 @@
     },
     "packages/taquito-sapling": {
       "name": "@taquito/sapling",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@airgap/sapling-wasm": "0.0.9",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/random": "^1.0.2",
-        "@taquito/core": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1",
@@ -23951,7 +23956,7 @@
     },
     "packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -23960,9 +23965,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -24005,7 +24010,7 @@
     },
     "packages/taquito-timelock": {
       "name": "@taquito/timelock",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -24013,9 +24018,9 @@
         "big-integer": "^1.6.52"
       },
       "devDependencies": {
-        "@taquito/signer": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/signer": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "@types/node": "^20.11.20",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
@@ -24059,13 +24064,13 @@
     },
     "packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/michelson-encoder": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/tzip16": "^19.2.1"
+        "@taquito/core": "^19.1.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/tzip16": "^19.2.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -24101,15 +24106,15 @@
     },
     "packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1",
-        "@taquito/http-utils": "^19.2.1",
-        "@taquito/michelson-encoder": "^19.2.1",
-        "@taquito/rpc": "^19.2.1",
-        "@taquito/taquito": "^19.2.1",
-        "@taquito/utils": "^19.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -24148,12 +24153,12 @@
     },
     "packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.1",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.2.1",
+        "@taquito/core": "^19.1.0",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",
diff --git a/packages/taquito-beacon-wallet/package.json b/packages/taquito-beacon-wallet/package.json
index b662998c05..3da826a3e4 100644
--- a/packages/taquito-beacon-wallet/package.json
+++ b/packages/taquito-beacon-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/beacon-wallet",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Beacon wallet provider",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@airgap/beacon-dapp": "^4.2.2",
-    "@taquito/core": "^19.2.1",
-    "@taquito/taquito": "^19.2.1"
+    "@airgap/beacon-dapp": "^4.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/taquito": "^19.2.0"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
index 6a883f9825..a683acae70 100644
--- a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
+++ b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
@@ -10,8 +10,6 @@ import {
   PermissionScope,
   getDAppClientInstance,
   SigningType,
-  AccountInfo,
-  BeaconEvent,
 } from '@airgap/beacon-dapp';
 import { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 import toBuffer from 'typedarray-to-buffer';
@@ -34,13 +32,9 @@ export { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 
 export class BeaconWallet implements WalletProvider {
   public client: DAppClient;
-  public account: AccountInfo | undefined;
 
   constructor(options: DAppClientOptions) {
     this.client = getDAppClientInstance(options);
-    this.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, async (data) => {
-      this.account = data;
-    });
   }
 
   private validateRequiredScopesOrFail(
@@ -65,17 +59,19 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async getPKH() {
-    if (!this.account) {
+    const account = await this.client.getActiveAccount();
+    if (!account) {
       throw new BeaconWalletNotInitialized();
     }
-    return this.account.address;
+    return account.address;
   }
 
   async getPK() {
-    if (!this.account) {
+    const account = await this.client.getActiveAccount();
+    if (!account) {
       throw new BeaconWalletNotInitialized();
     }
-    return this.account.publicKey ?? '';
+    return account.publicKey ?? '';
   }
 
   async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {
@@ -171,10 +167,11 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async sendOperations(params: any[]) {
-    if (!this.account) {
+    const account = await this.client.getActiveAccount();
+    if (!account) {
       throw new BeaconWalletNotInitialized();
     }
-    const permissions = this.account.scopes;
+    const permissions = account.scopes;
     this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);
 
     const { transactionHash } = await this.client.requestOperation({ operationDetails: params });
diff --git a/packages/taquito-beacon-wallet/src/version.ts b/packages/taquito-beacon-wallet/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-beacon-wallet/src/version.ts
+++ b/packages/taquito-beacon-wallet/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-contracts-library/package.json b/packages/taquito-contracts-library/package.json
index e2043a29c4..d3f25a610d 100644
--- a/packages/taquito-contracts-library/package.json
+++ b/packages/taquito-contracts-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/contracts-library",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Can be used as an extension on the TezosToolkit to provide contracts data",
   "keywords": [
     "tezos"
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-contracts-library/src/version.ts b/packages/taquito-contracts-library/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-contracts-library/src/version.ts
+++ b/packages/taquito-contracts-library/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-core/package.json b/packages/taquito-core/package.json
index 914e76b44f..5131b41f99 100644
--- a/packages/taquito-core/package.json
+++ b/packages/taquito-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/core",
-  "version": "19.2.1",
+  "version": "19.1.0",
   "description": "Classes, interfaces, and types shared across Taquito packages",
   "keywords": [
     "tezos",
diff --git a/packages/taquito-core/src/version.ts b/packages/taquito-core/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-core/src/version.ts
+++ b/packages/taquito-core/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-http-utils/package.json b/packages/taquito-http-utils/package.json
index f456826318..7e090bea79 100644
--- a/packages/taquito-http-utils/package.json
+++ b/packages/taquito-http-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/http-utils",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "",
   "keywords": [
     "tezos"
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
+    "@taquito/core": "^19.1.0",
     "node-fetch": "^2.7.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-http-utils/src/version.ts b/packages/taquito-http-utils/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-http-utils/src/version.ts
+++ b/packages/taquito-http-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-ledger-signer/package.json b/packages/taquito-ledger-signer/package.json
index e501110b3f..d57c0fc3a7 100644
--- a/packages/taquito-ledger-signer/package.json
+++ b/packages/taquito-ledger-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/ledger-signer",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Ledger signer provider",
   "keywords": [
     "tezos",
@@ -59,9 +59,9 @@
   "dependencies": {
     "@ledgerhq/hw-transport": "^6.30.5",
     "@stablelib/blake2b": "^1.0.1",
-    "@taquito/core": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "buffer": "^6.0.3"
   },
   "devDependencies": {
diff --git a/packages/taquito-ledger-signer/src/version.ts b/packages/taquito-ledger-signer/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-ledger-signer/src/version.ts
+++ b/packages/taquito-ledger-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-local-forging/package.json b/packages/taquito-local-forging/package.json
index 9517bf00d4..9c28876742 100644
--- a/packages/taquito-local-forging/package.json
+++ b/packages/taquito-local-forging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/local-forging",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Provide local forging functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -67,12 +67,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
-    "@taquito/rpc": "^19.2.1",
+    "@taquito/rpc": "^19.2.0",
     "@types/bluebird": "^3.5.40",
     "@types/estree": "^1.0.2",
     "@types/jest": "^29.5.5",
diff --git a/packages/taquito-local-forging/src/version.ts b/packages/taquito-local-forging/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-local-forging/src/version.ts
+++ b/packages/taquito-local-forging/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-michel-codec/pack-test-tool/package.json b/packages/taquito-michel-codec/pack-test-tool/package.json
index c9ebc97f9e..906642aef2 100644
--- a/packages/taquito-michel-codec/pack-test-tool/package.json
+++ b/packages/taquito-michel-codec/pack-test-tool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pack-test-tool",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Generate pack test data via Tezos RPC",
   "main": "pack-test-tool.js",
   "private": true,
@@ -8,7 +8,7 @@
   "author": "Eugene Zagidullin <eugene@ecadlabs.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@taquito/rpc": "^19.2.1",
+    "@taquito/rpc": "^19.2.0",
     "yargs": "^17.7.2"
   }
 }
diff --git a/packages/taquito-michel-codec/package.json b/packages/taquito-michel-codec/package.json
index 367d4c5ec1..e48a5cb7ab 100644
--- a/packages/taquito-michel-codec/package.json
+++ b/packages/taquito-michel-codec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michel-codec",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Michelson parser/validator/formatter",
   "keywords": [
     "tezos",
@@ -66,7 +66,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1"
+    "@taquito/core": "^19.1.0"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-michel-codec/src/version.ts b/packages/taquito-michel-codec/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-michel-codec/src/version.ts
+++ b/packages/taquito-michel-codec/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-michelson-encoder/package.json b/packages/taquito-michelson-encoder/package.json
index eda1273735..719ec9aa56 100644
--- a/packages/taquito-michelson-encoder/package.json
+++ b/packages/taquito-michelson-encoder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michelson-encoder",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2",
     "fast-json-stable-stringify": "^2.1.0"
   },
diff --git a/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts b/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
index eca1e3d16f..92fead1cfb 100644
--- a/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
+++ b/packages/taquito-michelson-encoder/src/taquito-michelson-encoder.ts
@@ -16,4 +16,4 @@ export const UnitValue = Symbol();
 export const SaplingStateValue = {};
 export * from './michelson-map';
 export { VERSION } from './version';
-export { Token } from './tokens/token';
+export { FieldNumberingStrategy, Token } from './tokens/token';
diff --git a/packages/taquito-michelson-encoder/src/tokens/createToken.ts b/packages/taquito-michelson-encoder/src/tokens/createToken.ts
index 1f269d2e6a..c0a30bd303 100644
--- a/packages/taquito-michelson-encoder/src/tokens/createToken.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/createToken.ts
@@ -9,7 +9,10 @@ import { TaquitoError } from '@taquito/core';
  */
 export class InvalidTokenError extends TaquitoError {
   name = 'Invalid token error';
-  constructor(public message: string, public data: any) {
+  constructor(
+    public message: string,
+    public data: any
+  ) {
     super(message);
   }
 }
@@ -19,9 +22,13 @@ export class InvalidTokenError extends TaquitoError {
  * @description Create a token from a value
  * @throws {@link InvalidTokenError} If the value passed is not supported by the Michelson Encoder
  */
-export function createToken(val: any, idx: number): Token {
+export function createToken(
+  val: any,
+  idx: number,
+  parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
+): Token {
   if (Array.isArray(val)) {
-    return new PairToken(val, idx, createToken);
+    return new PairToken(val, idx, createToken, parentTokenType);
   }
 
   const t = tokens.find((x) => x.prim === val.prim);
@@ -31,5 +38,5 @@ export function createToken(val: any, idx: number): Token {
       val
     );
   }
-  return new t(val, idx, createToken);
+  return new t(val, idx, createToken, parentTokenType);
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/or.ts b/packages/taquito-michelson-encoder/src/tokens/or.ts
index 1d3b25ac86..8b748e5b8c 100644
--- a/packages/taquito-michelson-encoder/src/tokens/or.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/or.ts
@@ -14,7 +14,11 @@ import {
  */
 export class OrValidationError extends TokenValidationError {
   name = 'OrValidationError';
-  constructor(public value: any, public token: OrToken, message: string) {
+  constructor(
+    public value: any,
+    public token: OrToken,
+    message: string
+  ) {
     super(value, token, message);
   }
 }
@@ -25,21 +29,26 @@ export class OrToken extends ComparableToken {
   constructor(
     protected val: { prim: string; args: any[]; annots: any[] },
     protected idx: number,
-    protected fac: TokenFactory
+    protected fac: TokenFactory,
+    protected parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
   ) {
-    super(val, idx, fac);
+    super(val, idx, fac, parentTokenType);
   }
 
   public Encode(args: any[]): any {
     const label = args[args.length - 1];
 
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
 
     if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
       args.pop();
@@ -66,13 +75,17 @@ export class OrToken extends ComparableToken {
   }
 
   public ExtractSignature(): any {
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
 
     const newSig = [];
 
@@ -102,13 +115,17 @@ export class OrToken extends ComparableToken {
     this.validateJavascriptObject(args);
     const label = Object.keys(args)[0];
 
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
 
     if (String(leftToken.annot()) === String(label) && !(leftToken instanceof OrToken)) {
       return { prim: 'Left', args: [leftToken.EncodeObject(args[label], semantic)] };
@@ -154,12 +171,16 @@ export class OrToken extends ComparableToken {
    * @throws {@link OrValidationError}
    */
   public Execute(val: any, semantics?: Semantic): any {
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
 
     if (val.prim === 'Right') {
       if (rightToken instanceof OrToken) {
@@ -190,7 +211,7 @@ export class OrToken extends ComparableToken {
     getRightValue: (token: Token) => any,
     concat: (left: any, right: any) => any
   ) {
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     let leftValue;
     if (leftToken instanceof OrToken) {
@@ -200,7 +221,11 @@ export class OrToken extends ComparableToken {
       leftValue = { [leftToken.annot()]: getLeftValue(leftToken) };
     }
 
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
     let rightValue;
     if (rightToken instanceof OrToken) {
       rightValue = getRightValue(rightToken);
@@ -255,13 +280,17 @@ export class OrToken extends ComparableToken {
   }
 
   private findToken(label: any): Token | null {
-    const leftToken = this.createToken(this.val.args[0], this.idx);
+    const leftToken = this.createToken(this.val.args[0], this.getIdxForChildren(), 'Or');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(this.val.args[1], this.idx + keyCount);
+    const rightToken = this.createToken(
+      this.val.args[1],
+      this.getIdxForChildren() + keyCount,
+      'Or'
+    );
 
     if (
       String(leftToken.annot()) === String(label) &&
@@ -334,4 +363,11 @@ export class OrToken extends ComparableToken {
     );
     return tokens;
   }
+
+  protected getIdxForChildren(): number {
+    if (Token.fieldNumberingStrategy === 'Legacy') {
+      return this.idx;
+    }
+    return this.parentTokenType === 'Or' ? this.idx : 0;
+  }
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/pair.ts b/packages/taquito-michelson-encoder/src/tokens/pair.ts
index 47f76093cb..7d73aaa166 100644
--- a/packages/taquito-michelson-encoder/src/tokens/pair.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/pair.ts
@@ -65,7 +65,12 @@ function collapse(val: Token['val'] | any[], prim: string = PairToken.prim): [an
 export class PairToken extends ComparableToken {
   static prim: 'pair' = 'pair' as const;
 
-  constructor(val: MichelsonV1Expression, idx: number, fac: TokenFactory) {
+  constructor(
+    val: MichelsonV1Expression,
+    idx: number,
+    fac: TokenFactory,
+    parentTokenType?: 'Or' | 'Pair' | 'Other' | undefined
+  ) {
     super(
       Array.isArray(val)
         ? {
@@ -73,13 +78,14 @@ export class PairToken extends ComparableToken {
             args: val,
           }
         : (val as MichelsonV1ExpressionExtended).prim
-        ? (val as MichelsonV1ExpressionExtended)
-        : ({
-            prim: PairToken.prim,
-            args: val,
-          } as MichelsonV1ExpressionExtended),
+          ? (val as MichelsonV1ExpressionExtended)
+          : ({
+              prim: PairToken.prim,
+              args: val,
+            } as MichelsonV1ExpressionExtended),
       idx,
-      fac
+      fac,
+      parentTokenType
     );
   }
 
@@ -91,7 +97,7 @@ export class PairToken extends ComparableToken {
   private tokens(): [Token, Token] {
     let cnt = 0;
     return this.args().map((a) => {
-      const tok = this.createToken(a, this.idx + cnt);
+      const tok = this.createToken(a, this.getIdxForChildren() + cnt, 'Pair');
       if (tok instanceof PairToken) {
         cnt += Object.keys(tok.ExtractSchema()).length;
       } else {
@@ -110,13 +116,13 @@ export class PairToken extends ComparableToken {
 
   public ExtractSignature(): any {
     const args = this.args();
-    const leftToken = this.createToken(args[0], this.idx);
+    const leftToken = this.createToken(args[0], this.getIdxForChildren(), 'Pair');
     let keyCount = 1;
     if (leftToken instanceof OrToken) {
       keyCount = Object.keys(leftToken.ExtractSchema()).length;
     }
 
-    const rightToken = this.createToken(args[1], this.idx + keyCount);
+    const rightToken = this.createToken(args[1], this.getIdxForChildren() + keyCount, 'Pair');
 
     const newSig = [];
 
@@ -169,7 +175,7 @@ export class PairToken extends ComparableToken {
   private traversal(getLeftValue: (token: Token) => any, getRightValue: (token: Token) => any) {
     const args = this.args();
 
-    const leftToken = this.createToken(args[0], this.idx);
+    const leftToken = this.createToken(args[0], this.getIdxForChildren(), 'Pair');
     let keyCount = 1;
     let leftValue;
     if (leftToken instanceof PairToken && !leftToken.hasAnnotations()) {
@@ -181,7 +187,7 @@ export class PairToken extends ComparableToken {
       leftValue = { [leftToken.annot()]: getLeftValue(leftToken) };
     }
 
-    const rightToken = this.createToken(args[1], this.idx + keyCount);
+    const rightToken = this.createToken(args[1], this.getIdxForChildren() + keyCount, 'Pair');
     let rightValue;
     if (rightToken instanceof PairToken && !rightToken.hasAnnotations()) {
       rightValue = getRightValue(rightToken);
@@ -275,4 +281,11 @@ export class PairToken extends ComparableToken {
     this.tokens().map((t) => t.findAndReturnTokens(tokenToFind, tokens));
     return tokens;
   }
+
+  protected getIdxForChildren(): number {
+    if (Token.fieldNumberingStrategy === 'Legacy') {
+      return this.idx;
+    }
+    return this.parentTokenType === 'Pair' ? this.idx : 0;
+  }
 }
diff --git a/packages/taquito-michelson-encoder/src/tokens/token.ts b/packages/taquito-michelson-encoder/src/tokens/token.ts
index c39dd35a38..de71d7ba58 100644
--- a/packages/taquito-michelson-encoder/src/tokens/token.ts
+++ b/packages/taquito-michelson-encoder/src/tokens/token.ts
@@ -9,7 +9,11 @@ import { TaquitoError } from '@taquito/core';
 export abstract class TokenValidationError extends TaquitoError {
   name = 'TokenValidationError';
 
-  constructor(public readonly value: any, public readonly token: Token, baseMessage: string) {
+  constructor(
+    public readonly value: any,
+    public readonly token: Token,
+    baseMessage: string
+  ) {
     super();
     const annot = this.token.annot();
     const annotText = annot ? `[${annot}] ` : '';
@@ -17,7 +21,11 @@ export abstract class TokenValidationError extends TaquitoError {
   }
 }
 
-export type TokenFactory = (val: any, idx: number) => Token;
+export type TokenFactory = (
+  val: any,
+  idx: number,
+  parentTokenType?: 'Or' | 'Pair' | 'Other'
+) => Token;
 
 export interface Semantic {
   [key: string]: (value: MichelsonV1Expression, schema: MichelsonV1Expression) => any;
@@ -27,11 +35,36 @@ export interface SemanticEncoding {
   [key: string]: (value: any, type?: MichelsonV1Expression) => MichelsonV1Expression;
 }
 
+/**
+ * @description Possible strategies for mapping between javascript classes and Michelson values
+ * Legacy: The old behaviour: { annot1: 'some value', annot2: 'other Value', annot3: { 2: 'yet another value', 3: 'also some value' }}
+ * ResetFieldNumbersInNestedObjects: { annot1: 'some value', annot2: 'other Value', annot3: { 0: 'yet another value', 1: 'also some value' }}
+ * Latest: This will include new changes as we might implement in the future. This is the suggested value if it does not break your code
+ */
+export type FieldNumberingStrategy = 'Legacy' | 'ResetFieldNumbersInNestedObjects' | 'Latest';
+
 export abstract class Token {
+  private static _fieldNumberingStrategy: FieldNumberingStrategy = 'Latest';
+
+  /**
+   * @description Gets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects, returns a value of type {@link FieldNumberingStrategy} that controls how field numbers are calculated
+   */
+  static get fieldNumberingStrategy() {
+    return Token._fieldNumberingStrategy;
+  }
+
+  /**
+   * @description Sets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects, accepts a value of type {@link FieldNumberingStrategy} that controls how field numbers are calculated
+   */
+  static set fieldNumberingStrategy(value: FieldNumberingStrategy) {
+    Token._fieldNumberingStrategy = value;
+  }
+
   constructor(
     protected val: MichelsonV1ExpressionExtended,
     protected idx: number,
-    protected fac: TokenFactory
+    protected fac: TokenFactory,
+    protected parentTokenType?: 'Or' | 'Pair' | 'Other'
   ) {}
 
   protected typeWithoutAnnotations() {
diff --git a/packages/taquito-michelson-encoder/src/version.ts b/packages/taquito-michelson-encoder/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-michelson-encoder/src/version.ts
+++ b/packages/taquito-michelson-encoder/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-michelson-encoder/test/sample1.spec.ts b/packages/taquito-michelson-encoder/test/sample1.spec.ts
index 2ab346d56c..415fa11f03 100644
--- a/packages/taquito-michelson-encoder/test/sample1.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample1.spec.ts
@@ -4,6 +4,7 @@ import { ParameterSchema } from '../src/schema/parameter';
 import { Schema } from '../src/schema/storage';
 import { MichelsonMap } from '../src/michelson-map';
 import { expectMichelsonMap } from './utils';
+import { Token } from '../src/taquito-michelson-encoder';
 
 describe('Schema test', () => {
   it('Should extract schema properly', () => {
@@ -12,7 +13,7 @@ describe('Schema test', () => {
     expect(s).toEqual({
       accounts: {
         big_map: {
-          key: "address",
+          key: 'address',
           value: {
             allowances: {
               map: {
@@ -32,60 +33,60 @@ describe('Schema test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: "pair",
+      __michelsonType: 'pair',
       schema: {
         accounts: {
-          __michelsonType: "big_map",
+          __michelsonType: 'big_map',
           schema: {
             key: {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             value: {
-              __michelsonType: "pair",
+              __michelsonType: 'pair',
               schema: {
                 allowances: {
-                  __michelsonType: "map",
+                  __michelsonType: 'map',
                   schema: {
                     key: {
-                      __michelsonType: "address",
-                      schema: "address"
+                      __michelsonType: 'address',
+                      schema: 'address',
                     },
                     value: {
-                      __michelsonType: "nat",
-                      schema: "nat"
+                      __michelsonType: 'nat',
+                      schema: 'nat',
                     },
                   },
                 },
                 balance: {
-                  __michelsonType: "nat",
-                  schema: "nat"
-                }
-              }
+                  __michelsonType: 'nat',
+                  schema: 'nat',
+                },
+              },
             },
           },
         },
         name: {
-          __michelsonType: "string",
-          schema: "string"
+          __michelsonType: 'string',
+          schema: 'string',
         },
         owner: {
-          __michelsonType: "address",
-          schema: "address"
+          __michelsonType: 'address',
+          schema: 'address',
         },
         symbol: {
-          __michelsonType: "string",
-          schema: "string"
+          __michelsonType: 'string',
+          schema: 'string',
         },
         totalSupply: {
-          __michelsonType: "nat",
-          schema: "nat"
+          __michelsonType: 'nat',
+          schema: 'nat',
         },
         version: {
-          __michelsonType: "nat",
-          schema: "nat"
+          __michelsonType: 'nat',
+          schema: 'nat',
         },
-      }
+      },
     });
   });
 
@@ -202,8 +203,7 @@ describe('Schema test', () => {
 
   it('Should build parameter schema properly', () => {
     const schema = new ParameterSchema(params);
-    const s = schema.ExtractSchema();
-    expect(s).toEqual({
+    const extractSchema_Legacy = {
       allowance: {
         '4': 'address',
         '5': 'address',
@@ -223,8 +223,8 @@ describe('Schema test', () => {
       },
       createAccounts: {
         list: {
-          "6": "address",
-          "7": "nat",
+          '6': 'address',
+          '7': 'nat',
         },
       },
       transfer: {
@@ -236,134 +236,305 @@ describe('Schema test', () => {
         '3': 'address',
         '4': 'nat',
       },
-    });
+    };
+    const extractSchema_ResetFields = {
+      allowance: {
+        '0': 'address',
+        '1': 'address',
+        NatNatContract: 'contract',
+      },
+      approve: {
+        '0': 'address',
+        '1': 'nat',
+      },
+      balanceOf: {
+        '0': 'address',
+        NatContract: 'contract',
+      },
+      createAccount: {
+        '0': 'address',
+        '1': 'nat',
+      },
+      createAccounts: {
+        list: {
+          '0': 'address',
+          '1': 'nat',
+        },
+      },
+      transfer: {
+        '0': 'address',
+        '1': 'nat',
+      },
+      transferFrom: {
+        '0': 'address',
+        '1': 'address',
+        '2': 'nat',
+      },
+    };
 
-    expect(schema.generateSchema()).toEqual({
-      __michelsonType: "or",
+    const generateSchema_Legacy = {
+      __michelsonType: 'or',
       schema: {
         allowance: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '4': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '5': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             NatNatContract: {
-              __michelsonType: "contract",
+              __michelsonType: 'contract',
               schema: {
                 parameter: {
-                  __michelsonType: "pair",
+                  __michelsonType: 'pair',
                   schema: {
                     '0': {
-                      __michelsonType: "nat",
-                      schema: "nat"
+                      __michelsonType: 'nat',
+                      schema: 'nat',
                     },
                     '1': {
-                      __michelsonType: "nat",
-                      schema: "nat"
-                    }
-                  }
-                }
-              }
-            }
-          }
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                  },
+                },
+              },
+            },
+          },
         },
         approve: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '1': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '2': {
-              __michelsonType: "nat",
-              schema: "nat"
-            }
-          }
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
         },
         balanceOf: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '3': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             NatContract: {
-              __michelsonType: "contract",
+              __michelsonType: 'contract',
               schema: {
                 parameter: {
-                  __michelsonType: "nat",
-                  schema: "nat"
-                }
-              }
+                  __michelsonType: 'nat',
+                  schema: 'nat',
+                },
+              },
             },
-          }
+          },
         },
         createAccount: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '5': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '6': {
-              __michelsonType: "nat",
-              schema: "nat"
+              __michelsonType: 'nat',
+              schema: 'nat',
             },
-          }
+          },
         },
         createAccounts: {
-          __michelsonType: "list",
+          __michelsonType: 'list',
           schema: {
-            __michelsonType: "pair",
+            __michelsonType: 'pair',
             schema: {
-              "6": {
-                __michelsonType: "address",
-                schema: "address"
+              '6': {
+                __michelsonType: 'address',
+                schema: 'address',
               },
-              "7": {
-                __michelsonType: "nat",
-                schema: "nat"
+              '7': {
+                __michelsonType: 'nat',
+                schema: 'nat',
               },
-            }
+            },
           },
         },
         transfer: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '0': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '1': {
-              __michelsonType: "nat",
-              schema: "nat"
+              __michelsonType: 'nat',
+              schema: 'nat',
             },
-          }
+          },
         },
         transferFrom: {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '2': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '3': {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             '4': {
-              __michelsonType: "nat",
-              schema: "nat"
+              __michelsonType: 'nat',
+              schema: 'nat',
             },
-          }
+          },
         },
-      }
-    });
+      },
+    };
+
+    const generateSchema_ResetFields = {
+      __michelsonType: 'or',
+      schema: {
+        allowance: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            NatNatContract: {
+              __michelsonType: 'contract',
+              schema: {
+                parameter: {
+                  __michelsonType: 'pair',
+                  schema: {
+                    '0': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '1': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+        approve: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
+        },
+        balanceOf: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            NatContract: {
+              __michelsonType: 'contract',
+              schema: {
+                parameter: {
+                  __michelsonType: 'nat',
+                  schema: 'nat',
+                },
+              },
+            },
+          },
+        },
+        createAccount: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
+        },
+        createAccounts: {
+          __michelsonType: 'list',
+          schema: {
+            __michelsonType: 'pair',
+            schema: {
+              '0': {
+                __michelsonType: 'address',
+                schema: 'address',
+              },
+              '1': {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+            },
+          },
+        },
+        transfer: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
+        },
+        transferFrom: {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '2': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
+        },
+      },
+    };
+
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
+    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
   });
 
   it('Should extract signature properly', () => {
@@ -373,12 +544,29 @@ describe('Schema test', () => {
     expect(sig).toContainEqual(['approve', 'address', 'nat']);
     expect(sig).toContainEqual(['balanceOf', 'address', 'contract']);
     expect(sig).toContainEqual(['createAccount', 'address', 'nat']);
-    expect(sig).toContainEqual(["createAccounts", {
+    const createAccount_Legacy = {
+      list: {
+        '6': 'address',
+        '7': 'nat',
+      },
+    };
+    const createAccount_ResetFields = {
       list: {
-        "6": "address",
-        "7": "nat"
-      }
-    }
+        '0': 'address',
+        '1': 'nat',
+      },
+    };
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.ExtractSignatures()).toContainEqual(['createAccounts', createAccount_Legacy]);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.ExtractSignatures()).toContainEqual([
+      'createAccounts',
+      createAccount_ResetFields,
+    ]);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.ExtractSignatures()).toContainEqual([
+      'createAccounts',
+      createAccount_ResetFields,
     ]);
     expect(sig).toContainEqual(['transfer', 'address', 'nat']);
     expect(sig).toContainEqual(['transferFrom', 'address', 'address', 'nat']);
@@ -386,20 +574,33 @@ describe('Schema test', () => {
 
   it('Should parse parameter properly', () => {
     const schema = new ParameterSchema(params);
-    const s = schema.Execute(txParams);
-    expect(s).toEqual({
+    const execute_Legacy = {
       approve: {
         '1': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
         '2': new BigNumber('60'),
       },
-    });
+    };
+    const execute_ResetFields = {
+      approve: {
+        '0': 'tz1fPjyo55HwUAkd1xcL5vo6DGzJrkxAMpiD',
+        '1': new BigNumber('60'),
+      },
+    };
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.Execute(txParams)).toEqual(execute_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.Execute(txParams)).toEqual(execute_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.Execute(txParams)).toEqual(execute_ResetFields);
   });
 
   it(`Should find the value that corresponds to the type ({ prim: 'string', annots: ['%name'] }) in top-level pairs of the storage`, () => {
     const typeOfValueToFind = { prim: 'string', annots: ['%name'] };
     const storageSchema = new Schema(storage);
-    const valueFound = storageSchema.FindFirstInTopLevelPair(rpcContractResponse.script.storage, typeOfValueToFind);
+    const valueFound = storageSchema.FindFirstInTopLevelPair(
+      rpcContractResponse.script.storage,
+      typeOfValueToFind
+    );
     expect(valueFound).toEqual({ string: 'Token B' });
   });
-
 });
diff --git a/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts b/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
index 11ef24ee48..f0f90c0c49 100644
--- a/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample11_dexter.spec.ts
@@ -9,15 +9,16 @@ import BigNumber from 'bignumber.js';
 import { ParameterSchema } from '../src/schema/parameter';
 import { MichelsonMap } from '../src/michelson-map';
 import { expectMichelsonMap } from './utils';
+import { Token } from '../src/taquito-michelson-encoder';
 describe('Exchange contract test', () => {
   it('Test storage schema', () => {
     const schema = new Schema(storageDexter);
-    expect(schema.ExtractSchema()).toEqual({
+    const extractSchema_Legacy = {
       '0': {
         big_map: {
-          key: "address",
-          value: "nat"
-        }
+          key: 'address',
+          value: 'nat',
+        },
       },
       '1': 'contract',
       '2': 'contract',
@@ -49,23 +50,68 @@ describe('Exchange contract test', () => {
           },
         },
       },
-    });
+    };
+    const extractSchema_ResetFields = {
+      '0': {
+        big_map: {
+          key: 'address',
+          value: 'nat',
+        },
+      },
+      '1': 'contract',
+      '2': 'contract',
+      '3': 'nat',
+      '4': {
+        map: {
+          key: 'address',
+          value: {
+            '0': {
+              '0': 'nat',
+              '1': 'nat',
+              '2': 'timestamp',
+            },
+            '1': {
+              '0': 'nat',
+              '1': 'mutez',
+              '2': 'nat',
+              '3': 'timestamp',
+            },
+            '2': {
+              '0': 'nat',
+              '1': 'timestamp',
+            },
+            '3': {
+              '0': 'nat',
+              '1': 'mutez',
+              '2': 'timestamp',
+            },
+          },
+        },
+      },
+    };
 
-    expect(schema.generateSchema()).toEqual({
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+
+    const generateSchema_Legacy = {
       __michelsonType: 'pair',
       schema: {
         '0': {
-          __michelsonType: "big_map",
+          __michelsonType: 'big_map',
           schema: {
             key: {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             value: {
-              __michelsonType: "nat",
-              schema: "nat"
-            }
-          }
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
         },
         '1': {
           __michelsonType: 'contract',
@@ -78,7 +124,7 @@ describe('Exchange contract test', () => {
                   schema: {
                     0: {
                       __michelsonType: 'address',
-                      schema: 'address'
+                      schema: 'address',
                     },
                     1: {
                       __michelsonType: 'contract',
@@ -91,155 +137,351 @@ describe('Exchange contract test', () => {
                               schema: {
                                 0: {
                                   __michelsonType: 'address',
-                                  schema: 'address'
+                                  schema: 'address',
                                 },
                                 1: {
                                   __michelsonType: 'address',
-                                  schema: 'address'
+                                  schema: 'address',
                                 },
                                 2: {
                                   __michelsonType: 'nat',
-                                  schema: 'nat'
+                                  schema: 'nat',
                                 },
-                              }
+                              },
                             },
                             1: {
                               __michelsonType: 'address',
-                              schema: 'address'
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
+                              schema: 'address',
+                            },
+                          },
+                        },
+                      },
+                    },
+                  },
                 },
                 1: {
                   __michelsonType: 'nat',
-                  schema: 'nat'
-                }
-              }
-            }
-          }
+                  schema: 'nat',
+                },
+              },
+            },
+          },
         },
         '2': {
           __michelsonType: 'contract',
           schema: {
             parameter: {
-              __michelsonType: "or",
+              __michelsonType: 'or',
               schema: {
                 0: {
-                  __michelsonType: "pair",
+                  __michelsonType: 'pair',
                   schema: {
                     0: {
                       __michelsonType: 'address',
-                      schema: 'address'
+                      schema: 'address',
                     },
                     1: {
                       __michelsonType: 'address',
-                      schema: 'address'
+                      schema: 'address',
                     },
                     2: {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
-                  }
+                  },
                 },
                 1: {
                   __michelsonType: 'address',
-                  schema: 'address'
-                }
-              }
-            }
-          }
+                  schema: 'address',
+                },
+              },
+            },
+          },
         },
         '3': {
           __michelsonType: 'nat',
-          schema: 'nat'
+          schema: 'nat',
         },
         '4': {
-          __michelsonType: "map",
+          __michelsonType: 'map',
           schema: {
             key: {
               __michelsonType: 'address',
-              schema: 'address'
+              schema: 'address',
             },
             value: {
-              __michelsonType: "or",
+              __michelsonType: 'or',
               schema: {
                 '0': {
-                  __michelsonType: "pair",
+                  __michelsonType: 'pair',
                   schema: {
                     '0': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '1': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '2': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp'
+                      schema: 'timestamp',
                     },
-                  }
+                  },
                 },
                 '1': {
                   __michelsonType: 'pair',
                   schema: {
                     '1': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '2': {
                       __michelsonType: 'mutez',
-                      schema: 'mutez'
+                      schema: 'mutez',
                     },
                     '3': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '4': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp'
+                      schema: 'timestamp',
                     },
-                  }
+                  },
                 },
                 '2': {
                   __michelsonType: 'pair',
                   schema: {
                     '2': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '3': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp'
+                      schema: 'timestamp',
                     },
-                  }
+                  },
                 },
                 '3': {
                   __michelsonType: 'pair',
                   schema: {
                     '3': {
                       __michelsonType: 'nat',
-                      schema: 'nat'
+                      schema: 'nat',
                     },
                     '4': {
                       __michelsonType: 'mutez',
-                      schema: 'mutez'
+                      schema: 'mutez',
                     },
                     '5': {
                       __michelsonType: 'timestamp',
-                      schema: 'timestamp'
+                      schema: 'timestamp',
                     },
-                  }
+                  },
                 },
-              }
+              },
             },
           },
         },
-      }
-    });
+      },
+    };
+    const generateSchema_ResetFields = {
+      __michelsonType: 'pair',
+      schema: {
+        '0': {
+          __michelsonType: 'big_map',
+          schema: {
+            key: {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            value: {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+          },
+        },
+        '1': {
+          __michelsonType: 'contract',
+          schema: {
+            parameter: {
+              __michelsonType: 'or',
+              schema: {
+                0: {
+                  __michelsonType: 'pair',
+                  schema: {
+                    0: {
+                      __michelsonType: 'address',
+                      schema: 'address',
+                    },
+                    1: {
+                      __michelsonType: 'contract',
+                      schema: {
+                        parameter: {
+                          __michelsonType: 'or',
+                          schema: {
+                            0: {
+                              __michelsonType: 'pair',
+                              schema: {
+                                0: {
+                                  __michelsonType: 'address',
+                                  schema: 'address',
+                                },
+                                1: {
+                                  __michelsonType: 'address',
+                                  schema: 'address',
+                                },
+                                2: {
+                                  __michelsonType: 'nat',
+                                  schema: 'nat',
+                                },
+                              },
+                            },
+                            1: {
+                              __michelsonType: 'address',
+                              schema: 'address',
+                            },
+                          },
+                        },
+                      },
+                    },
+                  },
+                },
+                1: {
+                  __michelsonType: 'nat',
+                  schema: 'nat',
+                },
+              },
+            },
+          },
+        },
+        '2': {
+          __michelsonType: 'contract',
+          schema: {
+            parameter: {
+              __michelsonType: 'or',
+              schema: {
+                0: {
+                  __michelsonType: 'pair',
+                  schema: {
+                    0: {
+                      __michelsonType: 'address',
+                      schema: 'address',
+                    },
+                    1: {
+                      __michelsonType: 'address',
+                      schema: 'address',
+                    },
+                    2: {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                  },
+                },
+                1: {
+                  __michelsonType: 'address',
+                  schema: 'address',
+                },
+              },
+            },
+          },
+        },
+        '3': {
+          __michelsonType: 'nat',
+          schema: 'nat',
+        },
+        '4': {
+          __michelsonType: 'map',
+          schema: {
+            key: {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            value: {
+              __michelsonType: 'or',
+              schema: {
+                '0': {
+                  __michelsonType: 'pair',
+                  schema: {
+                    '0': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '1': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '2': {
+                      __michelsonType: 'timestamp',
+                      schema: 'timestamp',
+                    },
+                  },
+                },
+                '1': {
+                  __michelsonType: 'pair',
+                  schema: {
+                    '0': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '1': {
+                      __michelsonType: 'mutez',
+                      schema: 'mutez',
+                    },
+                    '2': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '3': {
+                      __michelsonType: 'timestamp',
+                      schema: 'timestamp',
+                    },
+                  },
+                },
+                '2': {
+                  __michelsonType: 'pair',
+                  schema: {
+                    '0': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '1': {
+                      __michelsonType: 'timestamp',
+                      schema: 'timestamp',
+                    },
+                  },
+                },
+                '3': {
+                  __michelsonType: 'pair',
+                  schema: {
+                    '0': {
+                      __michelsonType: 'nat',
+                      schema: 'nat',
+                    },
+                    '1': {
+                      __michelsonType: 'mutez',
+                      schema: 'mutez',
+                    },
+                    '2': {
+                      __michelsonType: 'timestamp',
+                      schema: 'timestamp',
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
   });
 
   it('Test storage parsing', () => {
@@ -271,7 +513,7 @@ describe('Exchange contract test', () => {
 
   it('Test parameter schema', () => {
     const schema = new ParameterSchema(params);
-    expect(schema.ExtractSchema()).toEqual({
+    const extractSchema_Legacy = {
       '0': {
         '0': 'nat',
         '1': 'nat',
@@ -293,85 +535,199 @@ describe('Exchange contract test', () => {
         '5': 'timestamp',
       },
       '4': 'nat',
-    });
+    };
+    const extractSchema_ResetFields = {
+      '0': {
+        '0': 'nat',
+        '1': 'nat',
+        '2': 'timestamp',
+      },
+      '1': {
+        '0': 'nat',
+        '1': 'mutez',
+        '2': 'nat',
+        '3': 'timestamp',
+      },
+      '2': {
+        '0': 'nat',
+        '1': 'timestamp',
+      },
+      '3': {
+        '0': 'nat',
+        '1': 'mutez',
+        '2': 'timestamp',
+      },
+      '4': 'nat',
+    };
 
-    expect(schema.generateSchema()).toEqual({
-      __michelsonType: "or",
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+
+    const generateSchema_Legacy = {
+      __michelsonType: 'or',
       schema: {
         '0': {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '0': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '1': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '2': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp'
+              schema: 'timestamp',
             },
-          }
+          },
         },
         '1': {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '1': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '2': {
               __michelsonType: 'mutez',
-              schema: 'mutez'
+              schema: 'mutez',
             },
             '3': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '4': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp'
+              schema: 'timestamp',
             },
-          }
+          },
         },
         '2': {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '2': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '3': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp'
+              schema: 'timestamp',
             },
-          }
+          },
         },
         '3': {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '3': {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             '4': {
               __michelsonType: 'mutez',
-              schema: 'mutez'
+              schema: 'mutez',
             },
             '5': {
               __michelsonType: 'timestamp',
-              schema: 'timestamp'
+              schema: 'timestamp',
             },
-          }
+          },
         },
         '4': {
           __michelsonType: 'nat',
-          schema: 'nat'
+          schema: 'nat',
         },
-      }
-    });
+      },
+    };
+    const generateSchema_ResetFields = {
+      __michelsonType: 'or',
+      schema: {
+        '0': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '1': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '2': {
+              __michelsonType: 'timestamp',
+              schema: 'timestamp',
+            },
+          },
+        },
+        '1': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '1': {
+              __michelsonType: 'mutez',
+              schema: 'mutez',
+            },
+            '2': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '3': {
+              __michelsonType: 'timestamp',
+              schema: 'timestamp',
+            },
+          },
+        },
+        '2': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '1': {
+              __michelsonType: 'timestamp',
+              schema: 'timestamp',
+            },
+          },
+        },
+        '3': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'nat',
+              schema: 'nat',
+            },
+            '1': {
+              __michelsonType: 'mutez',
+              schema: 'mutez',
+            },
+            '2': {
+              __michelsonType: 'timestamp',
+              schema: 'timestamp',
+            },
+          },
+        },
+        '4': {
+          __michelsonType: 'nat',
+          schema: 'nat',
+        },
+      },
+    };
+
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
   });
 
   it('Encode parameter properly func 0', () => {
@@ -525,7 +881,7 @@ describe('Exchange contract test', () => {
     expect(schema.ExtractSchema()).toEqual({
       '0': {
         big_map: {
-          key: "address",
+          key: 'address',
           value: {
             '0': 'nat',
             '1': {
@@ -543,52 +899,52 @@ describe('Exchange contract test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: "pair",
+      __michelsonType: 'pair',
       schema: {
         '0': {
-          __michelsonType: "big_map",
+          __michelsonType: 'big_map',
           schema: {
             key: {
-              __michelsonType: "address",
-              schema: "address"
+              __michelsonType: 'address',
+              schema: 'address',
             },
             value: {
               __michelsonType: 'pair',
               schema: {
                 '0': {
-                  __michelsonType: "nat",
-                  schema: "nat"
+                  __michelsonType: 'nat',
+                  schema: 'nat',
                 },
                 '1': {
                   __michelsonType: 'map',
                   schema: {
                     key: {
-                      __michelsonType: "address",
-                      schema: "address"
+                      __michelsonType: 'address',
+                      schema: 'address',
                     },
                     value: {
-                      __michelsonType: "nat",
-                      schema: "nat"
+                      __michelsonType: 'nat',
+                      schema: 'nat',
                     },
                   },
                 },
-              }
+              },
             },
           },
         },
         '1': {
-          __michelsonType: "nat",
-          schema: "nat"
+          __michelsonType: 'nat',
+          schema: 'nat',
         },
         '2': {
-          __michelsonType: "string",
-          schema: "string"
+          __michelsonType: 'string',
+          schema: 'string',
         },
         '3': {
-          __michelsonType: "string",
-          schema: "string"
+          __michelsonType: 'string',
+          schema: 'string',
         },
-      }
+      },
     });
   });
 
@@ -614,30 +970,30 @@ describe('Exchange contract test', () => {
     });
 
     expect(schema.generateSchema()).toEqual({
-      __michelsonType: "or",
+      __michelsonType: 'or',
       schema: {
         '0': {
-          __michelsonType: "pair",
+          __michelsonType: 'pair',
           schema: {
             '0': {
               __michelsonType: 'address',
-              schema: "address"
+              schema: 'address',
             },
             '1': {
               __michelsonType: 'address',
-              schema: "address"
+              schema: 'address',
             },
             '2': {
               __michelsonType: 'nat',
-              schema: "nat"
+              schema: 'nat',
             },
-          }
+          },
         },
         '1': {
           __michelsonType: 'address',
-          schema: "address"
+          schema: 'address',
         },
-      }
+      },
     });
 
     expect(schema.ExtractSignatures()).toContainEqual(['1', 'address']);
diff --git a/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts b/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
index b7fc84630a..8b025b4d7c 100644
--- a/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
+++ b/packages/taquito-michelson-encoder/test/sample9_lambda.spec.ts
@@ -2,17 +2,17 @@
 
 import { params as params9 } from '../data/sample9';
 import { ParameterSchema } from '../src/schema/parameter';
+import { Token } from '../src/taquito-michelson-encoder';
 
 describe('Schema test', () => {
   it('Should parse storage properly', () => {
     const schema = new ParameterSchema(params9);
-    const storage = schema.ExtractSchema();
 
     expect(schema.ExtractSignatures()).toContainEqual(['0', 'address', 'string', 'bytes']);
     expect(schema.ExtractSignatures()).toContainEqual(['1', 'mutez']);
     expect(schema.ExtractSignatures()).toContainEqual(['2', 'address', 'bool']);
 
-    expect(storage).toEqual({
+    const extractSchema_Legacy = {
       '0': {
         '0': 'address',
         '1': 'string',
@@ -33,9 +33,38 @@ describe('Schema test', () => {
           returns: 'operation',
         },
       },
-    });
+    };
+    const extractSchema_ResetFields = {
+      '0': {
+        '0': 'address',
+        '1': 'string',
+        '2': { Some: 'bytes' },
+      },
+      '1': 'mutez',
+      '2': {
+        '0': 'address',
+        '1': 'bool',
+      },
+      '3': {
+        lambda: {
+          parameters: {
+            0: 'address',
+            1: 'string',
+            2: { Some: 'bytes' },
+          },
+          returns: 'operation',
+        },
+      },
+    };
 
-    expect(schema.generateSchema()).toEqual({
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.ExtractSchema()).toEqual(extractSchema_ResetFields);
+
+    const generateSchema_Legacy = {
       __michelsonType: 'or',
       schema: {
         '0': {
@@ -105,7 +134,85 @@ describe('Schema test', () => {
           },
         },
       },
-    });
+    };
+    const generateSchema_ResetFields = {
+      __michelsonType: 'or',
+      schema: {
+        '0': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'string',
+              schema: 'string',
+            },
+            '2': {
+              __michelsonType: 'option',
+              schema: {
+                __michelsonType: 'bytes',
+                schema: 'bytes',
+              },
+            },
+          },
+        },
+        '1': {
+          __michelsonType: 'mutez',
+          schema: 'mutez',
+        },
+        '2': {
+          __michelsonType: 'pair',
+          schema: {
+            '0': {
+              __michelsonType: 'address',
+              schema: 'address',
+            },
+            '1': {
+              __michelsonType: 'bool',
+              schema: 'bool',
+            },
+          },
+        },
+        '3': {
+          __michelsonType: 'lambda',
+          schema: {
+            parameters: {
+              __michelsonType: 'pair',
+              schema: {
+                0: {
+                  __michelsonType: 'address',
+                  schema: 'address',
+                },
+                1: {
+                  __michelsonType: 'string',
+                  schema: 'string',
+                },
+                2: {
+                  __michelsonType: 'option',
+                  schema: {
+                    __michelsonType: 'bytes',
+                    schema: 'bytes',
+                  },
+                },
+              },
+            },
+            returns: {
+              __michelsonType: 'operation',
+              schema: 'operation',
+            },
+          },
+        },
+      },
+    };
+
+    Token.fieldNumberingStrategy = 'Legacy';
+    expect(schema.generateSchema()).toEqual(generateSchema_Legacy);
+    Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
+    Token.fieldNumberingStrategy = 'Latest';
+    expect(schema.generateSchema()).toEqual(generateSchema_ResetFields);
 
     expect({
       args: [
diff --git a/packages/taquito-michelson-encoder/test/tokens/map.spec.ts b/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
index 8e85cc432d..eaeecf6169 100644
--- a/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
+++ b/packages/taquito-michelson-encoder/test/tokens/map.spec.ts
@@ -192,7 +192,7 @@ describe('Map token', () => {
       map.set({ myBytes: 'cccc' }, 15); //LLR
       map.set({ myAddress: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu' }, 5); //LLL
       map.set({ myNat: 48 }, 16); //LRR
-      map.set({ myPair: { 4: 12, 5: 6 } }, 3); //RLL
+      map.set({ myPair: { 0: 12, 1: 6 } }, 3); //RLL
       map.set({ myInt: 4 }, 6); //LRL
       map.set({ myString: 'test' }, 3); //RLR
       map.set({ myBytes: 'aaaa' }, 5); //LLR
@@ -351,7 +351,7 @@ describe('Map token', () => {
       map.set({ 1: 'cccc' }, 15); //LLR
       map.set({ 0: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu' }, 5); //LLL
       map.set({ 3: 48 }, 16); //LRR
-      map.set({ 4: { 4: 12, 5: 6 } }, 3); //RLL
+      map.set({ 4: { 0: 12, 1: 6 } }, 3); //RLL
       map.set({ 2: 4 }, 6); //LRL
       map.set({ 5: 'test' }, 3); //RLR
       map.set({ 1: 'aaaa' }, 5); //LLR
@@ -642,13 +642,13 @@ describe('Map token', () => {
         schema: {
           key: {
             __michelsonType: 'string',
-            schema: 'string'
+            schema: 'string',
           },
           value: {
             __michelsonType: 'int',
-            schema: 'int'
-          }
-        }
+            schema: 'int',
+          },
+        },
       });
     });
   });
@@ -760,19 +760,19 @@ describe('Map token with pair', () => {
             schema: {
               0: {
                 __michelsonType: 'string',
-                schema: 'string'
+                schema: 'string',
               },
               1: {
                 __michelsonType: 'string',
-                schema: 'string'
-              }
-            }
+                schema: 'string',
+              },
+            },
           },
           value: {
             __michelsonType: 'int',
-            schema: 'int'
-          }
-        }
+            schema: 'int',
+          },
+        },
       });
     });
   });
@@ -890,19 +890,19 @@ describe('Map token with annotated pair', () => {
           schema: {
             test: {
               __michelsonType: 'string',
-              schema: 'string'
+              schema: 'string',
             },
             test2: {
               __michelsonType: 'string',
-              schema: 'string'
-            }
-          }
+              schema: 'string',
+            },
+          },
         },
         value: {
           __michelsonType: 'int',
-          schema: 'int'
-        }
-      }
+          schema: 'int',
+        },
+      },
     });
   });
 });
@@ -1176,47 +1176,47 @@ describe('Map token with complex pair', () => {
           schema: {
             0: {
               __michelsonType: 'int',
-              schema: 'int'
+              schema: 'int',
             },
             1: {
               __michelsonType: 'nat',
-              schema: 'nat'
+              schema: 'nat',
             },
             2: {
               __michelsonType: 'string',
-              schema: 'string'
+              schema: 'string',
             },
             3: {
               __michelsonType: 'bytes',
-              schema: 'bytes'
+              schema: 'bytes',
             },
             4: {
               __michelsonType: 'mutez',
-              schema: 'mutez'
+              schema: 'mutez',
             },
             5: {
               __michelsonType: 'bool',
-              schema: 'bool'
+              schema: 'bool',
             },
             6: {
               __michelsonType: 'key_hash',
-              schema: 'key_hash'
+              schema: 'key_hash',
             },
             7: {
               __michelsonType: 'timestamp',
-              schema: 'timestamp'
+              schema: 'timestamp',
             },
             8: {
               __michelsonType: 'address',
-              schema: 'address'
+              schema: 'address',
             },
-          }
+          },
         },
         value: {
           __michelsonType: 'int',
-          schema: 'int'
-        }
-      }
+          schema: 'int',
+        },
+      },
     });
   });
 });
diff --git a/packages/taquito-michelson-encoder/test/tokens/or.spec.ts b/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
index df501340e5..ba784290d4 100644
--- a/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
+++ b/packages/taquito-michelson-encoder/test/tokens/or.spec.ts
@@ -10,6 +10,7 @@ import {
   tokenNoAnnots,
   tokenOrWithOption,
 } from '../data/or-tokens';
+import { Schema, Token } from '../../src/taquito-michelson-encoder';
 
 describe('Or token', () => {
   describe('generateSchema, EncodeObject, Execute', () => {
@@ -151,11 +152,8 @@ describe('Or token', () => {
           },
         ],
       });
-      expect(
-        tokenComplexNoAnnots.EncodeObject({
-          1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' },
-        })
-      ).toEqual({
+
+      let encode_Expected: object = {
         prim: 'Left',
         args: [
           {
@@ -174,8 +172,17 @@ describe('Or token', () => {
             ],
           },
         ],
-      });
-      expect(tokenComplexNoAnnots.EncodeObject({ 2: { 2: 3, 3: 'test' } })).toEqual({
+      };
+      let object_Legacy: object = { 1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' } };
+      let object_ResetFields: object = { 1: { 0: 3, 1: 4, 2: 31, 3: '2019-09-06T15:08:29.000Z' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+
+      encode_Expected = {
         prim: 'Right',
         args: [
           {
@@ -183,12 +190,17 @@ describe('Or token', () => {
             args: [{ prim: 'Pair', args: [{ int: '3' }, { string: 'test' }] }],
           },
         ],
-      });
-      expect(
-        tokenComplexNoAnnots.EncodeObject({
-          3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' },
-        })
-      ).toEqual({
+      };
+      object_Legacy = { 2: { 2: 3, 3: 'test' } };
+      object_ResetFields = { 2: { 0: 3, 1: 'test' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+
+      encode_Expected = {
         prim: 'Right',
         args: [
           {
@@ -212,7 +224,15 @@ describe('Or token', () => {
             ],
           },
         ],
-      });
+      };
+      object_Legacy = { 3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' } };
+      object_ResetFields = { 3: { 0: 4, 1: 3, 2: '2019-09-06T15:08:29.000Z' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplexNoAnnots.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplexNoAnnots.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
       expect(tokenComplexNoAnnots.EncodeObject({ 4: 4 })).toEqual({
         prim: 'Right',
         args: [{ prim: 'Right', args: [{ prim: 'Right', args: [{ int: '4' }] }] }],
@@ -242,11 +262,8 @@ describe('Or token', () => {
           },
         ],
       });
-      expect(
-        tokenComplex.EncodeObject({
-          option1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' },
-        })
-      ).toEqual({
+
+      encode_Expected = {
         prim: 'Left',
         args: [
           {
@@ -265,8 +282,17 @@ describe('Or token', () => {
             ],
           },
         ],
-      });
-      expect(tokenComplex.EncodeObject({ option2: { 2: 3, 3: 'test' } })).toEqual({
+      };
+      object_Legacy = { option1: { 1: 3, 2: 4, 3: 31, 4: '2019-09-06T15:08:29.000Z' } };
+      object_ResetFields = { option1: { 0: 3, 1: 4, 2: 31, 3: '2019-09-06T15:08:29.000Z' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+
+      encode_Expected = {
         prim: 'Right',
         args: [
           {
@@ -274,12 +300,17 @@ describe('Or token', () => {
             args: [{ prim: 'Pair', args: [{ int: '3' }, { string: 'test' }] }],
           },
         ],
-      });
-      expect(
-        tokenComplex.EncodeObject({
-          option3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' },
-        })
-      ).toEqual({
+      };
+      object_Legacy = { option2: { 2: 3, 3: 'test' } };
+      object_ResetFields = { option2: { 0: 3, 1: 'test' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+
+      encode_Expected = {
         prim: 'Right',
         args: [
           {
@@ -303,7 +334,16 @@ describe('Or token', () => {
             ],
           },
         ],
-      });
+      };
+      object_Legacy = { option3: { 3: 4, 4: 3, 5: '2019-09-06T15:08:29.000Z' } };
+      object_ResetFields = { option3: { 0: 4, 1: 3, 2: '2019-09-06T15:08:29.000Z' } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplex.EncodeObject(object_Legacy)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplex.EncodeObject(object_ResetFields)).toEqual(encode_Expected);
+
       expect(tokenComplex.EncodeObject({ option4: 4 })).toEqual({
         prim: 'Right',
         args: [{ prim: 'Right', args: [{ prim: 'Right', args: [{ int: '4' }] }] }],
@@ -574,15 +614,28 @@ describe('Or token', () => {
         },
       });
 
-      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual({
+      let extractSchema_Legacy: object = {
         0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
         1: { 1: 'nat', 2: 'mutez', 3: 'nat', 4: 'timestamp' },
         2: { 2: 'nat', 3: 'timestamp' },
         3: { 3: 'nat', 4: 'mutez', 5: 'timestamp' },
         4: 'nat',
-      });
+      };
+      let extractSchema_ResetFields: object = {
+        0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
+        1: { 0: 'nat', 1: 'mutez', 2: 'nat', 3: 'timestamp' },
+        2: { 0: 'nat', 1: 'timestamp' },
+        3: { 0: 'nat', 1: 'mutez', 2: 'timestamp' },
+        4: 'nat',
+      };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplexNoAnnots.ExtractSchema()).toEqual(extractSchema_ResetFields);
 
-      expect(tokenComplexNoAnnots.generateSchema()).toEqual({
+      let generateSchema_Legacy: object = {
         __michelsonType: 'or',
         schema: {
           0: {
@@ -658,17 +711,113 @@ describe('Or token', () => {
             schema: 'nat',
           },
         },
-      });
+      };
+      let generateSchema_ResetFields: object = {
+        __michelsonType: 'or',
+        schema: {
+          0: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              2: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          1: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'mutez',
+                schema: 'mutez',
+              },
+              2: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              3: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          2: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          3: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'mutez',
+                schema: 'mutez',
+              },
+              2: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          4: {
+            __michelsonType: 'nat',
+            schema: 'nat',
+          },
+        },
+      };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplexNoAnnots.generateSchema()).toEqual(generateSchema_ResetFields);
 
-      expect(tokenComplex.ExtractSchema()).toEqual({
+      extractSchema_Legacy = {
         option0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
         option1: { 1: 'nat', 2: 'mutez', 3: 'nat', 4: 'timestamp' },
         option2: { 2: 'nat', 3: 'timestamp' },
         option3: { 3: 'nat', 4: 'mutez', 5: 'timestamp' },
         option4: 'nat',
-      });
+      };
+      extractSchema_ResetFields = {
+        option0: { 0: 'nat', 1: 'nat', 2: 'timestamp' },
+        option1: { 0: 'nat', 1: 'mutez', 2: 'nat', 3: 'timestamp' },
+        option2: { 0: 'nat', 1: 'timestamp' },
+        option3: { 0: 'nat', 1: 'mutez', 2: 'timestamp' },
+        option4: 'nat',
+      };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplex.ExtractSchema()).toEqual(extractSchema_ResetFields);
 
-      expect(tokenComplex.generateSchema()).toEqual({
+      generateSchema_Legacy = {
         __michelsonType: 'or',
         schema: {
           option0: {
@@ -744,7 +893,90 @@ describe('Or token', () => {
             schema: 'nat',
           },
         },
-      });
+      };
+      generateSchema_ResetFields = {
+        __michelsonType: 'or',
+        schema: {
+          option0: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              2: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          option1: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'mutez',
+                schema: 'mutez',
+              },
+              2: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              3: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          option2: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          option3: {
+            __michelsonType: 'pair',
+            schema: {
+              0: {
+                __michelsonType: 'nat',
+                schema: 'nat',
+              },
+              1: {
+                __michelsonType: 'mutez',
+                schema: 'mutez',
+              },
+              2: {
+                __michelsonType: 'timestamp',
+                schema: 'timestamp',
+              },
+            },
+          },
+          option4: {
+            __michelsonType: 'nat',
+            schema: 'nat',
+          },
+        },
+      };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenComplex.generateSchema()).toEqual(generateSchema_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenComplex.generateSchema()).toEqual(generateSchema_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenComplex.generateSchema()).toEqual(generateSchema_ResetFields);
 
       expect(tokenOrWithOption.generateSchema()).toEqual({
         __michelsonType: 'or',
@@ -840,22 +1072,29 @@ describe('Or token', () => {
           ],
         })
       ).toEqual({ myNat: new BigNumber(6) }); // { 0: '6'  }
-      expect(
-        tokenNestedOr.Execute({
-          prim: 'Right',
-          args: [
-            {
-              prim: 'Left',
-              args: [
-                {
-                  prim: 'Left',
-                  args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
-                },
-              ],
-            },
-          ],
-        })
-      ).toEqual({ myPair: { 4: new BigNumber(3), 5: new BigNumber(4) } }); // { 4: { myPair: { 4: '3', 5: '4'} } }
+      let michelson: object = {
+        prim: 'Right',
+        args: [
+          {
+            prim: 'Left',
+            args: [
+              {
+                prim: 'Left',
+                args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
+              },
+            ],
+          },
+        ],
+      };
+      let execute_Legacy: object = { myPair: { 4: new BigNumber(3), 5: new BigNumber(4) } };
+      let execute_ResetFields: object = { myPair: { 0: new BigNumber(3), 1: new BigNumber(4) } };
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenNestedOr.Execute(michelson)).toEqual(execute_ResetFields);
+
       expect(
         tokenNestedOr.Execute({
           prim: 'Right',
@@ -923,22 +1162,31 @@ describe('Or token', () => {
           ],
         })
       ).toEqual({ 3: new BigNumber(6) }); // { 0: '6'  }
-      expect(
-        tokenNestedOrWithoutAnnot.Execute({
-          prim: 'Right',
-          args: [
-            {
-              prim: 'Left',
-              args: [
-                {
-                  prim: 'Left',
-                  args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
-                },
-              ],
-            },
-          ],
-        })
-      ).toEqual({ 4: { 4: new BigNumber(3), 5: new BigNumber(4) } }); // { 4: { myPair: { 4: '3', 5: '4'} } }
+
+      michelson = {
+        prim: 'Right',
+        args: [
+          {
+            prim: 'Left',
+            args: [
+              {
+                prim: 'Left',
+                args: [{ prim: 'Pair', args: [{ int: '3' }, { int: '4' }] }],
+              },
+            ],
+          },
+        ],
+      };
+      execute_Legacy = { 4: { 4: new BigNumber(3), 5: new BigNumber(4) } };
+      execute_ResetFields = { 4: { 0: new BigNumber(3), 1: new BigNumber(4) } };
+
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(tokenNestedOrWithoutAnnot.Execute(michelson)).toEqual(execute_ResetFields);
+
       expect(
         tokenNestedOrWithoutAnnot.Execute({
           prim: 'Right',
@@ -982,4 +1230,418 @@ describe('Or token', () => {
       });
     });
   });
+
+  describe('Nesting of Pair and Or', () => {
+    it('reproducing the reported bug in #2927', () => {
+      const schemaObj = {
+        prim: 'pair',
+        args: [
+          {
+            prim: 'set',
+            args: [
+              {
+                prim: 'address',
+              },
+            ],
+            annots: ['%owners'],
+          },
+          {
+            prim: 'set',
+            args: [
+              {
+                prim: 'address',
+              },
+            ],
+            annots: ['%inheritors'],
+          },
+          {
+            prim: 'or',
+            args: [
+              {
+                prim: 'unit',
+                annots: ['%aCTIVE'],
+              },
+              {
+                prim: 'or',
+                args: [
+                  {
+                    prim: 'pair',
+                    args: [
+                      {
+                        prim: 'address',
+                      },
+                      {
+                        prim: 'timestamp',
+                      },
+                    ],
+                    annots: ['%rECOVERING'],
+                  },
+                  {
+                    prim: 'unit',
+                    annots: ['%dEAD'],
+                  },
+                ],
+              },
+            ],
+            annots: ['%status'],
+          },
+          {
+            prim: 'mutez',
+            annots: ['%quick_recovery_stake'],
+          },
+          {
+            prim: 'nat',
+            annots: ['%quick_recovery_period'],
+          },
+          {
+            prim: 'big_map',
+            args: [
+              {
+                prim: 'pair',
+                args: [
+                  {
+                    prim: 'address',
+                  },
+                  {
+                    prim: 'or',
+                    args: [
+                      {
+                        prim: 'nat',
+                        annots: ['%sECOND'],
+                      },
+                      {
+                        prim: 'or',
+                        args: [
+                          {
+                            prim: 'nat',
+                            annots: ['%mINUTE'],
+                          },
+                          {
+                            prim: 'or',
+                            args: [
+                              {
+                                prim: 'nat',
+                                annots: ['%hOUR'],
+                              },
+                              {
+                                prim: 'or',
+                                args: [
+                                  {
+                                    prim: 'nat',
+                                    annots: ['%dAY'],
+                                  },
+                                  {
+                                    prim: 'or',
+                                    args: [
+                                      {
+                                        prim: 'nat',
+                                        annots: ['%wEEK'],
+                                      },
+                                      {
+                                        prim: 'or',
+                                        args: [
+                                          {
+                                            prim: 'nat',
+                                            annots: ['%mONTH'],
+                                          },
+                                          {
+                                            prim: 'nat',
+                                            annots: ['%yEAR'],
+                                          },
+                                        ],
+                                      },
+                                    ],
+                                  },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                prim: 'mutez',
+              },
+            ],
+            annots: ['%direct_debit_mandates'],
+          },
+          {
+            prim: 'big_map',
+            args: [
+              {
+                prim: 'pair',
+                args: [
+                  {
+                    prim: 'address',
+                  },
+                  {
+                    prim: 'or',
+                    args: [
+                      {
+                        prim: 'nat',
+                        annots: ['%sECOND'],
+                      },
+                      {
+                        prim: 'or',
+                        args: [
+                          {
+                            prim: 'nat',
+                            annots: ['%mINUTE'],
+                          },
+                          {
+                            prim: 'or',
+                            args: [
+                              {
+                                prim: 'nat',
+                                annots: ['%hOUR'],
+                              },
+                              {
+                                prim: 'or',
+                                args: [
+                                  {
+                                    prim: 'nat',
+                                    annots: ['%dAY'],
+                                  },
+                                  {
+                                    prim: 'or',
+                                    args: [
+                                      {
+                                        prim: 'nat',
+                                        annots: ['%wEEK'],
+                                      },
+                                      {
+                                        prim: 'or',
+                                        args: [
+                                          {
+                                            prim: 'nat',
+                                            annots: ['%mONTH'],
+                                          },
+                                          {
+                                            prim: 'nat',
+                                            annots: ['%yEAR'],
+                                          },
+                                        ],
+                                      },
+                                    ],
+                                  },
+                                ],
+                              },
+                            ],
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+              {
+                prim: 'timestamp',
+              },
+            ],
+            annots: ['%direct_debit_mandates_history'],
+          },
+        ],
+      };
+      const dataObj = {
+        prim: 'Pair',
+        args: [
+          [
+            {
+              string: 'tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6',
+            },
+          ],
+          [],
+          {
+            prim: 'Right',
+            args: [
+              {
+                prim: 'Left',
+                args: [
+                  {
+                    prim: 'Pair',
+                    args: [
+                      {
+                        string: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+                      },
+                      {
+                        string: '2024-04-19T13:53:22Z',
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+          {
+            int: '1000000',
+          },
+          {
+            int: '0',
+          },
+          {
+            int: '414522',
+          },
+          {
+            int: '414523',
+          },
+        ],
+      };
+      const execute_Legacy = {
+        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
+        inheritors: [],
+        status: {
+          rECOVERING: {
+            3: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+            4: '2024-04-19T13:53:22.000Z',
+          },
+        },
+        quick_recovery_stake: BigNumber(1000000),
+        quick_recovery_period: BigNumber(0),
+        direct_debit_mandates: '414522',
+        direct_debit_mandates_history: '414523',
+      };
+      const execte_ResetFields = {
+        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
+        inheritors: [],
+        status: {
+          rECOVERING: {
+            0: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+            1: '2024-04-19T13:53:22.000Z',
+          },
+        },
+        quick_recovery_stake: BigNumber(1000000),
+        quick_recovery_period: BigNumber(0),
+        direct_debit_mandates: '414522',
+        direct_debit_mandates_history: '414523',
+      };
+
+      const schema = new Schema(schemaObj);
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(schema.Execute(dataObj)).toEqual(execute_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(schema.Execute(dataObj)).toEqual(execte_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(schema.Execute(dataObj)).toEqual(execte_ResetFields);
+    });
+
+    it('a smaller reproduction', () => {
+      const schemaObj = {
+        prim: 'pair',
+        args: [
+          {
+            prim: 'set',
+            args: [
+              {
+                prim: 'address',
+              },
+            ],
+            annots: ['%owners'],
+          },
+          {
+            prim: 'set',
+            args: [
+              {
+                prim: 'address',
+              },
+            ],
+            annots: ['%inheritors'],
+          },
+          {
+            prim: 'or',
+            args: [
+              {
+                prim: 'unit',
+                annots: ['%aCTIVE'],
+              },
+              {
+                prim: 'or',
+                args: [
+                  {
+                    prim: 'pair',
+                    args: [
+                      {
+                        prim: 'address',
+                      },
+                      {
+                        prim: 'timestamp',
+                      },
+                    ],
+                    annots: ['%rECOVERING'],
+                  },
+                  {
+                    prim: 'unit',
+                    annots: ['%dEAD'],
+                  },
+                ],
+              },
+            ],
+            annots: ['%status'],
+          },
+        ],
+      };
+      const dataObj = {
+        prim: 'Pair',
+        args: [
+          [
+            {
+              string: 'tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6',
+            },
+          ],
+          [],
+          {
+            prim: 'Right',
+            args: [
+              {
+                prim: 'Left',
+                args: [
+                  {
+                    prim: 'Pair',
+                    args: [
+                      {
+                        string: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+                      },
+                      {
+                        string: '2024-04-19T13:53:22Z',
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      };
+      const execute_Legacy = {
+        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
+        inheritors: [],
+        status: {
+          rECOVERING: {
+            3: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+            4: '2024-04-19T13:53:22.000Z',
+          },
+        },
+      };
+      const execute_ResetFields = {
+        owners: ['tz1aSkwEot3L2kmUvcoxzjMomb9mvBNuzFK6'],
+        inheritors: [],
+        status: {
+          rECOVERING: {
+            0: 'tz1dcjLdDM6uYKYdQhK177cUbtvL8QwX4ebH',
+            1: '2024-04-19T13:53:22.000Z',
+          },
+        },
+      };
+
+      const schema = new Schema(schemaObj);
+      Token.fieldNumberingStrategy = 'Legacy';
+      expect(schema.Execute(dataObj)).toEqual(execute_Legacy);
+      Token.fieldNumberingStrategy = 'ResetFieldNumbersInNestedObjects';
+      expect(schema.Execute(dataObj)).toEqual(execute_ResetFields);
+      Token.fieldNumberingStrategy = 'Latest';
+      expect(schema.Execute(dataObj)).toEqual(execute_ResetFields);
+    });
+  });
 });
diff --git a/packages/taquito-remote-signer/package.json b/packages/taquito-remote-signer/package.json
index 760dc35836..84eb096103 100644
--- a/packages/taquito-remote-signer/package.json
+++ b/packages/taquito-remote-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/remote-signer",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Remote signer provider",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.2.1",
-    "@taquito/http-utils": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/http-utils": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "typedarray-to-buffer": "^4.0.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-remote-signer/src/version.ts b/packages/taquito-remote-signer/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-remote-signer/src/version.ts
+++ b/packages/taquito-remote-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-rpc/package.json b/packages/taquito-rpc/package.json
index b167d90c30..223f14420a 100644
--- a/packages/taquito-rpc/package.json
+++ b/packages/taquito-rpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/rpc",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Provides low level methods, and types to invoke RPC calls from a Nomadic Tezos RPC node",
   "keywords": [
     "tezos",
@@ -66,9 +66,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/http-utils": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/http-utils": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-rpc/src/version.ts b/packages/taquito-rpc/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-rpc/src/version.ts
+++ b/packages/taquito-rpc/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-sapling/package.json b/packages/taquito-sapling/package.json
index b40c5126a6..e8d7053bcc 100644
--- a/packages/taquito-sapling/package.json
+++ b/packages/taquito-sapling/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/sapling",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Allows reading and preparing sapling transactions",
   "keywords": [
     "tezos",
@@ -68,10 +68,10 @@
     "@airgap/sapling-wasm": "0.0.9",
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/random": "^1.0.2",
-    "@taquito/core": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-sapling/src/version.ts b/packages/taquito-sapling/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-sapling/src/version.ts
+++ b/packages/taquito-sapling/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-signer/package.json b/packages/taquito-signer/package.json
index 878538cb75..12c9f076bc 100644
--- a/packages/taquito-signer/package.json
+++ b/packages/taquito-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/signer",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Provide signing functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -72,9 +72,9 @@
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/pbkdf2": "^1.0.1",
     "@stablelib/sha512": "^1.0.1",
-    "@taquito/core": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "@types/bn.js": "^5.1.2",
     "bip39": "3.1.0",
     "elliptic": "^6.5.4",
diff --git a/packages/taquito-signer/src/version.ts b/packages/taquito-signer/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-signer/src/version.ts
+++ b/packages/taquito-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-timelock/package.json b/packages/taquito-timelock/package.json
index 7daef7890a..633a2f4039 100644
--- a/packages/taquito-timelock/package.json
+++ b/packages/taquito-timelock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/timelock",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "TypeScript implementation of the Timelock feature in Tezos",
   "main": "./dist/taquito-timelock.umd.js",
   "module": "./dist/taquito-timelock.es6.js",
@@ -68,9 +68,9 @@
     "big-integer": "^1.6.52"
   },
   "devDependencies": {
-    "@taquito/signer": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/signer": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "@types/node": "^20.11.20",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
diff --git a/packages/taquito-timelock/src/version.ts b/packages/taquito-timelock/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-timelock/src/version.ts
+++ b/packages/taquito-timelock/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-tzip12/package.json b/packages/taquito-tzip12/package.json
index ca4069b535..8f4a4da481 100644
--- a/packages/taquito-tzip12/package.json
+++ b/packages/taquito-tzip12/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip12",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Tzip12",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/michelson-encoder": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/tzip16": "^19.2.1"
+    "@taquito/core": "^19.1.0",
+    "@taquito/michelson-encoder": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/tzip16": "^19.2.0"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-tzip12/src/version.ts b/packages/taquito-tzip12/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-tzip12/src/version.ts
+++ b/packages/taquito-tzip12/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-tzip16/package.json b/packages/taquito-tzip16/package.json
index fb2d45bfe0..ed1a83b950 100644
--- a/packages/taquito-tzip16/package.json
+++ b/packages/taquito-tzip16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip16",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "Tzip16",
   "keywords": [
     "tezos",
@@ -61,12 +61,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/http-utils": "^19.2.1",
-    "@taquito/michelson-encoder": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/taquito": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/http-utils": "^19.2.0",
+    "@taquito/michelson-encoder": "^19.2.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/taquito": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2",
     "crypto-js": "^4.2.0"
   },
diff --git a/packages/taquito-tzip16/src/version.ts b/packages/taquito-tzip16/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-tzip16/src/version.ts
+++ b/packages/taquito-tzip16/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito-utils/package.json b/packages/taquito-utils/package.json
index 39bda3d327..b40b29c4af 100644
--- a/packages/taquito-utils/package.json
+++ b/packages/taquito-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/utils",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -64,7 +64,7 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.2.1",
+    "@taquito/core": "^19.1.0",
     "@types/bs58check": "^2.1.0",
     "bignumber.js": "^9.1.2",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-utils/src/version.ts b/packages/taquito-utils/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito-utils/src/version.ts
+++ b/packages/taquito-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito/README.md b/packages/taquito/README.md
index 36247aa85c..ccbab63416 100644
--- a/packages/taquito/README.md
+++ b/packages/taquito/README.md
@@ -7,7 +7,7 @@ The `@taquito/taquito` package contains higher-level functionality that builds u
 ## CDN Bundle
 
 ```html
-<script src="https://unpkg.com/@taquito/taquito@19.2.1/dist/taquito.min.js"
+<script src="https://unpkg.com/@taquito/taquito@19.2.0/dist/taquito.min.js"
 crossorigin="anonymous" integrity="sha384-IxvP0ECHi5oqLyz94wF85pU9+ktcsL1HHtA42MITxZsGbsUMEu/g+0Vkjj5vqiMR"></script>
 ```
 
diff --git a/packages/taquito/assets-manifest.json b/packages/taquito/assets-manifest.json
index b7f1f80a20..2cda686ec5 100644
--- a/packages/taquito/assets-manifest.json
+++ b/packages/taquito/assets-manifest.json
@@ -5,6 +5,6 @@
   },
   "main.js": {
     "src": "dist/taquito.min.js",
-    "integrity": "sha256-3JZSLgFKNJToRxyfNaSAhSlCvN/doCnV17xo8BAPM4U= sha384-TC1SFqSdiCy1bGvfza9eovd+gju0nadTBvBKfme7o753Wkw5vAPTuthB9HdtOtxH sha512-7uUujjrPUhQ0F3dIPFEPmB3YBA7og2xPdz5BfhYDzsVzjXEvR+/plvqKBOe7z4pmltinwXXc8Le1Fiiwz6TVZA=="
+    "integrity": "sha256-SBnOaGNmGpU2dRZi5x2Fql8ttF2HYMVJSrEn0FUrgC8= sha384-yfyuDWhL5IMuPidvT0J7Mc2a2JI8d3XEhSRvvFKN94+UVDQVjWYqqHywNO+uxa4J sha512-Xi8RDZZPlKx8kx/yJvNXokVQHpdr/0bzb+h2t2HLDayVebG2pjHqqNlYhedGRx/2My9DjVNCPJJIELGVrVCp8A=="
   }
 }
\ No newline at end of file
diff --git a/packages/taquito/package.json b/packages/taquito/package.json
index 764ba58b03..268d2ebeec 100644
--- a/packages/taquito/package.json
+++ b/packages/taquito/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/taquito",
-  "version": "19.2.1",
+  "version": "19.2.0",
   "description": "High level functionality that builds upon the other packages in the Tezos Typescript Library Suite.",
   "keywords": [
     "tezos",
@@ -77,13 +77,13 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.2.1",
-    "@taquito/http-utils": "^19.2.1",
-    "@taquito/local-forging": "^19.2.1",
-    "@taquito/michel-codec": "^19.2.1",
-    "@taquito/michelson-encoder": "^19.2.1",
-    "@taquito/rpc": "^19.2.1",
-    "@taquito/utils": "^19.2.1",
+    "@taquito/core": "^19.1.0",
+    "@taquito/http-utils": "^19.2.0",
+    "@taquito/local-forging": "^19.2.0",
+    "@taquito/michel-codec": "^19.2.0",
+    "@taquito/michelson-encoder": "^19.2.0",
+    "@taquito/rpc": "^19.2.0",
+    "@taquito/utils": "^19.2.0",
     "bignumber.js": "^9.1.2",
     "rxjs": "^7.8.1"
   },
diff --git a/packages/taquito/src/taquito.ts b/packages/taquito/src/taquito.ts
index 4710b76e26..a15025e70e 100644
--- a/packages/taquito/src/taquito.ts
+++ b/packages/taquito/src/taquito.ts
@@ -32,8 +32,9 @@ import { ParserProvider } from './parser/interface';
 import { MichelCodecParser } from './parser/michel-codec-parser';
 import { Injector } from './injector/interface';
 import { RpcInjector } from './injector/rpc-injector';
+import { FieldNumberingStrategy, Token } from '@taquito/michelson-encoder';
 
-export { MichelsonMap, UnitValue } from '@taquito/michelson-encoder';
+export { FieldNumberingStrategy, Token, MichelsonMap, UnitValue } from '@taquito/michelson-encoder';
 export { Forger, ForgeParams, ForgeResponse } from '@taquito/local-forging';
 export * from './constants';
 export * from './context';
@@ -360,6 +361,14 @@ export class TezosToolkit {
     }
   }
 
+  /**
+   * @description Sets the strategy used for field numbering in Token execute/encode/decode to convert Michelson values to/from javascript objects
+   * @param strategy a value of type FieldNumberingStrategy that controls how field numbers are calculated
+   */
+  setFieldNumberingStrategy(strategy: FieldNumberingStrategy) {
+    Token.fieldNumberingStrategy = strategy;
+  }
+
   /**
    * @description Provide access to tezos account management
    */
diff --git a/packages/taquito/src/version.ts b/packages/taquito/src/version.ts
index 4204ba8f29..dd87766ac7 100644
--- a/packages/taquito/src/version.ts
+++ b/packages/taquito/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
-  version: '19.2.1',
+  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
+  version: '19.2.0',
 };
diff --git a/packages/taquito/test/contract/contractAbstraction.spec.ts b/packages/taquito/test/contract/contractAbstraction.spec.ts
index 8abc67ff6c..15f470371f 100644
--- a/packages/taquito/test/contract/contractAbstraction.spec.ts
+++ b/packages/taquito/test/contract/contractAbstraction.spec.ts
@@ -382,8 +382,8 @@ describe('ContractAbstraction test', () => {
       expect(method2).toBeInstanceOf(ContractMethod);
 
       const methodObject2 = contractAbs.methodsObject[2]({
-        2: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu',
-        3: '1',
+        0: 'tz1ZfrERcALBwmAqwonRXYVQBDT9BjNjBHJu',
+        1: '1',
       });
       expect(methodObject2).toBeInstanceOf(ContractMethodObject);
 
diff --git a/waku-helpers.sh b/waku-helpers.sh
index 7b6cbe6f30..62661ed51c 100644
--- a/waku-helpers.sh
+++ b/waku-helpers.sh
@@ -9,7 +9,7 @@
 # * Clone and build nwaku: https://is.gd/NXeAnv
 # * Add a .env file with a variable NWAKU_DIR set to your nwaku directory
 
-_err() { # write a (loud) message to stderr, if running interacively
+_err() { # write a (loud) message to stderr, if running interactively
     [[ -o interactive ]] && tput setaf 1
     echo "$@" 1>&2
 }
diff --git a/website/package-lock.json b/website/package-lock.json
index bfdbed87e5..a72c7cb37d 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -69,17 +69,17 @@
     },
     "../packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/http-utils": "^19.2.1-beta.2",
-        "@taquito/local-forging": "^19.2.1-beta.2",
-        "@taquito/michel-codec": "^19.2.1-beta.2",
-        "@taquito/michelson-encoder": "^19.2.1-beta.2",
-        "@taquito/rpc": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/local-forging": "^19.2.0",
+        "@taquito/michel-codec": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -127,12 +127,12 @@
     },
     "../packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.2",
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2"
+        "@airgap/beacon-dapp": "^4.2.1",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -172,7 +172,7 @@
     },
     "../packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.2.1-beta.2",
+      "version": "19.1.0",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -188,10 +188,10 @@
     },
     "../packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -229,14 +229,14 @@
     },
     "../packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -273,10 +273,10 @@
     },
     "../packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2"
+        "@taquito/core": "^19.1.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -306,12 +306,12 @@
     },
     "../packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/rpc": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -348,15 +348,15 @@
     },
     "../packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/http-utils": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -393,12 +393,12 @@
     },
     "../packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/http-utils": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -434,7 +434,7 @@
     },
     "../packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -443,9 +443,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -488,13 +488,13 @@
     },
     "../packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/michelson-encoder": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2",
-        "@taquito/tzip16": "^19.2.1-beta.2"
+        "@taquito/core": "^19.1.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/tzip16": "^19.2.0"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -530,15 +530,15 @@
     },
     "../packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.2.1-beta.2",
-        "@taquito/http-utils": "^19.2.1-beta.2",
-        "@taquito/michelson-encoder": "^19.2.1-beta.2",
-        "@taquito/rpc": "^19.2.1-beta.2",
-        "@taquito/taquito": "^19.2.1-beta.2",
-        "@taquito/utils": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
+        "@taquito/http-utils": "^19.2.0",
+        "@taquito/michelson-encoder": "^19.2.0",
+        "@taquito/rpc": "^19.2.0",
+        "@taquito/taquito": "^19.2.0",
+        "@taquito/utils": "^19.2.0",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -577,12 +577,12 @@
     },
     "../packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.1-beta.2",
+      "version": "19.2.0",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/core": "^19.1.0",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",

From 707f2af3167e205169000d255a9a7a40a2b4c2fb Mon Sep 17 00:00:00 2001
From: ac10n <alirezahaghshenas@gmail.com>
Date: Tue, 21 May 2024 14:54:47 -0700
Subject: [PATCH 3/3] Beacon 4.2.2 fix lost commits (#2968)

* feat: updated beacon to 4.2.2-beta.0

* feat: feat: updated beacon to 4.2.2-beta.1

* feat: feat: updated beacon to 4.2.2-beta.2

* chore(releng) bump version to 19.2.1-beta.0

* feat: updated beacon to 4.2.2-beta.3

* feat: updating to private prc nodes

* reverted config to use public testnets instead

* fix: updating back to public node

* chore(releng) bump version to 19.2.1-beta.1

* feat: updated beacon to 4.2.2-beta.4

* chore(releng) bump version to 19.2.1-beta.2

* 2958 eventsub (#2960)

* updated taquito-beacon-wallet to use eventsub

* removed comments

* removed console log

* trigger ci build

* updated beacon version to v4.2.2

* chore(releng) bump version to 19.2.1

---------

Co-authored-by: huianyang <hui-an.yang@ecadlabs.com>
Co-authored-by: Davis Sawali <davis.sawali@ecadlabs.com>
---
 apps/taquito-test-dapp/package.json           |  14 +-
 apps/taquito-test-dapp/src/lib/Wallet.svelte  |  13 +-
 example/package.json                          |  22 +-
 integration-tests/package.json                |  30 +-
 lerna.json                                    |   2 +-
 package-lock.json                             | 437 +++++++++---------
 packages/taquito-beacon-wallet/package.json   |   8 +-
 .../src/taquito-beacon-wallet.ts              |  21 +-
 packages/taquito-beacon-wallet/src/version.ts |   4 +-
 .../taquito-contracts-library/package.json    |  10 +-
 .../taquito-contracts-library/src/version.ts  |   4 +-
 packages/taquito-core/package.json            |   2 +-
 packages/taquito-core/src/version.ts          |   4 +-
 packages/taquito-http-utils/package.json      |   4 +-
 packages/taquito-http-utils/src/version.ts    |   4 +-
 packages/taquito-ledger-signer/package.json   |   8 +-
 packages/taquito-ledger-signer/src/version.ts |   4 +-
 packages/taquito-local-forging/package.json   |   8 +-
 packages/taquito-local-forging/src/version.ts |   4 +-
 .../pack-test-tool/package.json               |   4 +-
 packages/taquito-michel-codec/package.json    |   4 +-
 packages/taquito-michel-codec/src/version.ts  |   4 +-
 .../taquito-michelson-encoder/package.json    |   8 +-
 .../taquito-michelson-encoder/src/version.ts  |   4 +-
 packages/taquito-remote-signer/package.json   |  10 +-
 packages/taquito-remote-signer/src/version.ts |   4 +-
 packages/taquito-rpc/package.json             |   8 +-
 packages/taquito-rpc/src/version.ts           |   4 +-
 packages/taquito-sapling/package.json         |  10 +-
 packages/taquito-sapling/src/version.ts       |   4 +-
 packages/taquito-signer/package.json          |   8 +-
 packages/taquito-signer/src/version.ts        |   4 +-
 packages/taquito-timelock/package.json        |   8 +-
 packages/taquito-timelock/src/version.ts      |   4 +-
 packages/taquito-tzip12/package.json          |  10 +-
 packages/taquito-tzip12/src/version.ts        |   4 +-
 packages/taquito-tzip16/package.json          |  14 +-
 packages/taquito-tzip16/src/version.ts        |   4 +-
 packages/taquito-utils/package.json           |   4 +-
 packages/taquito-utils/src/version.ts         |   4 +-
 packages/taquito/README.md                    |   2 +-
 packages/taquito/assets-manifest.json         |   2 +-
 packages/taquito/package.json                 |  16 +-
 packages/taquito/src/version.ts               |   4 +-
 website/package-lock.json                     | 104 ++---
 45 files changed, 430 insertions(+), 429 deletions(-)

diff --git a/apps/taquito-test-dapp/package.json b/apps/taquito-test-dapp/package.json
index 6aee4c753a..bf4f665881 100644
--- a/apps/taquito-test-dapp/package.json
+++ b/apps/taquito-test-dapp/package.json
@@ -1,7 +1,7 @@
 {
   "name": "taquito-test-dapp-vite",
   "private": true,
-  "version": "19.2.0",
+  "version": "19.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -24,12 +24,12 @@
     "vite": "^4.4.11"
   },
   "dependencies": {
-    "@airgap/beacon-sdk": "^4.2.1",
-    "@airgap/beacon-types": "^4.2.1",
-    "@taquito/beacon-wallet": "^19.2.0",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@airgap/beacon-sdk": "^4.2.2",
+    "@airgap/beacon-types": "^4.2.2",
+    "@taquito/beacon-wallet": "^19.2.1",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "buffer": "^6.0.3",
     "svelte-select": "^5.7.0",
     "vite-compatible-readable-stream": "^3.6.1"
diff --git a/apps/taquito-test-dapp/src/lib/Wallet.svelte b/apps/taquito-test-dapp/src/lib/Wallet.svelte
index 38719e5966..c78b97430c 100644
--- a/apps/taquito-test-dapp/src/lib/Wallet.svelte
+++ b/apps/taquito-test-dapp/src/lib/Wallet.svelte
@@ -6,15 +6,18 @@
   import { BeaconEvent, type DAppClientOptions } from "@airgap/beacon-sdk";
   import store from "../store";
   import { formatTokenAmount, shortenHash } from "../utils";
-  import { defaultMatrixNode, getRpcUrl, defaultNetworkType, type SupportedNetworks } from "../config";
+  import {
+    defaultMatrixNode,
+    getRpcUrl,
+    defaultNetworkType,
+    type SupportedNetworks,
+  } from "../config";
   import type { TezosAccountAddress } from "../types";
 
   let showDialog = false;
   let connectedWallet = "";
 
-  const createNewWallet = (config: {
-    networkType: SupportedNetworks,
-  }) => {
+  const createNewWallet = (config: { networkType: SupportedNetworks }) => {
     const options: DAppClientOptions = {
       name: "Taquito Test Dapp",
       matrixNodes: [defaultMatrixNode] as any,
@@ -23,7 +26,7 @@
         rpcUrl: getRpcUrl(config.networkType),
       },
       walletConnectOptions: {
-        projectId: 'ba97fd7d1e89eae02f7c330e14ce1f36',
+        projectId: "ba97fd7d1e89eae02f7c330e14ce1f36",
       },
       enableMetrics: $store.enableMetrics,
     };
diff --git a/example/package.json b/example/package.json
index ebfa3a03ec..3400b28369 100644
--- a/example/package.json
+++ b/example/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@taquito/example",
   "private": true,
-  "version": "19.2.0",
+  "version": "19.2.1",
   "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.28.5",
-    "@taquito/ledger-signer": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/sapling": "^19.2.0",
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/ledger-signer": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/sapling": "^19.2.1",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/integration-tests/package.json b/integration-tests/package.json
index ccb2bc9682..06f450e345 100644
--- a/integration-tests/package.json
+++ b/integration-tests/package.json
@@ -13,26 +13,26 @@
     "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": "19.2.0",
+  "version": "19.2.1",
   "dependencies": {
     "@ledgerhq/devices": "8.2.2",
     "@ledgerhq/hw-transport": "6.30.5",
     "@ledgerhq/hw-transport-node-hid": "6.28.5",
     "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-    "@taquito/contracts-library": "^19.2.0",
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/remote-signer": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/sapling": "^19.2.0",
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip12": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/contracts-library": "^19.2.1",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/remote-signer": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/sapling": "^19.2.1",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip12": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1"
diff --git a/lerna.json b/lerna.json
index 3c6da77aa3..a537c45977 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,4 +1,4 @@
 {
   "useNx": true,
-  "version": "19.2.0"
+  "version": "19.2.1"
 }
diff --git a/package-lock.json b/package-lock.json
index fadffed0cb..7ddfdbb3a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -56,14 +56,14 @@
     },
     "apps/taquito-test-dapp": {
       "name": "taquito-test-dapp-vite",
-      "version": "19.2.0",
-      "dependencies": {
-        "@airgap/beacon-sdk": "^4.2.1",
-        "@airgap/beacon-types": "^4.2.1",
-        "@taquito/beacon-wallet": "^19.2.0",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+      "version": "19.2.1",
+      "dependencies": {
+        "@airgap/beacon-sdk": "^4.2.2",
+        "@airgap/beacon-types": "^4.2.2",
+        "@taquito/beacon-wallet": "^19.2.1",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "buffer": "^6.0.3",
         "svelte-select": "^5.7.0",
         "vite-compatible-readable-stream": "^3.6.1"
@@ -85,19 +85,19 @@
     },
     "example": {
       "name": "@taquito/example",
-      "version": "19.2.0",
-      "dependencies": {
-        "@ledgerhq/hw-transport-node-hid": "^6.28.5",
-        "@taquito/ledger-signer": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/sapling": "^19.2.0",
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+      "version": "19.2.1",
+      "dependencies": {
+        "@ledgerhq/hw-transport-node-hid": "^6.27.21",
+        "@taquito/ledger-signer": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/sapling": "^19.2.1",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -106,26 +106,26 @@
       }
     },
     "integration-tests": {
-      "version": "19.2.0",
+      "version": "19.2.1",
       "dependencies": {
         "@ledgerhq/devices": "8.2.2",
         "@ledgerhq/hw-transport": "6.30.5",
         "@ledgerhq/hw-transport-node-hid": "6.28.5",
         "@ledgerhq/hw-transport-node-hid-noevents": "6.29.5",
-        "@taquito/contracts-library": "^19.2.0",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/remote-signer": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/sapling": "^19.2.0",
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip12": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/contracts-library": "^19.2.1",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/remote-signer": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/sapling": "^19.2.1",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip12": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1"
@@ -156,30 +156,30 @@
       }
     },
     "node_modules/@airgap/beacon-blockchain-substrate": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.1.tgz",
-      "integrity": "sha512-Zaggh3QdYYlXV8DsdbPcLuKCLCG9mqSBCQSrLZphaHi9phL16GuAcM7UnuQTnN9UbAS1gkLe3I1IIXZHNpMTig==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-substrate/-/beacon-blockchain-substrate-4.2.2.tgz",
+      "integrity": "sha512-7G5HvZBM03zDwWh0OfXxKkE4WVrtacIEq7Ks1W33Yrtk7M2fliJu8FplYwn4EyasBXtt5WQfd2/3OkJOjbNmXw==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-blockchain-tezos": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.1.tgz",
-      "integrity": "sha512-vVwROjzt70MjiSDKbsUV2gHxFT8YMfCnn9t/FR04nn/DIxWrnxmRPoWh8lnqJOx2SHuqQgVDTE0i4kxBYuW94Q==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-blockchain-tezos/-/beacon-blockchain-tezos-4.2.2.tgz",
+      "integrity": "sha512-VeS9nNwgwic9uIO4dF2KCQr673qos/vhf528H2dy5NwITFSSRwT/lPT5YCDvmCQ5roYQF7+qY1tTE0VBKONEhg==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-core": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.1.tgz",
-      "integrity": "sha512-rOfvmxTcfoPfC40G2RoPxp9HtQjeNZGuecvmsGAkbEcJHZpgNXoyp5zt8YeBBpxA8KsV156FcUDjyHadSFjaWw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-core/-/beacon-core-4.2.2.tgz",
+      "integrity": "sha512-pvp6T57fL734Yi81ZOvAo6oQmw7PPsj5BLC/brg17ic2uGCF0aFgYrExTDxVz5SoM93v5NJCPvg1TRkitTcvtA==",
       "dependencies": {
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/utf8": "^1.0.1",
@@ -214,91 +214,91 @@
       }
     },
     "node_modules/@airgap/beacon-dapp": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.1.tgz",
-      "integrity": "sha512-lt1B8JL2yQkun0imhQv/Fz/LhHTrXo1xdBlYUopOGi6KHtXXyGZpMTrAqEUWn/nKYcygjx+zNI5NaMxDn2Ejlg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-dapp/-/beacon-dapp-4.2.2.tgz",
+      "integrity": "sha512-kXH9gwjkbZKlt1irg/QGOWJeUwvR+ffa/3m39F8Mv5uIdS/PnOU4QMso6F4VVbtk6RmAGFr1gG/Q6pIkkWPFxg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-transport-walletconnect": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-transport-walletconnect": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-sdk": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.1.tgz",
-      "integrity": "sha512-/NhrQBETARyB3UT1c7/IEAItV1RmCpdGd2m32Dn8MsyAmHki+y+BuKBuWuywjKOZHqVntkeqIWvh9thmBnih/w==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-sdk/-/beacon-sdk-4.2.2.tgz",
+      "integrity": "sha512-F99zhXUp1EXDOqESqjPglBGzv0WSKVcmf62PYbW5B3HyhstbC3gdu8pcu/rEkMyyF3dLUFzX91cE/COBgh3qRA==",
       "dependencies": {
-        "@airgap/beacon-blockchain-substrate": "4.2.1",
-        "@airgap/beacon-blockchain-tezos": "4.2.1",
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-dapp": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-ui": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
-        "@airgap/beacon-wallet": "4.2.1"
+        "@airgap/beacon-blockchain-substrate": "4.2.2",
+        "@airgap/beacon-blockchain-tezos": "4.2.2",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-dapp": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-ui": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
+        "@airgap/beacon-wallet": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-transport-matrix": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.1.tgz",
-      "integrity": "sha512-ggvKQPreXVrm5t3kPV/RGBTIxo8ujSrE6tb6kpUAQyMC+mfMPY5WeP8qwqgMT+yzRMYUlkJa3u+hNxoSQIKK+A==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-matrix/-/beacon-transport-matrix-4.2.2.tgz",
+      "integrity": "sha512-lCwFo6laGQbowvQoGU5tlkgrdBx9S9Nyk/OjJUE5Db9DgvQZhRR77zA0jl7lPdYDYcKeklHahBz6vwkiN/ferA==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "axios": "^1.6.2"
       }
     },
     "node_modules/@airgap/beacon-transport-postmessage": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.1.tgz",
-      "integrity": "sha512-/sq2yz90scWNwb93nhe9hXQZpetXLuc/BRJcyg3W3Sv53wEQ5yPb9XmedFhuFo/Tc8nTt5kZgz5ORXgDnlATJg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-postmessage/-/beacon-transport-postmessage-4.2.2.tgz",
+      "integrity": "sha512-xLFeTEw6Yydq+4cr8IISxFprEQm3Us1QKNI/zNTAy1ssTxML1MZGAoLXWm/3adXKc8kzeR7dZH9blNEKhZWGcQ==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2"
       }
     },
     "node_modules/@airgap/beacon-transport-walletconnect": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.1.tgz",
-      "integrity": "sha512-HTjKXtXP3z/Xg2yViE2o4gi556ickOTHjFz7t9ftp75qARP+XOW0uWcwTTV8YVK4mW5fXe0lM2M5nGXWD6nE8g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-transport-walletconnect/-/beacon-transport-walletconnect-4.2.2.tgz",
+      "integrity": "sha512-ftwUDhQdjLPtyX1ESUp9VkFS5vyEvp377eL4lVFaEdqf4mCpxg/XxHffO/o7OeRD1NI0nZfCxsKOWU2plg+ghg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@walletconnect/sign-client": "2.11.2"
       }
     },
     "node_modules/@airgap/beacon-types": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.1.tgz",
-      "integrity": "sha512-6PBO/FCb2kDgfJdLVhImcK9oXq3Pa444/xOW3a5WEbVqq+q9qo5OjdscJFAviQgRMz8NJJvOn8/5RbRJBy2uWw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-types/-/beacon-types-4.2.2.tgz",
+      "integrity": "sha512-4sX5QEZTanQ5E6FiY7lp6ilv6rlzu5eNrWa3KdygpHm0NFfkJCY7YRPWo4V5LkCCkILa9QF5TS9tVKMORNcocQ==",
       "dependencies": {
         "@types/chrome": "0.0.246"
       }
     },
     "node_modules/@airgap/beacon-ui": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.1.tgz",
-      "integrity": "sha512-doCNbi9iaJQmNWKr54/i39VkgO/IFdxArdyxrUYAT2Z6bcLa+cJu3ttNjVQKoAhm8Z07QFWneMnS7RbYZRNbWg==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-ui/-/beacon-ui-4.2.2.tgz",
+      "integrity": "sha512-iuVH8ZgyejRo61vwZP4gTju+FfRxtEvA+Y9CanizlkJY3UcPa2ATx9Bmz8fGOeo5bkohxS1Ny36WEQ81z5cpIw==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1",
-        "@airgap/beacon-types": "4.2.1",
-        "@airgap/beacon-utils": "4.2.1",
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2",
+        "@airgap/beacon-types": "4.2.2",
+        "@airgap/beacon-utils": "4.2.2",
         "@walletconnect/utils": "2.11.2",
         "qrcode-svg": "^1.1.0",
         "solid-js": "^1.7.11"
       }
     },
     "node_modules/@airgap/beacon-utils": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.1.tgz",
-      "integrity": "sha512-Ob9OE1w9jnytC9s9UYuClBef1lmJnKFnB8NsqeLPur2AHC+9M2aeua92cS6KY8GkQo3EN4KzaCguC3QFo3nsVw==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-utils/-/beacon-utils-4.2.2.tgz",
+      "integrity": "sha512-TwDJ8O8/Lky6qdpczVJKWACu3BWEE49hMyCylXYJPnLlCZtpaqByD6awc+BEooJkC2c8Bj4V3JfcwBJGNzMs6w==",
       "dependencies": {
         "@stablelib/ed25519": "^1.0.3",
         "@stablelib/nacl": "^1.0.4",
@@ -334,13 +334,13 @@
       }
     },
     "node_modules/@airgap/beacon-wallet": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.1.tgz",
-      "integrity": "sha512-YnEKbLVGlqZ2YwkD+bIKu6ZqMpIje2QtKccpnYbLsOSqZHY0+0n5iu63qkKw8Wy6PWDp1JN4CFVQVnGrRo7f9g==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@airgap/beacon-wallet/-/beacon-wallet-4.2.2.tgz",
+      "integrity": "sha512-UnyxUg++ip8Hqfa7lnnZH623MraPfGtMqGLt22aYvZHrRA9ypBcJRVhBqWDeD3WUdGrVdSjtCQ0I+mHn7jIGSg==",
       "dependencies": {
-        "@airgap/beacon-core": "4.2.1",
-        "@airgap/beacon-transport-matrix": "4.2.1",
-        "@airgap/beacon-transport-postmessage": "4.2.1"
+        "@airgap/beacon-core": "4.2.2",
+        "@airgap/beacon-transport-matrix": "4.2.2",
+        "@airgap/beacon-transport-postmessage": "4.2.2"
       }
     },
     "node_modules/@airgap/sapling-wasm": {
@@ -6871,33 +6871,22 @@
       }
     },
     "node_modules/@walletconnect/logger": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.0.1.tgz",
-      "integrity": "sha512-SsTKdsgWm+oDTBeNE/zHxxr5eJfZmE9/5yp/Ku+zJtcTAjELb3DXueWkDXmE9h8uHIbJzIb5wj5lPdzyrjT6hQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@walletconnect/logger/-/logger-2.1.2.tgz",
+      "integrity": "sha512-aAb28I3S6pYXZHQm5ESB+V6rDqIYfsnHaQyzFbwUUBFY4H0OXx/YtTl8lvhUNhMMfb9UxbwEBS253TlXUYJWSw==",
       "dependencies": {
-        "pino": "7.11.0",
-        "tslib": "1.14.1"
+        "@walletconnect/safe-json": "^1.0.2",
+        "pino": "7.11.0"
       }
     },
-    "node_modules/@walletconnect/logger/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@walletconnect/relay-api": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.9.tgz",
-      "integrity": "sha512-Q3+rylJOqRkO1D9Su0DPE3mmznbAalYapJ9qmzDgK28mYF9alcP3UwG/og5V7l7CFOqzCLi7B8BvcBUrpDj0Rg==",
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/@walletconnect/relay-api/-/relay-api-1.0.10.tgz",
+      "integrity": "sha512-tqrdd4zU9VBNqUaXXQASaexklv6A54yEyQQEXYOCr+Jz8Ket0dmPBDyg19LVSNUN2cipAghQc45/KVmfFJ0cYw==",
       "dependencies": {
-        "@walletconnect/jsonrpc-types": "^1.0.2",
-        "tslib": "1.14.1"
+        "@walletconnect/jsonrpc-types": "^1.0.2"
       }
     },
-    "node_modules/@walletconnect/relay-api/node_modules/tslib": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
-      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg=="
-    },
     "node_modules/@walletconnect/relay-auth": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/@walletconnect/relay-auth/-/relay-auth-1.0.4.tgz",
@@ -9166,6 +9155,11 @@
         "typedarray": "^0.0.6"
       }
     },
+    "node_modules/confbox": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz",
+      "integrity": "sha512-uJcB/FKZtBMCJpK8MQji6bJHgu1tixKPxRLeGkNzBoOZzpnZUJm0jm2/sBDWcuBx1dYgxV4JU+g5hmNxCyAmdA=="
+    },
     "node_modules/consola": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz",
@@ -12965,9 +12959,9 @@
       "dev": true
     },
     "node_modules/iron-webcrypto": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.1.0.tgz",
-      "integrity": "sha512-5vgYsCakNlaQub1orZK5QmNYhwYtcllTkZBp5sfIaCqY93Cf6l+v2rtE+E4TMbcfjxDMCdrO8wmp7+ZvhDECLA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/iron-webcrypto/-/iron-webcrypto-1.2.1.tgz",
+      "integrity": "sha512-feOM6FaSr6rEABp/eDfVseKyTMDt+KGpeB35SkVn9Tyn0CqvVsY3EwI0v5i8nMHyJnzCIQf7nsy3p41TPkJZhg==",
       "funding": {
         "url": "https://github.com/sponsors/brc-dd"
       }
@@ -14422,7 +14416,8 @@
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
-      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w=="
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
@@ -16377,14 +16372,14 @@
       "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="
     },
     "node_modules/mlly": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
-      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.0.tgz",
+      "integrity": "sha512-U9SDaXGEREBYQgfejV97coK0UL1r+qnF2SyO9A3qcI8MzKnsIFKHNVEkrDyNncQTKQQumsasmeq84eNMdBfsNQ==",
       "dependencies": {
         "acorn": "^8.11.3",
         "pathe": "^1.1.2",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.2"
+        "pkg-types": "^1.1.0",
+        "ufo": "^1.5.3"
       }
     },
     "node_modules/modify-values": {
@@ -18282,13 +18277,13 @@
       }
     },
     "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz",
+      "integrity": "sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==",
       "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
+        "confbox": "^0.1.7",
+        "mlly": "^1.7.0",
+        "pathe": "^1.1.2"
       }
     },
     "node_modules/pkg-up": {
@@ -20697,9 +20692,9 @@
       }
     },
     "node_modules/solid-js": {
-      "version": "1.8.16",
-      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.16.tgz",
-      "integrity": "sha512-rja94MNU9flF3qQRLNsu60QHKBDKBkVE1DldJZPIfn2ypIn3NV2WpSbGTQIvsyGPBo+9E2IMjwqnqpbgfWuzeg==",
+      "version": "1.8.17",
+      "resolved": "https://registry.npmjs.org/solid-js/-/solid-js-1.8.17.tgz",
+      "integrity": "sha512-E0FkUgv9sG/gEBWkHr/2XkBluHb1fkrHywUgA6o6XolPDCJ4g1HaLmQufcBBhiF36ee40q+HpG/vCZu7fLpI3Q==",
       "dependencies": {
         "csstype": "^3.1.0",
         "seroval": "^1.0.4",
@@ -22511,9 +22506,9 @@
       }
     },
     "node_modules/unstorage/node_modules/lru-cache": {
-      "version": "10.2.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
-      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+      "version": "10.2.2",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.2.tgz",
+      "integrity": "sha512-9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==",
       "engines": {
         "node": "14 || >=16.14"
       }
@@ -23405,17 +23400,17 @@
     },
     "packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/local-forging": "^19.2.1",
+        "@taquito/michel-codec": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -23463,12 +23458,12 @@
     },
     "packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0"
+        "@airgap/beacon-dapp": "^4.2.2",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23508,13 +23503,13 @@
     },
     "packages/taquito-contracts-library": {
       "name": "@taquito/contracts-library",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23551,7 +23546,7 @@
     },
     "packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.1.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -23567,10 +23562,10 @@
     },
     "packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -23627,14 +23622,14 @@
     },
     "packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -23671,15 +23666,15 @@
     },
     "packages/taquito-local-forging": {
       "name": "@taquito/local-forging",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
-        "@taquito/rpc": "^19.2.0",
+        "@taquito/rpc": "^19.2.1",
         "@types/bluebird": "^3.5.40",
         "@types/estree": "^1.0.2",
         "@types/jest": "^29.5.5",
@@ -23717,10 +23712,10 @@
     },
     "packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.1.0"
+        "@taquito/core": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -23749,21 +23744,21 @@
       }
     },
     "packages/taquito-michel-codec/pack-test-tool": {
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/rpc": "^19.2.0",
+        "@taquito/rpc": "^19.2.1",
         "yargs": "^17.7.2"
       }
     },
     "packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -23800,15 +23795,15 @@
     },
     "packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -23845,12 +23840,12 @@
     },
     "packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -23886,17 +23881,17 @@
     },
     "packages/taquito-sapling": {
       "name": "@taquito/sapling",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@airgap/sapling-wasm": "0.0.9",
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/random": "^1.0.2",
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "bip39": "3.1.0",
         "blakejs": "^1.2.1",
@@ -23956,7 +23951,7 @@
     },
     "packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -23965,9 +23960,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -24010,7 +24005,7 @@
     },
     "packages/taquito-timelock": {
       "name": "@taquito/timelock",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -24018,9 +24013,9 @@
         "big-integer": "^1.6.52"
       },
       "devDependencies": {
-        "@taquito/signer": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/signer": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "@types/node": "^20.11.20",
         "@typescript-eslint/eslint-plugin": "^6.21.0",
         "@typescript-eslint/parser": "^6.21.0",
@@ -24064,13 +24059,13 @@
     },
     "packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0"
+        "@taquito/core": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/tzip16": "^19.2.1"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -24106,15 +24101,15 @@
     },
     "packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1",
+        "@taquito/http-utils": "^19.2.1",
+        "@taquito/michelson-encoder": "^19.2.1",
+        "@taquito/rpc": "^19.2.1",
+        "@taquito/taquito": "^19.2.1",
+        "@taquito/utils": "^19.2.1",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -24153,12 +24148,12 @@
     },
     "packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.0",
+      "version": "19.2.1",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",
diff --git a/packages/taquito-beacon-wallet/package.json b/packages/taquito-beacon-wallet/package.json
index 3da826a3e4..b662998c05 100644
--- a/packages/taquito-beacon-wallet/package.json
+++ b/packages/taquito-beacon-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/beacon-wallet",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Beacon wallet provider",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@airgap/beacon-dapp": "^4.2.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0"
+    "@airgap/beacon-dapp": "^4.2.2",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
index a683acae70..6a883f9825 100644
--- a/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
+++ b/packages/taquito-beacon-wallet/src/taquito-beacon-wallet.ts
@@ -10,6 +10,8 @@ import {
   PermissionScope,
   getDAppClientInstance,
   SigningType,
+  AccountInfo,
+  BeaconEvent,
 } from '@airgap/beacon-dapp';
 import { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 import toBuffer from 'typedarray-to-buffer';
@@ -32,9 +34,13 @@ export { BeaconWalletNotInitialized, MissingRequiredScopes } from './errors';
 
 export class BeaconWallet implements WalletProvider {
   public client: DAppClient;
+  public account: AccountInfo | undefined;
 
   constructor(options: DAppClientOptions) {
     this.client = getDAppClientInstance(options);
+    this.client.subscribeToEvent(BeaconEvent.ACTIVE_ACCOUNT_SET, async (data) => {
+      this.account = data;
+    });
   }
 
   private validateRequiredScopesOrFail(
@@ -59,19 +65,17 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async getPKH() {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    return account.address;
+    return this.account.address;
   }
 
   async getPK() {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    return account.publicKey ?? '';
+    return this.account.publicKey ?? '';
   }
 
   async mapTransferParamsToWalletParams(params: () => Promise<WalletTransferParams>) {
@@ -167,11 +171,10 @@ export class BeaconWallet implements WalletProvider {
   }
 
   async sendOperations(params: any[]) {
-    const account = await this.client.getActiveAccount();
-    if (!account) {
+    if (!this.account) {
       throw new BeaconWalletNotInitialized();
     }
-    const permissions = account.scopes;
+    const permissions = this.account.scopes;
     this.validateRequiredScopesOrFail(permissions, [PermissionScope.OPERATION_REQUEST]);
 
     const { transactionHash } = await this.client.requestOperation({ operationDetails: params });
diff --git a/packages/taquito-beacon-wallet/src/version.ts b/packages/taquito-beacon-wallet/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-beacon-wallet/src/version.ts
+++ b/packages/taquito-beacon-wallet/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-contracts-library/package.json b/packages/taquito-contracts-library/package.json
index d3f25a610d..e2043a29c4 100644
--- a/packages/taquito-contracts-library/package.json
+++ b/packages/taquito-contracts-library/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/contracts-library",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Can be used as an extension on the TezosToolkit to provide contracts data",
   "keywords": [
     "tezos"
@@ -67,10 +67,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-contracts-library/src/version.ts b/packages/taquito-contracts-library/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-contracts-library/src/version.ts
+++ b/packages/taquito-contracts-library/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-core/package.json b/packages/taquito-core/package.json
index 5131b41f99..914e76b44f 100644
--- a/packages/taquito-core/package.json
+++ b/packages/taquito-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/core",
-  "version": "19.1.0",
+  "version": "19.2.1",
   "description": "Classes, interfaces, and types shared across Taquito packages",
   "keywords": [
     "tezos",
diff --git a/packages/taquito-core/src/version.ts b/packages/taquito-core/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-core/src/version.ts
+++ b/packages/taquito-core/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-http-utils/package.json b/packages/taquito-http-utils/package.json
index 7e090bea79..f456826318 100644
--- a/packages/taquito-http-utils/package.json
+++ b/packages/taquito-http-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/http-utils",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "",
   "keywords": [
     "tezos"
@@ -58,7 +58,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
+    "@taquito/core": "^19.2.1",
     "node-fetch": "^2.7.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-http-utils/src/version.ts b/packages/taquito-http-utils/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-http-utils/src/version.ts
+++ b/packages/taquito-http-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-ledger-signer/package.json b/packages/taquito-ledger-signer/package.json
index d57c0fc3a7..e501110b3f 100644
--- a/packages/taquito-ledger-signer/package.json
+++ b/packages/taquito-ledger-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/ledger-signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Ledger signer provider",
   "keywords": [
     "tezos",
@@ -59,9 +59,9 @@
   "dependencies": {
     "@ledgerhq/hw-transport": "^6.30.5",
     "@stablelib/blake2b": "^1.0.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "buffer": "^6.0.3"
   },
   "devDependencies": {
diff --git a/packages/taquito-ledger-signer/src/version.ts b/packages/taquito-ledger-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-ledger-signer/src/version.ts
+++ b/packages/taquito-ledger-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-local-forging/package.json b/packages/taquito-local-forging/package.json
index 9c28876742..9517bf00d4 100644
--- a/packages/taquito-local-forging/package.json
+++ b/packages/taquito-local-forging/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/local-forging",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provide local forging functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -67,12 +67,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
-    "@taquito/rpc": "^19.2.0",
+    "@taquito/rpc": "^19.2.1",
     "@types/bluebird": "^3.5.40",
     "@types/estree": "^1.0.2",
     "@types/jest": "^29.5.5",
diff --git a/packages/taquito-local-forging/src/version.ts b/packages/taquito-local-forging/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-local-forging/src/version.ts
+++ b/packages/taquito-local-forging/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-michel-codec/pack-test-tool/package.json b/packages/taquito-michel-codec/pack-test-tool/package.json
index 906642aef2..c9ebc97f9e 100644
--- a/packages/taquito-michel-codec/pack-test-tool/package.json
+++ b/packages/taquito-michel-codec/pack-test-tool/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pack-test-tool",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Generate pack test data via Tezos RPC",
   "main": "pack-test-tool.js",
   "private": true,
@@ -8,7 +8,7 @@
   "author": "Eugene Zagidullin <eugene@ecadlabs.com>",
   "license": "Apache-2.0",
   "dependencies": {
-    "@taquito/rpc": "^19.2.0",
+    "@taquito/rpc": "^19.2.1",
     "yargs": "^17.7.2"
   }
 }
diff --git a/packages/taquito-michel-codec/package.json b/packages/taquito-michel-codec/package.json
index e48a5cb7ab..367d4c5ec1 100644
--- a/packages/taquito-michel-codec/package.json
+++ b/packages/taquito-michel-codec/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michel-codec",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Michelson parser/validator/formatter",
   "keywords": [
     "tezos",
@@ -66,7 +66,7 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0"
+    "@taquito/core": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-michel-codec/src/version.ts b/packages/taquito-michel-codec/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-michel-codec/src/version.ts
+++ b/packages/taquito-michel-codec/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-michelson-encoder/package.json b/packages/taquito-michelson-encoder/package.json
index 719ec9aa56..eda1273735 100644
--- a/packages/taquito-michelson-encoder/package.json
+++ b/packages/taquito-michelson-encoder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/michelson-encoder",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -67,9 +67,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "fast-json-stable-stringify": "^2.1.0"
   },
diff --git a/packages/taquito-michelson-encoder/src/version.ts b/packages/taquito-michelson-encoder/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-michelson-encoder/src/version.ts
+++ b/packages/taquito-michelson-encoder/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-remote-signer/package.json b/packages/taquito-remote-signer/package.json
index 84eb096103..760dc35836 100644
--- a/packages/taquito-remote-signer/package.json
+++ b/packages/taquito-remote-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/remote-signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Remote signer provider",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "typedarray-to-buffer": "^4.0.0"
   },
   "devDependencies": {
diff --git a/packages/taquito-remote-signer/src/version.ts b/packages/taquito-remote-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-remote-signer/src/version.ts
+++ b/packages/taquito-remote-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-rpc/package.json b/packages/taquito-rpc/package.json
index 223f14420a..b167d90c30 100644
--- a/packages/taquito-rpc/package.json
+++ b/packages/taquito-rpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/rpc",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provides low level methods, and types to invoke RPC calls from a Nomadic Tezos RPC node",
   "keywords": [
     "tezos",
@@ -66,9 +66,9 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2"
   },
   "devDependencies": {
diff --git a/packages/taquito-rpc/src/version.ts b/packages/taquito-rpc/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-rpc/src/version.ts
+++ b/packages/taquito-rpc/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-sapling/package.json b/packages/taquito-sapling/package.json
index e8d7053bcc..b40c5126a6 100644
--- a/packages/taquito-sapling/package.json
+++ b/packages/taquito-sapling/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/sapling",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Allows reading and preparing sapling transactions",
   "keywords": [
     "tezos",
@@ -68,10 +68,10 @@
     "@airgap/sapling-wasm": "0.0.9",
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/random": "^1.0.2",
-    "@taquito/core": "^19.1.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "bip39": "3.1.0",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-sapling/src/version.ts b/packages/taquito-sapling/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-sapling/src/version.ts
+++ b/packages/taquito-sapling/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-signer/package.json b/packages/taquito-signer/package.json
index 12c9f076bc..878538cb75 100644
--- a/packages/taquito-signer/package.json
+++ b/packages/taquito-signer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/signer",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Provide signing functionality to be with taquito",
   "keywords": [
     "tezos",
@@ -72,9 +72,9 @@
     "@stablelib/nacl": "^1.0.4",
     "@stablelib/pbkdf2": "^1.0.1",
     "@stablelib/sha512": "^1.0.1",
-    "@taquito/core": "^19.1.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "@types/bn.js": "^5.1.2",
     "bip39": "3.1.0",
     "elliptic": "^6.5.4",
diff --git a/packages/taquito-signer/src/version.ts b/packages/taquito-signer/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-signer/src/version.ts
+++ b/packages/taquito-signer/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-timelock/package.json b/packages/taquito-timelock/package.json
index 633a2f4039..7daef7890a 100644
--- a/packages/taquito-timelock/package.json
+++ b/packages/taquito-timelock/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/timelock",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "TypeScript implementation of the Timelock feature in Tezos",
   "main": "./dist/taquito-timelock.umd.js",
   "module": "./dist/taquito-timelock.es6.js",
@@ -68,9 +68,9 @@
     "big-integer": "^1.6.52"
   },
   "devDependencies": {
-    "@taquito/signer": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/signer": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "@types/node": "^20.11.20",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
diff --git a/packages/taquito-timelock/src/version.ts b/packages/taquito-timelock/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-timelock/src/version.ts
+++ b/packages/taquito-timelock/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-tzip12/package.json b/packages/taquito-tzip12/package.json
index 8f4a4da481..ca4069b535 100644
--- a/packages/taquito-tzip12/package.json
+++ b/packages/taquito-tzip12/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip12",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Tzip12",
   "keywords": [
     "tezos",
@@ -62,10 +62,10 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/tzip16": "^19.2.0"
+    "@taquito/core": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/tzip16": "^19.2.1"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.40",
diff --git a/packages/taquito-tzip12/src/version.ts b/packages/taquito-tzip12/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-tzip12/src/version.ts
+++ b/packages/taquito-tzip12/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-tzip16/package.json b/packages/taquito-tzip16/package.json
index ed1a83b950..fb2d45bfe0 100644
--- a/packages/taquito-tzip16/package.json
+++ b/packages/taquito-tzip16/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/tzip16",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "Tzip16",
   "keywords": [
     "tezos",
@@ -61,12 +61,12 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/taquito": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/taquito": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "crypto-js": "^4.2.0"
   },
diff --git a/packages/taquito-tzip16/src/version.ts b/packages/taquito-tzip16/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-tzip16/src/version.ts
+++ b/packages/taquito-tzip16/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito-utils/package.json b/packages/taquito-utils/package.json
index b40b29c4af..39bda3d327 100644
--- a/packages/taquito-utils/package.json
+++ b/packages/taquito-utils/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/utils",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "converts michelson data and types into convenient JS/TS objects",
   "keywords": [
     "tezos",
@@ -64,7 +64,7 @@
   "dependencies": {
     "@stablelib/blake2b": "^1.0.1",
     "@stablelib/ed25519": "^1.0.3",
-    "@taquito/core": "^19.1.0",
+    "@taquito/core": "^19.2.1",
     "@types/bs58check": "^2.1.0",
     "bignumber.js": "^9.1.2",
     "blakejs": "^1.2.1",
diff --git a/packages/taquito-utils/src/version.ts b/packages/taquito-utils/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito-utils/src/version.ts
+++ b/packages/taquito-utils/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/packages/taquito/README.md b/packages/taquito/README.md
index ccbab63416..36247aa85c 100644
--- a/packages/taquito/README.md
+++ b/packages/taquito/README.md
@@ -7,7 +7,7 @@ The `@taquito/taquito` package contains higher-level functionality that builds u
 ## CDN Bundle
 
 ```html
-<script src="https://unpkg.com/@taquito/taquito@19.2.0/dist/taquito.min.js"
+<script src="https://unpkg.com/@taquito/taquito@19.2.1/dist/taquito.min.js"
 crossorigin="anonymous" integrity="sha384-IxvP0ECHi5oqLyz94wF85pU9+ktcsL1HHtA42MITxZsGbsUMEu/g+0Vkjj5vqiMR"></script>
 ```
 
diff --git a/packages/taquito/assets-manifest.json b/packages/taquito/assets-manifest.json
index 2cda686ec5..b7f1f80a20 100644
--- a/packages/taquito/assets-manifest.json
+++ b/packages/taquito/assets-manifest.json
@@ -5,6 +5,6 @@
   },
   "main.js": {
     "src": "dist/taquito.min.js",
-    "integrity": "sha256-SBnOaGNmGpU2dRZi5x2Fql8ttF2HYMVJSrEn0FUrgC8= sha384-yfyuDWhL5IMuPidvT0J7Mc2a2JI8d3XEhSRvvFKN94+UVDQVjWYqqHywNO+uxa4J sha512-Xi8RDZZPlKx8kx/yJvNXokVQHpdr/0bzb+h2t2HLDayVebG2pjHqqNlYhedGRx/2My9DjVNCPJJIELGVrVCp8A=="
+    "integrity": "sha256-3JZSLgFKNJToRxyfNaSAhSlCvN/doCnV17xo8BAPM4U= sha384-TC1SFqSdiCy1bGvfza9eovd+gju0nadTBvBKfme7o753Wkw5vAPTuthB9HdtOtxH sha512-7uUujjrPUhQ0F3dIPFEPmB3YBA7og2xPdz5BfhYDzsVzjXEvR+/plvqKBOe7z4pmltinwXXc8Le1Fiiwz6TVZA=="
   }
 }
\ No newline at end of file
diff --git a/packages/taquito/package.json b/packages/taquito/package.json
index 268d2ebeec..764ba58b03 100644
--- a/packages/taquito/package.json
+++ b/packages/taquito/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@taquito/taquito",
-  "version": "19.2.0",
+  "version": "19.2.1",
   "description": "High level functionality that builds upon the other packages in the Tezos Typescript Library Suite.",
   "keywords": [
     "tezos",
@@ -77,13 +77,13 @@
     ]
   },
   "dependencies": {
-    "@taquito/core": "^19.1.0",
-    "@taquito/http-utils": "^19.2.0",
-    "@taquito/local-forging": "^19.2.0",
-    "@taquito/michel-codec": "^19.2.0",
-    "@taquito/michelson-encoder": "^19.2.0",
-    "@taquito/rpc": "^19.2.0",
-    "@taquito/utils": "^19.2.0",
+    "@taquito/core": "^19.2.1",
+    "@taquito/http-utils": "^19.2.1",
+    "@taquito/local-forging": "^19.2.1",
+    "@taquito/michel-codec": "^19.2.1",
+    "@taquito/michelson-encoder": "^19.2.1",
+    "@taquito/rpc": "^19.2.1",
+    "@taquito/utils": "^19.2.1",
     "bignumber.js": "^9.1.2",
     "rxjs": "^7.8.1"
   },
diff --git a/packages/taquito/src/version.ts b/packages/taquito/src/version.ts
index dd87766ac7..4204ba8f29 100644
--- a/packages/taquito/src/version.ts
+++ b/packages/taquito/src/version.ts
@@ -1,5 +1,5 @@
 // IMPORTANT: THIS FILE IS AUTO GENERATED! DO NOT MANUALLY EDIT OR CHECKIN!
 export const VERSION = {
-  commitHash: '79be4991733872e1a9d0b3b9159462100349421a',
-  version: '19.2.0',
+  commitHash: '2e05f6f865be17a1b367b284542b24ffa9823271',
+  version: '19.2.1',
 };
diff --git a/website/package-lock.json b/website/package-lock.json
index a72c7cb37d..bfdbed87e5 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -69,17 +69,17 @@
     },
     "../packages/taquito": {
       "name": "@taquito/taquito",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/local-forging": "^19.2.0",
-        "@taquito/michel-codec": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/local-forging": "^19.2.1-beta.2",
+        "@taquito/michel-codec": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "rxjs": "^7.8.1"
       },
@@ -127,12 +127,12 @@
     },
     "../packages/taquito-beacon-wallet": {
       "name": "@taquito/beacon-wallet",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@airgap/beacon-dapp": "^4.2.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0"
+        "@airgap/beacon-dapp": "^4.2.2",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -172,7 +172,7 @@
     },
     "../packages/taquito-core": {
       "name": "@taquito/core",
-      "version": "19.1.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "json-stringify-safe": "^5.0.1"
@@ -188,10 +188,10 @@
     },
     "../packages/taquito-http-utils": {
       "name": "@taquito/http-utils",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1-beta.2",
         "node-fetch": "^2.7.0"
       },
       "devDependencies": {
@@ -229,14 +229,14 @@
     },
     "../packages/taquito-ledger-signer": {
       "name": "@taquito/ledger-signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@ledgerhq/hw-transport": "^6.30.5",
         "@stablelib/blake2b": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "buffer": "^6.0.3"
       },
       "devDependencies": {
@@ -273,10 +273,10 @@
     },
     "../packages/taquito-michel-codec": {
       "name": "@taquito/michel-codec",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "MIT",
       "dependencies": {
-        "@taquito/core": "^19.1.0"
+        "@taquito/core": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -306,12 +306,12 @@
     },
     "../packages/taquito-michelson-encoder": {
       "name": "@taquito/michelson-encoder",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "fast-json-stable-stringify": "^2.1.0"
       },
@@ -348,15 +348,15 @@
     },
     "../packages/taquito-remote-signer": {
       "name": "@taquito/remote-signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "typedarray-to-buffer": "^4.0.0"
       },
       "devDependencies": {
@@ -393,12 +393,12 @@
     },
     "../packages/taquito-rpc": {
       "name": "@taquito/rpc",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2"
       },
       "devDependencies": {
@@ -434,7 +434,7 @@
     },
     "../packages/taquito-signer": {
       "name": "@taquito/signer",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
@@ -443,9 +443,9 @@
         "@stablelib/nacl": "^1.0.4",
         "@stablelib/pbkdf2": "^1.0.1",
         "@stablelib/sha512": "^1.0.1",
-        "@taquito/core": "^19.1.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "@types/bn.js": "^5.1.2",
         "bip39": "3.1.0",
         "elliptic": "^6.5.4",
@@ -488,13 +488,13 @@
     },
     "../packages/taquito-tzip12": {
       "name": "@taquito/tzip12",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/tzip16": "^19.2.0"
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/tzip16": "^19.2.1-beta.2"
       },
       "devDependencies": {
         "@types/bluebird": "^3.5.40",
@@ -530,15 +530,15 @@
     },
     "../packages/taquito-tzip16": {
       "name": "@taquito/tzip16",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
-        "@taquito/core": "^19.1.0",
-        "@taquito/http-utils": "^19.2.0",
-        "@taquito/michelson-encoder": "^19.2.0",
-        "@taquito/rpc": "^19.2.0",
-        "@taquito/taquito": "^19.2.0",
-        "@taquito/utils": "^19.2.0",
+        "@taquito/core": "^19.2.1-beta.2",
+        "@taquito/http-utils": "^19.2.1-beta.2",
+        "@taquito/michelson-encoder": "^19.2.1-beta.2",
+        "@taquito/rpc": "^19.2.1-beta.2",
+        "@taquito/taquito": "^19.2.1-beta.2",
+        "@taquito/utils": "^19.2.1-beta.2",
         "bignumber.js": "^9.1.2",
         "crypto-js": "^4.2.0"
       },
@@ -577,12 +577,12 @@
     },
     "../packages/taquito-utils": {
       "name": "@taquito/utils",
-      "version": "19.2.0",
+      "version": "19.2.1-beta.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@stablelib/blake2b": "^1.0.1",
         "@stablelib/ed25519": "^1.0.3",
-        "@taquito/core": "^19.1.0",
+        "@taquito/core": "^19.2.1-beta.2",
         "@types/bs58check": "^2.1.0",
         "bignumber.js": "^9.1.2",
         "blakejs": "^1.2.1",