@ledgerhq/hw-app-eth 7.0.0-nightly.2 → 7.0.0-nightly.20251120135143

package/tests/Eth.unit.test.ts

@@ -1,8 +1,11 @@
 import nock from "nock";
 import axios from "axios";
 import { fail } from "assert";
-import { ethers } from "ethers";
 import BigNumber from "bignumber.js";
+import { Interface } from "@ethersproject/abi";
+import { parseUnits } from "@ethersproject/units";
+import { BigNumber as EthersBigNumber } from "@ethersproject/bignumber";
+import { serialize as serializeTransaction } from "@ethersproject/transactions";
 import { openTransportReplayer, RecordStore } from "@ledgerhq/hw-transport-mocker";
 import Eth, { ledgerService } from "../src/Eth";
 import CAL_ETH from "./fixtures/SignatureCALEth";
@@ -36,18 +39,16 @@ describe("Eth app biding", () => {
       const eth = new Eth(transport);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
-            value: ethers.BigNumber.from("1"),
-            gasLimit: ethers.BigNumber.from("21000"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("400000000"),
-            maxFeePerGas: ethers.BigNumber.from("52925678988"),
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
+          value: EthersBigNumber.from("1"),
+          gasLimit: EthersBigNumber.from("21000"),
+          maxPriorityFeePerGas: EthersBigNumber.from("400000000"),
+          maxFeePerGas: EthersBigNumber.from("52925678988"),
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true },
         true,
       );
@@ -70,32 +71,30 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
         => e00a000068054d415449437d1afa7b718fb893db30a3abc0cfc608aacfebb000000012000000013044022000d8fa7b6e409a0dc55723ba975179e7d1181d1fc78fccbece4e5a264814366a02203927d84a710c8892d02f7386ad20147c75fba4bdd486b0256ecd005770a7ca5b
-        <= 9000
+        <= 009000
         => e004000085058000002c8000003c80000000000000000000000002f86d01808420c85580850dfe94e19e82fd25947d1afa7b718fb893db30a3abc0cfc608aacfebb080b844a9059cbb000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000000000000000000de0b6b3a7640000c0
         <= 00089a7656b73c72721952d9102dcb608b5f8e9e12e8dfa5d546743e3aa5ff99e24adc7e77795383bb1df13c572db4abfbce86ee4bbe3eaf9b3b50e5b5524793829000
         `),
       );
 
       const eth = new Eth(transport);
-      const contract = new ethers.utils.Interface(ERC20_ABI);
+      const contract = new Interface(ERC20_ABI);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
-            value: ethers.BigNumber.from("0"),
-            gasLimit: ethers.BigNumber.from("64805"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("550000000"),
-            maxFeePerGas: ethers.BigNumber.from("60105744798"),
-            data: contract.encodeFunctionData("transfer", [
-              "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
-              ethers.utils.parseUnits("1", 18),
-            ]),
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0",
+          value: EthersBigNumber.from("0"),
+          gasLimit: EthersBigNumber.from("64805"),
+          maxPriorityFeePerGas: EthersBigNumber.from("550000000"),
+          maxFeePerGas: EthersBigNumber.from("60105744798"),
+          data: contract.encodeFunctionData("transfer", [
+            "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
+            parseUnits("1", 18),
+          ]),
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true },
         true,
       );
@@ -138,37 +137,33 @@ describe("Eth app biding", () => {
         <= 9000
         => e01400007001010752617269626c6560f80121c31a0d46b5279700f9df786054aa5ee500000000000000010101473045022067d4254b89367a7e35fe7507001d6c8a0844a35aa4839c94a4724de1f332382d022100b9353df1f6f69feb9970946603723657f5682e0cac1b480a2beb2ecba10c872f
         <= 9000
-        => e004000096058000002c8000003c80000000000000000000000002f88e018084448b9b80851278cdd392830238699460f80121c31a0d46b5279700f9df786054aa5ee580b86442842e0e0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000
-        <= 9000
-        => e004800010000000000000000000000000112999c0
+        => e0040000a6058000002c8000003c80000000000000000000000002f88e018084448b9b80851278cdd392830238699460f80121c31a0d46b5279700f9df786054aa5ee580b86442842e0e0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000000000000000000000000000112999c0
         <= 0187ce0994bbdfdfd93990a5afc03d7cf70a14c9efaabac810724a41f6375f54236c0056a02dc07650b1e68f86b9f18a92ff689a9eddf710bd9f76739260fff1939000
         `),
       );
 
       const eth = new Eth(transport);
-      const contract = new ethers.utils.Interface(ERC721_ABI);
+      const contract = new Interface(ERC721_ABI);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: contractAddr,
-            value: ethers.BigNumber.from("0"),
-            gasLimit: ethers.BigNumber.from("145513"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("1150000000"),
-            maxFeePerGas: ethers.BigNumber.from("79336166290"),
-            data: contract.encodeFunctionData(
-              contract.getFunction("safeTransferFrom(address,address,uint256)"),
-              [
-                "0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d",
-                "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
-                "1124761",
-              ],
-            ),
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: contractAddr,
+          value: EthersBigNumber.from("0"),
+          gasLimit: EthersBigNumber.from("145513"),
+          maxPriorityFeePerGas: EthersBigNumber.from("1150000000"),
+          maxFeePerGas: EthersBigNumber.from("79336166290"),
+          data: contract.encodeFunctionData(
+            contract.getFunction("safeTransferFrom(address,address,uint256)"),
+            [
+              "0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d",
+              "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
+              "1124761",
+            ],
+          ),
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true },
         true,
       );
@@ -211,36 +206,33 @@ describe("Eth app biding", () => {
         <= 9000
         => e01400007001010752617269626c65d07dc4262bcdbf85190c01c996b4c06a461d243000000000000000010101473045022100fddd2264ca0eb3cc8a588d82b41edf9d262145a0ca1f08caab5bb6a4eac34a9e0220602b57cabdc40bbeb3a46a5d362ac2544124c9806aee196a87a51f61bb7e9230
         <= 9000
-        => e004000096058000002c8000003c80000000000000000000000002f8ee01808414dc9380850d54eb0ea883010ab494d07dc4262bcdbf85190c01c996b4c06a461d243080b8c4f242432a0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000
+        => e0040000ff058000002c8000003c80000000000000000000000002f8ee01808414dc9380850d54eb0ea883010ab494d07dc4262bcdbf85190c01c996b4c06a461d243080b8c4f242432a0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f861000000000000000000000000000000000000000000000000000000000004041c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000
         <= 9000
-        => e00480007000000000000000000000000004041c000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000000c0
+        => e004800007000000000000c0
         <= 016467047c39c2c3db9dbe8aa03802c80830beb659f0eed7470735098f2c44cfae7b2aa36e2f31c6e0d37a00b93789ef4eef4fd016dd3b92fa893e7e741a152be99000
         `),
       );
-
       const eth = new Eth(transport);
-      const contract = new ethers.utils.Interface(ERC1155_ABI);
+      const contract = new Interface(ERC1155_ABI);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: contractAddr,
-            value: ethers.BigNumber.from("0"),
-            gasLimit: ethers.BigNumber.from("68276"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("350000000"),
-            maxFeePerGas: ethers.BigNumber.from("57259265704"),
-            data: contract.encodeFunctionData("safeTransferFrom", [
-              "0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d",
-              "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
-              "263196",
-              "1",
-              "0x",
-            ]),
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: contractAddr,
+          value: EthersBigNumber.from("0"),
+          gasLimit: EthersBigNumber.from("68276"),
+          maxPriorityFeePerGas: EthersBigNumber.from("350000000"),
+          maxFeePerGas: EthersBigNumber.from("57259265704"),
+          data: contract.encodeFunctionData("safeTransferFrom", [
+            "0x6cBCD73CD8e8a42844662f0A0e76D7F79Afd933d",
+            "0xb0b5b0106d69fe64545a60a68c014f7570d3f861",
+            "263196",
+            "1",
+            "0x",
+          ]),
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true },
         true,
       );
@@ -267,63 +259,55 @@ describe("Eth app biding", () => {
         => e012000068085061726173776170def171fe48cf0115b1d80b88dc8eab59176fee5754e3f31b3045022100ec8e69d23371437ce5b5f1d894b836c036748e2fabf52fb069c34a9d0ba8704a022013e761d81c26ece4cb0ea385813699b7e646354d3404ed55f4bf068db02dda9a
         <= 9000
         => e00a000068054d415449437d1afa7b718fb893db30a3abc0cfc608aacfebb000000012000000013044022000d8fa7b6e409a0dc55723ba975179e7d1181d1fc78fccbece4e5a264814366a02203927d84a710c8892d02f7386ad20147c75fba4bdd486b0256ecd005770a7ca5b
-        <= 9000
+        <= 009000
         => e00a000067034441496b175474e89094c44da98b954eedeac495271d0f00000012000000013045022100b3aa979633284eb0f55459099333ab92cf06fdd58dc90e9c070000c8e968864c02207b10ec7d6609f51dda53d083a6e165a0abf3a77e13250e6f260772809b49aff5
+        <= 019000
+        => e0040000ff058000002c8000003c80000000000000000000000002f9048f018084448b9b8085143fc44a5883048f8b94def171fe48cf0115b1d80b88dc8eab59176fee5780b9046454e3f31b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb00000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000014655db2d8c71619000000000000000000000000000000000000000000000000
         <= 9000
-        => e004000096058000002c8000003c80000000000000000000000002f9048f018084448b9b8085143fc44a5883048f8b94def171fe48cf0115b1d80b88dc8eab59176fee5780b9046454e3f31b00000000000000000000000000000000000000000000000000000000000000200000000000000000000000007d1afa7b718fb893db30a3abc0cfc608aacfebb00000000000000000000000006b1754
-        <= 9000
-        => e00480009674e89094c44da98b954eedeac495271d0f0000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000014655db2d8c71619000000000000000000000000000000000000000000000000147f9aa1bc47718c00000000000000000000000000000000000000000000000000000000000001e00000000000
-        <= 9000
-        => e004800096000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000558247e365be655f9144e1a0140d79
-        <= 9000
-        => e0048000963984372ef3010000000000000000000000000000000000000000000000000000000000405f000000000000000000000000000000000000000000000000000000000000042000000000000000000000000000000000000000000000000000000000640be3823d2fae4b5ec240cd871aa6b675e99899000000000000000000000000000000000000000000000000000000000000000000
-        <= 9000
-        => e004800096000000000000000000000000000001000000000000000000000000e592427a0aece92de3edee1f18e0157c058615640000000000000000000000000000000000000000000000000000000000000124c04b8d59000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000
+        => e0048000ff147f9aa1bc47718c00000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000220000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000003e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000558247e365be655f9144e1a0140d793984372ef3010000000000000000000000000000000000000000000000000000000000405f0000000000000000000000000000000000000000000000
         <= 9000
-        => e004800096000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee5700000000000000000000000000000000000000000000000000000000640b9d320000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000
+        => e0048000ff00000000000000042000000000000000000000000000000000000000000000000000000000640be3823d2fae4b5ec240cd871aa6b675e99899000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000e592427a0aece92de3edee1f18e0157c058615640000000000000000000000000000000000000000000000000000000000000124c04b8d59000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000def171fe48cf
         <= 9000
-        => e0048000960000000000002b7d1afa7b718fb893db30a3abc0cfc608aacfebb00027106b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000
+        => e0048000ff0115b1d80b88dc8eab59176fee5700000000000000000000000000000000000000000000000000000000640b9d320000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002b7d1afa7b718fb893db30a3abc0cfc608aacfebb00027106b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         <= 9000
-        => e00480008e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0
+        => e0048000ac000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000124000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0
         <= 00775aed341ee9f0a0d0c0d724e242f9def19c09df02d1c474bc5750c86b952f5535bd98bc4a6482a895e94cd5ca9351ec1daeb955251a35dc8c2fb86851bf49189000
         `),
       );
 
       const eth = new Eth(transport);
-      const contract = new ethers.utils.Interface(PARASWAP_ABI);
+      const contract = new Interface(PARASWAP_ABI);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: transactionContracts.paraswap,
-            value: ethers.BigNumber.from("0"),
-            gasLimit: ethers.BigNumber.from("298891"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("1150000000"),
-            maxFeePerGas: ethers.BigNumber.from("86969174616"),
-            data: contract.encodeFunctionData("simpleSwap", [
-              [
-                "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0", // MATIC
-                "0x6B175474E89094C44Da98b954EedeAC495271d0F", // DAI
-                "0x0de0b6b3a7640000", // 1 MATIC
-                "0x14655db2d8c71619", // ~1.469 DAI
-                "0x147f9aa1bc47718c", // EXPECT 1.477 DAI
-                ["0xE592427A0AEce92De3Edee1F18E0157C05861564"],
-                "0xc04b8d59000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee5700000000000000000000000000000000000000000000000000000000640b9d320000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002b7d1afa7b718fb893db30a3abc0cfc608aacfebb00027106b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000",
-                ["0x00", "0x0124"],
-                ["0x00"],
-                "0x0000000000000000000000000000000000000000",
-                "0x558247e365be655f9144e1a0140D793984372Ef3",
-                "0x010000000000000000000000000000000000000000000000000000000000405f",
-                "0x",
-                "0x640be382",
-                "0x3d2fae4b5ec240cd871aa6b675e99899",
-              ],
-            ]),
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: transactionContracts.paraswap,
+          value: EthersBigNumber.from("0"),
+          gasLimit: EthersBigNumber.from("298891"),
+          maxPriorityFeePerGas: EthersBigNumber.from("1150000000"),
+          maxFeePerGas: EthersBigNumber.from("86969174616"),
+          data: contract.encodeFunctionData("simpleSwap", [
+            [
+              "0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0", // MATIC
+              "0x6B175474E89094C44Da98b954EedeAC495271d0F", // DAI
+              "0x0de0b6b3a7640000", // 1 MATIC
+              "0x14655db2d8c71619", // ~1.469 DAI
+              "0x147f9aa1bc47718c", // EXPECT 1.477 DAI
+              ["0xE592427A0AEce92De3Edee1F18E0157C05861564"],
+              "0xc04b8d59000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000def171fe48cf0115b1d80b88dc8eab59176fee5700000000000000000000000000000000000000000000000000000000640b9d320000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002b7d1afa7b718fb893db30a3abc0cfc608aacfebb00027106b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000",
+              ["0x00", "0x0124"],
+              ["0x00"],
+              "0x0000000000000000000000000000000000000000",
+              "0x558247e365be655f9144e1a0140D793984372Ef3",
+              "0x010000000000000000000000000000000000000000000000000000000000405f",
+              "0x",
+              "0x640be382",
+              "0x3d2fae4b5ec240cd871aa6b675e99899",
+            ],
+          ]),
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true, uniswapV3: true },
         true,
       );
@@ -349,42 +333,32 @@ describe("Eth app biding", () => {
         <= 9000
         => e00a0000680457455448c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000012000000013045022100b47ee8551c15a2cf681c649651e987d7e527c481d27c38da1f971a8242792bd3022069c3f688ac5493a23dab5798e3c9b07484765069e1d4be14321aae4d92cb8cbe
         <= 009000
-        => e00a0000680457455448c02aaa39b223fe8d0a0e5c4f27ead9083c756cc200000012000000013045022100b47ee8551c15a2cf681c649651e987d7e527c481d27c38da1f971a8242792bd3022069c3f688ac5493a23dab5798e3c9b07484765069e1d4be14321aae4d92cb8cbe
-        <= 019000
-        => e004000096058000002c8000003c80000000000000000000000002f9044f018084448b9b8085143fc44a5883048f8b943fc91a3afd70395cd496c647d5a6cc9d4b2b7fad80b904243593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000
+        => e0040000ff058000002c8000003c80000000000000000000000002f9044f018084448b9b8085143fc44a5883048f8b943fc91a3afd70395cd496c647d5a6cc9d4b2b7fad80b904243593564c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000669ba25a00000000000000000000000000000000000000000000000000000000000000030a010c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         <= 9000
-        => e00480009600000000000000000000000000669ba25a00000000000000000000000000000000000000000000000000000000000000030a010c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000600000000000
+        => e0048000ff0000000000000003000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000016000000000000000000000000055747be9f9f5beb232ad59fe7af013b81d95fd5e000000000000000000000000ffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000000000000066c32ea60000000000000000000000000000000000000000000000
         <= 9000
-        => e0048000960000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000016000000000000000000000000055747be9f9f5beb232ad59fe7af013b81d95fd5e000000000000000000000000ffffffffffffffffffffffffffffff
+        => e0048000ff000000000000000006000000000000000000000000ef1c6e67703c7bd7107eed8303fbe6ec2554bf6b00000000000000000000000000000000000000000000000000000000669ba25a00000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000413cbf00ab90b6d1b17401cbf49e00c40f98bcb3f39461ca65e26009f9e9f77029279a4587efa2d792ea61ede56e0fbd7c1305007bc59d09bc60eaba46efa23edd1c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
         <= 9000
-        => e004800096ffffffffff0000000000000000000000000000000000000000000000000000000066c32ea60000000000000000000000000000000000000000000000000000000000000006000000000000000000000000ef1c6e67703c7bd7107eed8303fbe6ec2554bf6b00000000000000000000000000000000000000000000000000000000669ba25a0000000000000000000000000000000000
+        => e0048000ff0000000000000000010000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000233a3559d9da00000000000000000000000000000000000000000000000062e76d8ff4b926e800000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002bc02aaa39b223fe8d0a0e5c4f27ead9083c756cc200271055747be9f9f5beb232ad59fe7af013b81d95fd5e00000000000000000000
         <= 9000
-        => e0048000960000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000413cbf00ab90b6d1b17401cbf49e00c40f98bcb3f39461ca65e26009f9e9f77029279a4587efa2d792ea61ede56e0fbd7c1305007bc59d09bc60eaba46efa23edd1c0000000000000000000000000000000000000000000000000000000000000000000000000000
-        <= 9000
-        => e0048000960000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000233a3559d9da00000000000000000000000000000000000000000000000062e76d8ff4b926e80000000000000000000000000000000000000000000000000000000000000
-        <= 9000
-        => e0048000960000a00000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002bc02aaa39b223fe8d0a0e5c4f27ead9083c756cc200271055747be9f9f5beb232ad59fe7af013b81d95fd5e00000000000000000000000000000000000000000000000000000000000000000000000000000000
-        <= 9000
-        => e00480004e0000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000233a3559d9da000c0
+        => e00480006c0000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000233a3559d9da000c0
         <= 00a42d6ead5539eb1ac552b65b46df4e8fd87c37da54a280d33dc7a78992b56bb02244776870b31cfb50ea71c0ea31a30e6e513bd9766f74d61dc52b523ac256879000
         `),
       );
       const eth = new Eth(transport);
       const result = await eth.clearSignTransaction(
         "44'/60'/0'/0/0",
-        ethers.utils
-          .serializeTransaction({
-            to: transactionContracts.uniswapUniversaRouter,
-            value: ethers.BigNumber.from("0"),
-            gasLimit: ethers.BigNumber.from("298891"),
-            maxPriorityFeePerGas: ethers.BigNumber.from("1150000000"),
-            maxFeePerGas: ethers.BigNumber.from("86969174616"),
-            data: transactionData.uniswap["permit2>swap-out-v3>unwrap"],
-            chainId: 1,
-            nonce: 0,
-            type: 2,
-          })
-          .substring(2),
+        serializeTransaction({
+          to: transactionContracts.uniswapUniversaRouter,
+          value: EthersBigNumber.from("0"),
+          gasLimit: EthersBigNumber.from("298891"),
+          maxPriorityFeePerGas: EthersBigNumber.from("1150000000"),
+          maxFeePerGas: EthersBigNumber.from("86969174616"),
+          data: transactionData.uniswap["permit2>swap-out-v3>unwrap"],
+          chainId: 1,
+          nonce: 0,
+          type: 2,
+        }).slice(2),
         { erc20: true, externalPlugins: true, nft: true, uniswapV3: true },
         true,
       );
@@ -403,18 +377,16 @@ describe("Eth app biding", () => {
       try {
         await eth.clearSignTransaction(
           "44'/60'/0'/0/0",
-          ethers.utils
-            .serializeTransaction({
-              to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
-              value: ethers.BigNumber.from("1"),
-              gasLimit: ethers.BigNumber.from("21000"),
-              maxPriorityFeePerGas: ethers.BigNumber.from("400000000"),
-              maxFeePerGas: ethers.BigNumber.from("52925678988"),
-              chainId: 1,
-              nonce: 0,
-              type: 2,
-            })
-            .substring(2),
+          serializeTransaction({
+            to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
+            value: EthersBigNumber.from("1"),
+            gasLimit: EthersBigNumber.from("21000"),
+            maxPriorityFeePerGas: EthersBigNumber.from("400000000"),
+            maxFeePerGas: EthersBigNumber.from("52925678988"),
+            chainId: 1,
+            nonce: 0,
+            type: 2,
+          }).slice(2),
           { erc20: true, externalPlugins: true, nft: true },
           true,
         );
@@ -441,18 +413,16 @@ describe("Eth app biding", () => {
       try {
         await eth.clearSignTransaction(
           "44'/60'/0'/0/0",
-          ethers.utils
-            .serializeTransaction({
-              to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
-              value: ethers.BigNumber.from("1"),
-              gasLimit: ethers.BigNumber.from("21000"),
-              maxPriorityFeePerGas: ethers.BigNumber.from("400000000"),
-              maxFeePerGas: ethers.BigNumber.from("52925678988"),
-              chainId: 1,
-              nonce: 0,
-              type: 2,
-            })
-            .substring(2),
+          serializeTransaction({
+            to: "0xB0b5B0106D69fE64545A60A68C014f7570D3F861",
+            value: EthersBigNumber.from("1"),
+            gasLimit: EthersBigNumber.from("21000"),
+            maxPriorityFeePerGas: EthersBigNumber.from("400000000"),
+            maxFeePerGas: EthersBigNumber.from("52925678988"),
+            chainId: 1,
+            nonce: 0,
+            type: 2,
+          }).slice(2),
           { erc20: true, externalPlugins: true, nft: true },
           false,
         );
@@ -479,7 +449,7 @@ describe("Eth app biding", () => {
       const resolution = await ledgerService
         .resolveTransaction(
           tx,
-          {},
+          { staticERC20Signatures: { 1: CAL_ETH } },
           resolutionConfig || { externalPlugins: true, erc20: true, nft: true },
         )
         .catch(e => {
@@ -572,11 +542,11 @@ describe("Eth app biding", () => {
       });
     });
 
-    test("signTransaction", async () => {
+    test("signTransaction with chainId 0 (Legacy before EIP-155)", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00400003e058000002c8000003c800000008000000000000000e8018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a2487400080
-      <= 1b3694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a4009000
+      <= 263694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a4009000
       `),
       );
       const eth = new Eth(transport);
@@ -588,7 +558,7 @@ describe("Eth app biding", () => {
       expect(result).toEqual({
         r: "3694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b",
         s: "30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a400",
-        v: "1b",
+        v: "26",
       });
     });
 
@@ -617,8 +587,8 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a000066035a5258e41d2489571d322189246dafa5ebde1f4699f4980000001200000001304402200ae8634c22762a8ba41d2acb1e068dcce947337c6dd984f13b820d396176952302203306a49d8a6c35b11a61088e1570b3928ca3a0db6bd36f577b5ef87628561ff7
-      <= 9000
-      => e00400008c058000002c8000003c80000000000000000000000002f8740106843b9aca008504a817c80082520894e41d2489571d322189246dafa5ebde1f4699f498872386f26fc10000b844095ea7b3000000000000000000000000221657776846890989a759ba2973e427dff5c9bb0000000000000000000000000000000000000000000000004563918244f40000c0
+      <= 009000
+      => e004000085058000002c8000003c80000000000000000000000002f86d0106843b9aca008504a817c80082520894e41d2489571d322189246dafa5ebde1f4699f49800b844095ea7b3000000000000000000000000221657776846890989a759ba2973e427dff5c9bb0000000000000000000000000000000000000000000000004563918244f40000c0
       <= 00d6814aa5db69de910824b14462af006fde864224c616ab93e30f646e7309a93f0312ac6e580e918ce6e39e5f910cb95ba7b68167f4d71e581dec2495a198ecc09000
       `),
       );
@@ -626,7 +596,7 @@ describe("Eth app biding", () => {
       const result = await signTxWithResolution(
         eth,
         "44'/60'/0'/0/0",
-        "02f8740106843b9aca008504a817c80082520894e41d2489571d322189246dafa5ebde1f4699f498872386f26fc10000b844095ea7b3000000000000000000000000221657776846890989a759ba2973e427dff5c9bb0000000000000000000000000000000000000000000000004563918244f40000c0",
+        "02f86d0106843b9aca008504a817c80082520894e41d2489571d322189246dafa5ebde1f4699f49800b844095ea7b3000000000000000000000000221657776846890989a759ba2973e427dff5c9bb0000000000000000000000000000000000000000000000004563918244f40000c0",
       );
       expect(result).toEqual({
         r: "d6814aa5db69de910824b14462af006fde864224c616ab93e30f646e7309a93f",
@@ -638,9 +608,7 @@ describe("Eth app biding", () => {
     test("signTransaction supports EIP2930", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
-      => e004000096058000002c8000003c80000000000000000000000001f886030685012a05f20082520894b2bb2b958afa2e96dab3f3ce7162b87daea39017872386f26fc1000080f85bf85994de0b295669a9fd93d5f28d9ec85e40f4cb697baef842a00000000000000000000000000000000000000000000000000000000000000003a0000000000000000000000000000000000000000000000000
-      <= 9000
-      => e0048000080000000000000007
+      => e00400009e058000002c8000003c80000000000000000000000001f886030685012a05f20082520894b2bb2b958afa2e96dab3f3ce7162b87daea39017872386f26fc1000080f85bf85994de0b295669a9fd93d5f28d9ec85e40f4cb697baef842a00000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000000000007
       <= 01a74d82400f49d1f9d85f734c22a1648d4ab74bb6367bef54c6abb0936be3d8b77a84a09673394c3c1bd76be05620ee17a2d0ff32837607625efa433cc017854e9000
       `),
       );
@@ -661,114 +629,47 @@ describe("Eth app biding", () => {
      * if 1inch token is popular again
     might need to put this back, starting at line 2
       => e00a0000680531494e4348111111111117dc0aa78b770fa6a738034120c3020000001200000001304402204623e5f1375c54a446157ae8a739204284cf053634b7abd083dc5f5d2675c4e702206ff94b4c84ba9e93f44065c38d7c92506621fa69ba04f767aa58221de8afbf17
-      <= 9000
+      <= 009000
     */
     const paraswapAPDUs =
       `=> e0120000670850617261737761701bd435f3c054b6e901b7b108a0ab7617c808677bcfc0afeb304402201c0cbe69aac517825b3a6eb5e7251e8fd57ff93a43bd3df52c7a841818eda81b022001a10cc326efaee2463fc96e7c29739c308fb8179bd2ac37303662bae4f7705c
   <= 9000
-  => e004000096058000002c8000003c800000000000000000000000f903cd82043d8509c765240083042e73941bd435f3c054b6e901b7b108a0ab7617c808677b80b903a4cfc0afeb000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000000
-  <= 9000
-  => e0048000960000000af10f7eb24f506cfd00000000000000000000000000000000000000000000000002a5b905b3c9fa4c00000000000000000000000000000000000000000000000002baaee8d905020a000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001c000000000000000000000
-  <= 9000
-  => e004800096000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003600000000000000000000000000000000000000000000000000000000000000000
+  => e0040000ff058000002c8000003c800000000000000000000000f903cd82043d8509c765240083042e73941bd435f3c054b6e901b7b108a0ab7617c808677b80b903a4cfc0afeb000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000000000000000af10f7eb24f506cfd00000000000000000000000000000000000000000000000002a5b905b3c9fa4c00000000000000000000000000000000000000000000000002baaee8d905020a0000000000000000000000000000000000000000000000000000000000
   <= 9000
-  => e004800096000000000000000000000000000000000000000000000000000000000000000100000000000000000000000086d3579b043585a97532514016dcf0c2d6c4b6a100000000000000000000000000000000000000000000000000000000000000c499585aac00000000000000000000000000000000000000000000000af10f7eb24f506cfd000000000000000000000000000000000000
+  => e0048000ff00018000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000086d3579b043585a97532514016dcf0c2
   <= 9000
-  => e004800096000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000
+  => e0048000ffd6c4b6a100000000000000000000000000000000000000000000000000000000000000c499585aac00000000000000000000000000000000000000000000000af10f7eb24f506cfd000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee0000000000000000000000000000000000000000000000
   <= 9000
-  => e00480009600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c400000000000000000000000000000000000000000000000000000000000000010000
-  <= 9000
-  => e00480006100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076c65646765723200000000000000000000000000000000000000000000000000018080
+  => e0048000e800000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076c65646765723200000000000000000000000000000000000000000000000000018080
   <= 26d9e62b0b6ae0c18d3d2ecdf20ce7f1c959e0f609b4e73e2d138bbdc3e1e9390012469e2124a8955b5159f670b0333b803a70dd7dc51558a8f7460b27eed77be59000`.toLowerCase();
 
-    test("paraswap", async () => {
-      jest.spyOn(axios, "get").mockImplementation(async uri => {
-        if (uri?.includes("plugins/ethereum.json")) {
-          return {
-            data: ParaswapJSON,
-          };
-        }
-        return null;
-      });
-      const transport = await openTransportReplayer(RecordStore.fromString(paraswapAPDUs));
-      const eth = new Eth(transport);
-      const result = await signTxWithResolution(
-        eth,
-        "44'/60'/0'/0/0",
-        "f903cd82043d8509c765240083042e73941bd435f3c054b6e901b7b108a0ab7617c808677b80b903a4cfc0afeb000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000000000000000af10f7eb24f506cfd00000000000000000000000000000000000000000000000002a5b905b3c9fa4c00000000000000000000000000000000000000000000000002baaee8d905020a000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000086d3579b043585a97532514016dcf0c2d6c4b6a100000000000000000000000000000000000000000000000000000000000000c499585aac00000000000000000000000000000000000000000000000af10f7eb24f506cfd000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076c65646765723200000000000000000000000000000000000000000000000000018080",
-      );
-      expect(result).toEqual({
-        r: "d9e62b0b6ae0c18d3d2ecdf20ce7f1c959e0f609b4e73e2d138bbdc3e1e93900",
-        s: "12469e2124a8955b5159f670b0333b803a70dd7dc51558a8f7460b27eed77be5",
-        v: "26",
-      });
-    });
 
-    test("paraswap without plugins CDN but with explicit plugin", async () => {
-      jest.spyOn(axios, "get").mockImplementation(async uri => {
-        if (uri?.includes("plugins/ethereum.json")) {
-          return { data: ParaswapJSON };
-        }
-        return null;
-      });
-      const transport = await openTransportReplayer(
-        // behave like paraswap test
-        RecordStore.fromString(paraswapAPDUs),
-      );
-      const eth = new Eth(transport);
-      eth.setLoadConfig({
-        pluginBaseURL: null,
-        extraPlugins: ParaswapJSON,
-      });
-      const result = await signTxWithResolution(
-        eth,
-        "44'/60'/0'/0/0",
-        "f903cd82043d8509c765240083042e73941bd435f3c054b6e901b7b108a0ab7617c808677b80b903a4cfc0afeb000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee00000000000000000000000000000000000000000000000af10f7eb24f506cfd00000000000000000000000000000000000000000000000002a5b905b3c9fa4c00000000000000000000000000000000000000000000000002baaee8d905020a000000000000000000000000000000000000000000000000000000000000018000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000002c00000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000086d3579b043585a97532514016dcf0c2d6c4b6a100000000000000000000000000000000000000000000000000000000000000c499585aac00000000000000000000000000000000000000000000000af10f7eb24f506cfd000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000002000000000000000000000000111111111117dc0aa78b770fa6a738034120c302000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c40000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000076c65646765723200000000000000000000000000000000000000000000000000018080",
-      );
-      expect(result).toEqual({
-        r: "d9e62b0b6ae0c18d3d2ecdf20ce7f1c959e0f609b4e73e2d138bbdc3e1e93900",
-        s: "12469e2124a8955b5159f670b0333b803a70dd7dc51558a8f7460b27eed77be5",
-        v: "26",
-      });
-    });
-
-    test("signTransactionLargeChainID", async () => {
+    test("signTransaction Large ChainID (2_716_446_429_837_000)", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
-      => e004000043058000002c8000003c800000008000000000000000ed018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a248740008082aa008080
-      <= 1b3694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a4009000
+      => e004000048058000002c8000003c800000008000000000000000f2018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a24874000808709a697f88076c88080
+      <= 132ceca22fd700a75d8c18588cc4f5f8ba49ccbe583ddfb48f6b30186977f030312fb2c430662265c56fb09c0fcf0cfebde0e58d1a977d9c012b55c6c6cf66d99e9000
       `),
       );
       const eth = new Eth(transport);
+      const transaction = {
+        chainId: 2_716_446_429_837_000,
+        nonce: 1,
+        gasPrice: EthersBigNumber.from("0x4e3b29200"),
+        gasLimit: EthersBigNumber.from("0x5208"),
+        to: "0x28ee52a8f3d6e5d15f8b131996950d7f296c7952",
+        value: EthersBigNumber.from("0x2bd72a24874000"),
+        data: "0x",
+      };
       const result = await signTxWithResolution(
         eth,
         "44'/60'/0'/0'/0",
-        "ed018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a248740008082aa008080",
+        serializeTransaction(transaction).slice(2),
       );
       expect(result).toEqual({
-        r: "3694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b",
-        s: "30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a400",
-        v: "01542b",
-      });
-    });
-
-    test("signTransactionLargeChainID2", async () => {
-      const transport = await openTransportReplayer(
-        RecordStore.fromString(`
-      => e004000043058000002c8000003c800000008000000000000000ed018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a248740008081fa008080
-      <= 173694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a4009000
-      `),
-      );
-      const eth = new Eth(transport);
-      const result = await signTxWithResolution(
-        eth,
-        "44'/60'/0'/0'/0",
-        "ed018504e3b292008252089428ee52a8f3d6e5d15f8b131996950d7f296c7952872bd72a248740008081fa008080",
-      );
-      expect(result).toEqual({
-        r: "3694583045a85ada8d15d5e01b373b00e86a405c9c52f7835691dcc522b7353b",
-        s: "30392e638a591c65ed307809825ca48346980f52d004ab7a5f93657f7e62a400",
-        v: "0217",
+        r: "2ceca22fd700a75d8c18588cc4f5f8ba49ccbe583ddfb48f6b30186977f03031",
+        s: "2fb2c430662265c56fb09c0fcf0cfebde0e58d1a977d9c012b55c6c6cf66d99e",
+        v: "134d2ff100edb3",
       });
     });
 
@@ -795,12 +696,10 @@ describe("Eth app biding", () => {
     test("signTransactionChunkedLimit", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
-      => e004000096058000002c8000003c800000000000000000000000f901ad8205448505c205da808310c8e19402b3f51ac9202aa19be63d61a8c681579d6e3a5180b90184293491160000000000000000000000000000000000000000000000000000000005ee832e0000000000000000000000000000000000000000000000000000000005eeb9ac0000000000000000000000000000000000000000
-      <= 9000
-      => e00480009600000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000505846a0a89dd26fa5cd0677fd5406039c218620000000000000000000000000000000000000000000000000000000001f969fc88a4d19062c1525d6ca664dee285aa573c06e0f8bdd4971032d2b63be6183d05300000000000000000000
+      => e0040000ff058000002c8000003c800000000000000000000000f901ad8205448505c205da808310c8e19402b3f51ac9202aa19be63d61a8c681579d6e3a5180b90184293491160000000000000000000000000000000000000000000000000000000005ee832e0000000000000000000000000000000000000000000000000000000005eeb9ac000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000505846a0a89dd26fa5cd0677fd5406039c218620000000000000000000000000000000000000000000000000000000001f
       <= 9000
-      => e004800099000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000041c4c3f1f8711741f2180d850a09a2933bb21dff1c79caf8c45ecda957836ec7e60d78661c28ad96713e5f22a458376422599bd3776d9aeafc02e319ed0c1b41e51c00000000000000000000000000000000000000000000000000000000000000018080
-      <= 1bdc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f9966159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec9000
+      => e0048000c6969fc88a4d19062c1525d6ca664dee285aa573c06e0f8bdd4971032d2b63be6183d05300000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000041c4c3f1f8711741f2180d850a09a2933bb21dff1c79caf8c45ecda957836ec7e60d78661c28ad96713e5f22a458376422599bd3776d9aeafc02e319ed0c1b41e51c00000000000000000000000000000000000000000000000000000000000000018080
+      <= 26dc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f9966159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec9000
       `), // Incorrect signature but it doesn't matter for tests
       );
       const eth = new Eth(transport);
@@ -812,17 +711,17 @@ describe("Eth app biding", () => {
       expect(result).toEqual({
         r: "dc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f99",
         s: "66159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec",
-        v: "1b",
+        v: "26",
       });
     });
 
     test("signTransactionChunkedLimitBigVRS", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
-      => e004000096058000002c8000003c800000000000000000000000f9011782abcd8609184e72a00082271094aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa820300b8edbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+      => e0040000ff058000002c8000003c800000000000000000000000f9011782abcd8609184e72a00082271094aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa820300b8edbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
       <= 9000
-      => e004800099bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb258080
-      <= 1bdc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f9966159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec9000
+      => e004800030bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb258080
+      <= 6edc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f9966159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec9000
       `),
       );
       const eth = new Eth(transport);
@@ -834,7 +733,7 @@ describe("Eth app biding", () => {
       expect(result).toEqual({
         r: "dc6ad1d9d847defdffde2f3b70004c89a1a8a6c614fec484891ae8f1ebc46f99",
         s: "66159ca542f5cf36d64278218bfcce24ba96d7495dec25b10a7609346ca063ec",
-        v: "1b",
+        v: "6e",
       });
     });
 
@@ -894,7 +793,7 @@ describe("Eth app biding", () => {
           return {
             data: {
               payload:
-                "01010302010113010314010112041dad95c421013c200930786b766e2e6574682214b0b5b0106d69fe64545a60a68c014f7570d3f86115463044022075f4fffb553cb615a6adcecac60ce57f72b5ed76a73b18ca99e8914529efaea70220031df5f609e06d26d1f4b55605f483977e08406528c4ceab729d010d52725dd2",
+                "01010302010113010314010112041dad95c421013c200d6465762e30786b766e2e65746822146cbcd73cd8e8a42844662f0a0e76d7f79afd933d1546304402200247a175329e4025500b6cb62fc466c8876a9e3d3cb681200ae70d5b69afdb2902200a5de51730d17f8d62e10ca4ddfc0b353e8b42e284293c074e4a62f96a7e9f9c",
             },
           };
         }
@@ -904,11 +803,11 @@ describe("Eth app biding", () => {
         RecordStore.fromString(`
       => e020000000
       <= 1dad95c49000
-      => e022010080007e01010302010113010314010112041dad95c421013c200930786b766e2e6574682214b0b5b0106d69fe64545a60a68c014f7570d3f86115463044022075f4fffb553cb615a6adcecac60ce57f72b5ed76a73b18ca99e8914529efaea70220031df5f609e06d26d1f4b55605f483977e08406528c4ceab729d010d52725dd2
+      => e022010084008201010302010113010314010112041dad95c421013c200d6465762e30786b766e2e65746822146cbcd73cd8e8a42844662f0a0e76d7f79afd933d1546304402200247a175329e4025500b6cb62fc466c8876a9e3d3cb681200ae70d5b69afdb2902200a5de51730d17f8d62e10ca4ddfc0b353e8b42e284293c074e4a62f96a7e9f9c
       <= 9000
       => e00a000068054d415449437d1afa7b718fb893db30a3abc0cfc608aacfebb000000012000000013044022000d8fa7b6e409a0dc55723ba975179e7d1181d1fc78fccbece4e5a264814366a02203927d84a710c8892d02f7386ad20147c75fba4bdd486b0256ecd005770a7ca5b
-      <= 9000
-      => e004000085058000002c8000003c80000000000000000000000002f86d0146841dcd650085086a18cd7882fd50947d1afa7b718fb893db30a3abc0cfc608aacfebb080b844a9059cbb000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000000000000000029784d963dbc85a1ec0
+      <= 009000
+      => e004000085058000002c8000003c80000000000000000000000002f86d0146841dcd650085086a18cd7882fd50947d1afa7b718fb893db30a3abc0cfc608aacfebb080b844a9059cbb0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000000000000000000000000000029784d963dbc85a1ec0
       <= 0030c7d7899a892c9370dc43aa15d309805f52319c32daf22406a42ff32ec6013b746d9409a45b70c6e511d9802cc477cebfd7128140ac649371e988f33f3a85559000
       `),
       );
@@ -916,7 +815,7 @@ describe("Eth app biding", () => {
       const result = await signTxWithResolution(
         eth,
         "44'/60'/0'/0/0",
-        "02f86d0146841dcd650085086a18cd7882fd50947d1afa7b718fb893db30a3abc0cfc608aacfebb080b844a9059cbb000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000000000000000029784d963dbc85a1ec0",
+        "02f86d0146841dcd650085086a18cd7882fd50947d1afa7b718fb893db30a3abc0cfc608aacfebb080b844a9059cbb0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000000000000000000000000000029784d963dbc85a1ec0",
         {
           erc20: true,
           nft: true,
@@ -941,11 +840,11 @@ describe("Eth app biding", () => {
 
     test("signTransaction NFT with domain", async () => {
       jest.spyOn(axios, "request").mockImplementationOnce(async ({ url }) => {
-        if (url?.includes("dev.0xkvn.eth?challenge=0xa8a8b649")) {
+        if (url?.includes("dev.0xkvn.eth?challenge=0x1dad95c4")) {
           return {
             data: {
               payload:
-                "0101030201011301031401011204a8a8b64921013c200930786b766e2e6574682214b0b5b0106d69fe64545a60a68c014f7570d3f86115473045022100dc88dd13819497be8202dbdeddaefd68a1f64ad08855e2f35fc178625a06a7f1022023cdc8ca14233ee4778c81cd26d82e2a5ce27021f8c3cb51bb7d1125313a8cf5",
+                "01010302010113010314010112041dad95c421013c200d6465762e30786b766e2e65746822146cbcd73cd8e8a42844662f0a0e76d7f79afd933d1546304402200247a175329e4025500b6cb62fc466c8876a9e3d3cb681200ae70d5b69afdb2902200a5de51730d17f8d62e10ca4ddfc0b353e8b42e284293c074e4a62f96a7e9f9c",
             },
           };
         }
@@ -975,16 +874,16 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e020000000
-      <= a8a8b6499000
-      => e022010081007f0101030201011301031401011204a8a8b64921013c200930786b766e2e6574682214b0b5b0106d69fe64545a60a68c014f7570d3f86115473045022100dc88dd13819497be8202dbdeddaefd68a1f64ad08855e2f35fc178625a06a7f1022023cdc8ca14233ee4778c81cd26d82e2a5ce27021f8c3cb51bb7d1125313a8cf5
+      <= 1dad95c49000
+      => e022010084008201010302010113010314010112041dad95c421013c200d6465762e30786b766e2e65746822146cbcd73cd8e8a42844662f0a0e76d7f79afd933d1546304402200247a175329e4025500b6cb62fc466c8876a9e3d3cb681200ae70d5b69afdb2902200a5de51730d17f8d62e10ca4ddfc0b353e8b42e284293c074e4a62f96a7e9f9c
       <= 9000
       => e01600007301010645524337323160f80121c31a0d46b5279700f9df786054aa5ee5b88d4fde0000000000000001020147304502206224f90b61a09033d06ee1bd2045fb1f2edd26d479890d253229f3c2a1952aef0221008258bbde083cff7eab1e5b3e9dacccbdcf31232cc45740cb510f7aef00ec766e
       <= 9000
       => e01400006f01010752617269626c6560f80121c31a0d46b5279700f9df786054aa5ee5000000000000000101014630440220587a77c4f5e7cc012e4e5e52548790a87c4eb20321249f3ef61e4018b107beeb02206ec8f371023bc15311c4637eb7ba7153fb9e47f1bb7b30db285f4bf9adaa2454
       <= 9000
-      => e004000096058000002c8000003c80000000000000000000000002f8ee0146841ad27480850912e4364a83023c549460f80121c31a0d46b5279700f9df786054aa5ee580b8c4b88d4fde0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000
+      => e0040000ff058000002c8000003c80000000000000000000000002f8ee0146841ad27480850912e4364a83023c549460f80121c31a0d46b5279700f9df786054aa5ee580b8c4b88d4fde0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000000000000000000000000000000000000000112999000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000
       <= 9000
-      => e004800070000000000000000000000000112999000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000c0
+      => e004800007000000000000c0
       <= 01d82878b966f8e6fd94b76c942a7735e4668377f9030285aa2177bf77e59a39347f7908439d2968a8cdb261eae4498dbbf6c5808dc4974fc304486b373001a4349000
       `),
       );
@@ -992,7 +891,7 @@ describe("Eth app biding", () => {
       const result = await signTxWithResolution(
         eth,
         "44'/60'/0'/0/0",
-        "02f8ee0146841ad27480850912e4364a83023c549460f80121c31a0d46b5279700f9df786054aa5ee580b8c4b88d4fde0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d000000000000000000000000b0b5b0106d69fe64545a60a68c014f7570d3f8610000000000000000000000000000000000000000000000000000000000112999000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000c0",
+        "02f8ee0146841ad27480850912e4364a83023c549460f80121c31a0d46b5279700f9df786054aa5ee580b8c4b88d4fde0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000006cbcd73cd8e8a42844662f0a0e76d7f79afd933d0000000000000000000000000000000000000000000000000000000000112999000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000043078303000000000000000000000000000000000000000000000000000000000c0",
         {
           erc20: true,
           nft: true,
@@ -1064,11 +963,16 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a000066035a5258e41d2489571d322189246dafa5ebde1f4699f4980000001200000001304402200ae8634c22762a8ba41d2acb1e068dcce947337c6dd984f13b820d396176952302203306a49d8a6c35b11a61088e1570b3928ca3a0db6bd36f577b5ef87628561ff7
-      <= 9000
+      <= 009000
       `),
       );
       const eth = new Eth(transport);
-      const zrxInfo = byContractAddressAndChainId("0xe41d2489571d322189246dafa5ebde1f4699f498", 1)!;
+      const zrxInfo = byContractAddressAndChainId(
+        "0xe41d2489571d322189246dafa5ebde1f4699f498",
+        1,
+        null,
+        { staticERC20Signatures: { 1: CAL_ETH } },
+      )!;
       const result = await eth.provideERC20TokenInformation(zrxInfo.data.toString("hex"));
       expect(result).toEqual(true);
     });
@@ -1149,22 +1053,27 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a000066035a5258e41d2489571d322189246dafa5ebde1f4699f4980000001200000001304402200ae8634c22762a8ba41d2acb1e068dcce947337c6dd984f13b820d396176952302203306a49d8a6c35b11a61088e1570b3928ca3a0db6bd36f577b5ef87628561ff7
-      <= 9000
+      <= 009000
       => e00a0000670455534454dac17f958d2ee523a2206206994597c13d831ec700000006000000013044022078c66ccea3e4dedb15a24ec3c783d7b582cd260daf62fd36afe9a8212a344aed0220160ba8c1c4b6a8aa6565bed20632a091aeeeb7bfdac67fc6589a6031acbf511c
-      <= 9000
+      <= 019000
       => f004010091028000534b00000000e41d2489571d322189246dafa5ebde1f4699f4980000000000000000000000000000000000000000000000000000000000000001dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000000000000000000000000000000000000000000001000000010000000100000000000186a00000000000030d4000000d6a00001618
       <= 0003c4a1aef46539c90eaad9a71eee8319586e2b749793335060a2431c42d0d48901faac9386aaaf9d8d2cc3229aecf9e202f4b83f63e3fff7426ca07725d10fb29000
       `),
       );
       const eth = new Eth(transport);
+      const loadConfig = { staticERC20Signatures: { 1: CAL_ETH } };
       const tokenInfo1 = byContractAddressAndChainId(
         "0xe41d2489571d322189246dafa5ebde1f4699f498",
         1,
+        null,
+        loadConfig,
       )!;
       await eth.provideERC20TokenInformation(tokenInfo1.data.toString("hex"));
       const tokenInfo2 = byContractAddressAndChainId(
         "0xdac17f958d2ee523a2206206994597c13d831ec7",
         1,
+        null,
+        loadConfig,
       )!;
       await eth.provideERC20TokenInformation(tokenInfo2.data.toString("hex"));
       const result = await eth.starkSignOrder(
@@ -1190,22 +1099,27 @@ describe("Eth app biding", () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a000066035a5258e41d2489571d322189246dafa5ebde1f4699f4980000001200000001304402200ae8634c22762a8ba41d2acb1e068dcce947337c6dd984f13b820d396176952302203306a49d8a6c35b11a61088e1570b3928ca3a0db6bd36f577b5ef87628561ff7
-      <= 9000
+      <= 009000
       => e00a0000670455534454dac17f958d2ee523a2206206994597c13d831ec700000006000000013044022078c66ccea3e4dedb15a24ec3c783d7b582cd260daf62fd36afe9a8212a344aed0220160ba8c1c4b6a8aa6565bed20632a091aeeeb7bfdac67fc6589a6031acbf511c
-      <= 9000
+      <= 019000
       => f0040300d3028000534b0000000002e41d2489571d322189246dafa5ebde1f4699f4980000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000002dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000010000000100000000000186a00000000000030d4000000d6a00001618
       <= 0003c4a1aef46539c90eaad9a71eee8319586e2b749793335060a2431c42d0d48901faac9386aaaf9d8d2cc3229aecf9e202f4b83f63e3fff7426ca07725d10fb29000
       `),
       );
       const eth = new Eth(transport);
+      const loadConfig = { staticERC20Signatures: { 1: CAL_ETH } };
       const tokenInfo1 = byContractAddressAndChainId(
         "0xe41d2489571d322189246dafa5ebde1f4699f498",
         1,
+        null,
+        loadConfig,
       )!;
       await eth.provideERC20TokenInformation(tokenInfo1.data.toString("hex"));
       const tokenInfo2 = byContractAddressAndChainId(
         "0xdac17f958d2ee523a2206206994597c13d831ec7",
         1,
+        null,
+        loadConfig,
       )!;
       await eth.provideERC20TokenInformation(tokenInfo2.data.toString("hex"));
       const result = await eth.starkSignOrder_v2(
@@ -1282,6 +1196,7 @@ describe("Eth app biding", () => {
         s: "0305fe1782f050839619c3e9627121bacd3a8dc87859e1ba5376fbd1b3bee4d4",
       });
     });
+
     test("starkProvideQuantum", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1296,6 +1211,7 @@ describe("Eth app biding", () => {
       );
       expect(result).toEqual(true);
     });
+
     test("starkProvideQuantum_v2", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1311,6 +1227,7 @@ describe("Eth app biding", () => {
       );
       expect(result).toEqual(true);
     });
+
     test("starkDepositEth", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1333,16 +1250,15 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkDepositToken", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a0000670455534454dac17f958d2ee523a2206206994597c13d831ec700000006000000013044022078c66ccea3e4dedb15a24ec3c783d7b582cd260daf62fd36afe9a8212a344aed0220160ba8c1c4b6a8aa6565bed20632a091aeeeb7bfdac67fc6589a6031acbf511c
-      <= 9000
+      <= 009000
       => f008000034dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000000000000000000000000000000000000000000001
       <= 9000
-      => e004000096058000002c8000003c800000000000000000000000f88d018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b86400aeef8a02ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c50000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000
-      <= 9000
-      => e00480000e0000000000000000000000030d40
+      => e0040000a4058000002c8000003c800000000000000000000000f88d018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b86400aeef8a02ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000030d40
       <= 1b294214de6341a0a63609f5643700c58be4b7aa46a5f56dea8c9ff5ecf4d5228662a3a4c8a6a0714d147b2a98071cfb892ed3f3edd5da049a2608605970b63dc29000
       `),
       );
@@ -1350,6 +1266,8 @@ describe("Eth app biding", () => {
       const tokenInfo = byContractAddressAndChainId(
         "0xdac17f958d2ee523a2206206994597c13d831ec7",
         1,
+        null,
+        { staticERC20Signatures: { 1: CAL_ETH } },
       )!;
       await eth.provideERC20TokenInformation(tokenInfo.data.toString("hex"));
       await eth.starkProvideQuantum("0xdac17f958d2ee523a2206206994597c13d831ec7", new BigNumber(1));
@@ -1364,6 +1282,7 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkWithdrawEth", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1386,11 +1305,12 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkWithdrawToken", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a0000670455534454dac17f958d2ee523a2206206994597c13d831ec700000006000000013044022078c66ccea3e4dedb15a24ec3c783d7b582cd260daf62fd36afe9a8212a344aed0220160ba8c1c4b6a8aa6565bed20632a091aeeeb7bfdac67fc6589a6031acbf511c
-      <= 9000
+      <= 009000
       => f008000034dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000000000000000000000000000000000000000000001
       <= 9000
       => e004000063058000002c8000003c800000000000000000000000f84c018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000a42e1a7d4d02ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c5
@@ -1401,6 +1321,8 @@ describe("Eth app biding", () => {
       const tokenInfo = byContractAddressAndChainId(
         "0xdac17f958d2ee523a2206206994597c13d831ec7",
         1,
+        null,
+        { staticERC20Signatures: { 1: CAL_ETH } },
       )!;
       await eth.provideERC20TokenInformation(tokenInfo.data.toString("hex"));
       await eth.starkProvideQuantum("0xdac17f958d2ee523a2206206994597c13d831ec7", new BigNumber(1));
@@ -1415,6 +1337,7 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkDepositCancel", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1437,6 +1360,7 @@ describe("Eth app biding", () => {
         v: "1c",
       });
     });
+
     test("starkDepositReclaim", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1459,6 +1383,7 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkFullWithdrawal", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1478,6 +1403,7 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkFreeze", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1497,14 +1423,13 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("starkEscapeEth", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => f00800003400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001
       <= 9000
-      => e004000096058000002c8000003c800000000000000000000000f8ad018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8849e3adac40000000000000000000000000000000000000000000000000000000000000001010101010101010101010101010101010101010101010101010101010101010101142460171646987f20c714eda4b92812b2
-      <= 9000
-      => e00480002e2b811f56f27130937c267e29bd9e00000000000000000000000000000000000000000000000000000000000186a0
+      => e0040000c4058000002c8000003c800000000000000000000000f8ad018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8849e3adac40000000000000000000000000000000000000000000000000000000000000001010101010101010101010101010101010101010101010101010101010101010101142460171646987f20c714eda4b92812b22b811f56f27130937c267e29bd9e00000000000000000000000000000000000000000000000000000000000186a0
       <= 1c77220f9513431ecb2eeb53edee025eb78f1fd3c194d75f4988462b78bacd88b43e74b88584f9091a4bdb2605ec128e2bda7eaa262891bf83bb7b34acf22c6a9c9000
       `),
       );
@@ -1521,16 +1446,15 @@ describe("Eth app biding", () => {
         v: "1c",
       });
     });
+
     test("starkEscapeTokens", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
       => e00a0000670455534454dac17f958d2ee523a2206206994597c13d831ec700000006000000013044022078c66ccea3e4dedb15a24ec3c783d7b582cd260daf62fd36afe9a8212a344aed0220160ba8c1c4b6a8aa6565bed20632a091aeeeb7bfdac67fc6589a6031acbf511c
-      <= 9000
+      <= 009000
       => f008000034dac17f958d2ee523a2206206994597c13d831ec70000000000000000000000000000000000000000000000000000000000000001
       <= 9000
-      => e004000096058000002c8000003c800000000000000000000000f8ad018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8849e3adac40000000000000000000000000000000000000000000000000000000000000001010101010101010101010101010101010101010101010101010101010101010102ce625e94458d39dd0bf3b45a843544dd4a
-      <= 9000
-      => e00480002e14b8169045a3a3d15aa564b936c50000000000000000000000000000000000000000000000000000000000030d40
+      => e0040000c4058000002c8000003c800000000000000000000000f8ad018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8849e3adac40000000000000000000000000000000000000000000000000000000000000001010101010101010101010101010101010101010101010101010101010101010102ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c50000000000000000000000000000000000000000000000000000000000030d40
       <= 1c56846c1ec5ce862f0abb59054ae9a5279ddac47953907902a0dada43b9a0e06b35ad5523cf0b01efa3a369c24b80cd003f87a2f725cf40ecc2354290fc8369a29000
       `),
       );
@@ -1538,6 +1462,8 @@ describe("Eth app biding", () => {
       const tokenInfo = byContractAddressAndChainId(
         "0xdac17f958d2ee523a2206206994597c13d831ec7",
         1,
+        null,
+        { staticERC20Signatures: { 1: CAL_ETH } },
       )!;
       await eth.provideERC20TokenInformation(tokenInfo.data.toString("hex"));
       await eth.starkProvideQuantum("0xdac17f958d2ee523a2206206994597c13d831ec7", new BigNumber(1));
@@ -1552,12 +1478,11 @@ describe("Eth app biding", () => {
         v: "1c",
       });
     });
+
     test("starkEscapeVerify", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
-      => e004000096058000002c8000003c800000000000000000000000f88d018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8642dd5300602ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c50000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000
-      <= 9000
-      => e00480000e0000000000000000000000030d40
+      => e0040000a4058000002c8000003c800000000000000000000000f88d018504e3b29200825208940102030405060708090a0b0c0d0e0f1011121314872bd72a24874000b8642dd5300602ce625e94458d39dd0bf3b45a843544dd4a14b8169045a3a3d15aa564b936c500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000030d40
       <= 1b372586695f148927a74b6ef4b2e40f42b3a6e44afbd16cb4d3dcec6859aec1d2736da27ba0a716492e96ebd6cbbaec894af5cad24a2c6c3f683ade376f9fdc4f9000
       `),
       );
@@ -1573,6 +1498,7 @@ describe("Eth app biding", () => {
         v: "1b",
       });
     });
+
     test("eth2GetPublicKey", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1587,6 +1513,7 @@ describe("Eth app biding", () => {
           "a0fcd39edaa082bdbf23a0c01568471b8a2bd998c9ae347f7e7690e420bd2f96e436c215422aa86f233f67cbbdfb9b2f",
       });
     });
+
     test("eth2SetWithdrawalIndex", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`
@@ -1598,6 +1525,7 @@ describe("Eth app biding", () => {
       const result = await eth.eth2SetWithdrawalIndex(1);
       expect(result).toEqual(true);
     });
+
     test("getEIP1024PublicEncryptionKey", async () => {
       const transport = await openTransportReplayer(
         RecordStore.fromString(`