feat(connect): update blockbook data

packages/address-validator/src/currencies.js

@@ -1448,7 +1448,7 @@ var CURRENCIES = [
     },
     {
         name: 'BNB Smart Chain',
-        symbol: 'bnb',
+        symbol: 'bsc',
         validator: ETHValidator,
     },
     {

packages/address-validator/tests/wallet_address_validator.test.js

@@ -786,8 +786,8 @@ describe('WAValidator.validate()', function () {
             isValidAddressType('aaaaaaaaaaaaaaa000000000000000', 'siacoin', 'prod', undefined);
         });
 
-        it('should return true for correct BNB addresses', function () {
-            valid('0x0590396689ee1d287147e9383fb8dd24532f2006', 'bnb');
+        it('should return true for correct BSC addresses', function () {
+            valid('0x0590396689ee1d287147e9383fb8dd24532f2006', 'bsc');
             valid('0x07fc5c2bcaa0fa6bdaa4fff897490312c8f33c27', 'BNB smart chain');
         });
 
@@ -1116,12 +1116,12 @@ describe('WAValidator.validate()', function () {
         });
 
         it('should return true for correct BNB smart chain address', function () {
-            valid('0x7ae2f5b9e386cd1b50a4550696d957cb4900f03a', 'bnb');
+            valid('0x7ae2f5b9e386cd1b50a4550696d957cb4900f03a', 'bsc');
             valid('0x0000000000000000000000000000000000001000', 'BNB Smart Chain');
         });
 
         it('should return false for incorrect BNB smart chain address', function () {
-            invalid('bnb1xlvns0n2mxh77mzaspn2hgav4rr4m8eerfju38', 'bnb');
+            invalid('bnb1xlvns0n2mxh77mzaspn2hgav4rr4m8eerfju38', 'bsc');
         });
 
         it('should return true for correct xtz(tezos) address', function () {
@@ -1567,13 +1567,13 @@ describe('WAValidator.validate()', function () {
             invalid('g4VPBPrHZkfE8CsjuG2S4yBQNd455UWmk', 'stellar');
         });
 
-        it('should return false for incorrect bnb addresses', function () {
+        it('should return false for incorrect bsc addresses', function () {
             commonTests('bnb smart chain');
-            commonTests('bnb');
-            invalid('xrb_1f5e4w33ndqbkx4bw5jtp13kp5xghebfxcmw9hdt1f7goid1s4373w6tjdgu', 'bnb');
-            invalid('nano_1f5e4w33ndqbkx4bw5jtp13kp5xghebfxcmw9hdt1f7goid1s4373w6tjdgu', 'bnb');
-            invalid('xrb_1111111112111111111111111111111111111111111111111111hifc8npp', 'bnb');
-            invalid('nano_111111111111111111111111111111111111111111111111111hifc8npp', 'bnb');
+            commonTests('bsc');
+            invalid('xrb_1f5e4w33ndqbkx4bw5jtp13kp5xghebfxcmw9hdt1f7goid1s4373w6tjdgu', 'bsc');
+            invalid('nano_1f5e4w33ndqbkx4bw5jtp13kp5xghebfxcmw9hdt1f7goid1s4373w6tjdgu', 'bsc');
+            invalid('xrb_1111111112111111111111111111111111111111111111111111hifc8npp', 'bsc');
+            invalid('nano_111111111111111111111111111111111111111111111111111hifc8npp', 'bsc');
         });
 
         it('should return false for incorrect xtz(tezos) address', function () {

packages/blockchain-link-types/src/common.ts

@@ -43,6 +43,17 @@ export interface BlockchainSettings {
     throttleBlockEvent?: number;
 }
 
+/**
+ * Discrepancy between `ServerInfo` and `CoinInfo`
+ *
+ * `ServerInfo` type
+ *   - `shortcut` is a label for a network (e.g. for BASE `shortcut` has value ETH)
+ *   - `network` is unique symbol for a network (e.g. for BASE `network` has value BASE)
+ *
+ * `CoinInfo` type
+ *   - `shortcut` is a unique network symbol
+ *   - `network` are data about network
+ */
 export interface ServerInfo {
     url: string;
     name: string;
@@ -53,6 +64,7 @@ export interface ServerInfo {
     blockHeight: number;
     blockHash: string;
     consensusBranchId?: number; // zcash current branch id
+    network: string;
 }
 
 export type TokenStandard = 'ERC20' | 'ERC1155' | 'ERC721' | 'SPL' | 'SPL-2022' | 'BEP20';

packages/blockchain-link-utils/src/blockbook.ts

@@ -24,6 +24,7 @@ import { Addresses, filterTargets, enhanceVinVout, sumVinVout, transformTarget }
 export const transformServerInfo = (payload: ServerInfo) => ({
     name: payload.name,
     shortcut: payload.shortcut,
+    network: payload.network ?? payload.shortcut, // some instances don't send network (e.g. regtest)
     testnet: payload.testnet,
     version: payload.version,
     decimals: payload.decimals,

packages/blockchain-link-utils/src/ripple.ts

@@ -4,6 +4,7 @@ import type { Transaction } from '@trezor/blockchain-link-types';
 export const transformServerInfo = (payload: any) => ({
     name: 'Ripple',
     shortcut: 'xrp',
+    network: 'xrp',
     testnet: false,
     version: payload.buildVersion,
     decimals: 6,

packages/blockchain-link/src/workers/blockfrost/index.ts

@@ -27,6 +27,7 @@ const getInfo = async (request: Request<MessageTypes.GetInfo>) => {
         type: RESPONSES.GET_INFO,
         payload: {
             url: api.options.url,
+            network: info.shortcut,
             ...info,
         },
     } as const;

packages/blockchain-link/src/workers/electrum/methods/getInfo.ts

@@ -19,6 +19,7 @@ const getInfo: Api<Req, Res> = client => {
         blockHash: blockheaderToBlockhash(hex),
         name: 'Bitcoin',
         shortcut: coin,
+        network: coin,
         testnet: coin === 'REGTEST',
         decimals: 8,
     });

packages/blockchain-link/src/workers/solana/index.ts

@@ -411,6 +411,7 @@ const getInfo = async (request: Request<MessageTypes.GetInfo>, isTestnet: boolea
         blockHeight: Number(blockHeight),
         blockHash,
         shortcut: isTestnet ? 'dsol' : 'sol',
+        network: isTestnet ? 'dsol' : 'sol',
         url: api.clusterUrl,
         name: 'Solana',
         version: (await api.rpc.getVersion().send())['solana-core'],

packages/blockchain-link/tests/unit/fixtures/getInfo.ts

@@ -7,6 +7,7 @@ export default {
                 decimals: 9,
                 name: 'TestMock',
                 shortcut: 'test',
+                network: 'test',
             },
         },
         {
@@ -18,6 +19,7 @@ export default {
                         data: {
                             name: 'Zcash',
                             shortcut: 'zec',
+                            network: 'zec',
                             decimals: 8,
                             bestHeight: 1,
                             backend: {
@@ -34,9 +36,37 @@ export default {
                 decimals: 8,
                 name: 'Zcash',
                 shortcut: 'zec',
+                network: 'zec',
                 consensusBranchId: 3268858036,
             },
         },
+        {
+            description: 'BASE L2 network',
+            serverFixtures: [
+                {
+                    method: 'getInfo',
+                    response: {
+                        data: {
+                            name: 'Base Archive',
+                            shortcut: 'ETH',
+                            network: 'BASE',
+                            decimals: 18,
+                            bestHeight: 23603976,
+                            backend: {
+                                version: 'Geth/v1.101411.2-stable-3dd9b027/linux-amd64/go1.23.3',
+                            },
+                        },
+                    },
+                },
+            ],
+            response: {
+                name: 'Base Archive',
+                shortcut: 'ETH',
+                network: 'BASE',
+                decimals: 18,
+                blockHeight: 23603976,
+            },
+        },
         {
             description: 'Error',
             serverFixtures: [
@@ -59,6 +89,7 @@ export default {
                 decimals: 6,
                 name: 'Ripple',
                 shortcut: 'xrp',
+                network: 'xrp',
                 testnet: false,
                 version: '1.4.0',
             },
@@ -87,6 +118,7 @@ export default {
                 decimals: 6,
                 name: 'BlockfrostMock',
                 shortcut: 'ada',
+                network: 'ada',
                 testnet: false,
                 version: '1.4.0',
             },

packages/connect-common/files/coins-eth.json

@@ -11,6 +11,7 @@
             "is_testnet": false,
             "name": "Ethereum",
             "shortcut": "ETH",
+            "label": "ETH",
             "slip44": 60,
             "support": {
                 "T1B1": "1.6.2",
@@ -30,7 +31,8 @@
             "coingecko_id": "binance-smart-chain",
             "is_testnet": false,
             "name": "BNB Smart Chain",
-            "shortcut": "BNB",
+            "shortcut": "BSC",
+            "label": "BNB",
             "slip44": 714,
             "support": {
                 "T1B1": "1.9.4",
@@ -51,6 +53,7 @@
             "is_testnet": false,
             "name": "Ethereum Classic",
             "shortcut": "ETC",
+            "label": "ETC",
             "slip44": 61,
             "support": {
                 "T1B1": "1.6.2",
@@ -71,6 +74,7 @@
             "is_testnet": false,
             "name": "Polygon",
             "shortcut": "POL",
+            "label": "POL",
             "slip44": 966,
             "support": {
                 "T1B1": "1.9.4",
@@ -91,6 +95,7 @@
             "is_testnet": false,
             "name": "Arbitrum One",
             "shortcut": "ARB",
+            "label": "ETH",
             "slip44": 9001,
             "support": {
                 "T1B1": "1.9.4",
@@ -111,7 +116,8 @@
             "is_testnet": false,
             "name": "Base",
             "shortcut": "BASE",
-            "slip44": 1,
+            "label": "ETH",
+            "slip44": 8453,
             "support": {
                 "T1B1": "1.9.4",
                 "T2B1": "2.6.1",
@@ -131,7 +137,8 @@
             "is_testnet": false,
             "name": "Optimism",
             "shortcut": "OP",
-            "slip44": 1,
+            "label": "ETH",
+            "slip44": 614,
             "support": {
                 "T1B1": "1.9.4",
                 "T2B1": "2.6.1",
@@ -150,6 +157,7 @@
             "is_testnet": true,
             "name": "Holesky",
             "shortcut": "tHOL",
+            "label": "tHOL",
             "slip44": 1,
             "support": {
                 "T1B1": "1.11.3",
@@ -169,6 +177,7 @@
             "is_testnet": true,
             "name": "Sepolia",
             "shortcut": "tSEP",
+            "label": "tSEP",
             "slip44": 1,
             "support": {
                 "T1B1": "1.11.3",

packages/connect/e2e/__wscache__/blockbook.js

@@ -10,6 +10,7 @@ const blockbookFixtures = {
             bestHeight: 7000000, // high block to make sure that utxos have enough confirmations (composeTransaction test)
             bestHash: '',
             block0Hash: '',
+            network: params.network,
             testnet: true,
             version: '0.0.0-mocked',
         },

packages/connect/e2e/__wscache__/blockfrost.js

@@ -6,6 +6,7 @@ const blockfrostFixtures = {
         data: {
             name: 'Blockfrost',
             shortcut: params.shortcut,
+            network: params.network,
             decimals: 6,
             testnet: false,
             version: '1.4.0',

packages/connect/src/__mocks__/@trezor/blockchain-link.ts

@@ -37,6 +37,7 @@ class BlockchainLink {
             url: this.name,
             name: this.name,
             shortcut: this.name,
+            network: this.name,
             consensusBranchId: 1001,
         });
     }

packages/connect/src/backend/Blockchain.ts

@@ -40,10 +40,6 @@ const getNormalizedTrezorShortcut = (shortcut: string) => {
         return 'XRP';
     }
 
-    if (['OP', 'BASE', 'ARB'].includes(shortcut)) {
-        return 'ETH';
-    }
-
     return shortcut;
 };
 
@@ -132,10 +128,10 @@ export class Blockchain {
 
         this.serverInfo = info;
 
-        const trezorShortcut = getNormalizedTrezorShortcut(this.coinInfo.shortcut);
-        const backendShortcut = this.serverInfo.shortcut;
+        const trezorNetworkShortcut = getNormalizedTrezorShortcut(this.coinInfo.shortcut);
+        const backendNetworkShortcut = this.serverInfo.network;
 
-        if (trezorShortcut.toLowerCase() !== backendShortcut.toLowerCase()) {
+        if (backendNetworkShortcut.toLowerCase() !== trezorNetworkShortcut.toLowerCase()) {
             throw ERRORS.TypedError('Backend_Invalid');
         }
 

packages/connect/src/backend/__tests__/Blockchain.test.ts

@@ -42,7 +42,34 @@ describe('backend/Blockchain', () => {
     });
 
     it('cache estimated fees (ethereum-like)', async () => {
-        const coinInfo = getEthereumNetwork('Ethereum');
+        const coinInfo = getEthereumNetwork('ETH');
+        if (!coinInfo) throw new Error('coinInfo is missing');
+
+        const spy = jest.spyOn(BlockchainLink.prototype, 'estimateFee');
+
+        const backend = await initBlockchain(coinInfo, () => {});
+
+        // blocks: 1 was not requested before
+        await backend.estimateFee({ blocks: [1] });
+        expect(spy.mock.calls.length).toEqual(1);
+
+        // blocks: 1 is requested again, returned from cache
+        await backend.estimateFee({ blocks: [1] });
+        expect(spy.mock.calls.length).toEqual(1);
+
+        // blocks: 2 was not requested before
+        await backend.estimateFee({ blocks: [1, 2] });
+        expect(spy.mock.calls.length).toEqual(2);
+
+        // request with "specific" field
+        await backend.estimateFee({ blocks: [1, 2], specific: { value: '0x0' } });
+        expect(spy.mock.calls.length).toEqual(3);
+
+        spy.mockClear();
+    });
+
+    it('cache estimated fees (ethereum-like) - L2 network', async () => {
+        const coinInfo = getEthereumNetwork('BASE');
         if (!coinInfo) throw new Error('coinInfo is missing');
 
         const spy = jest.spyOn(BlockchainLink.prototype, 'estimateFee');

packages/connect/src/data/coinInfo.ts

@@ -33,16 +33,16 @@ export const getBitcoinNetwork = (pathOrName: DerivationPath) => {
     return networks.find(n => n.slip44 === slip44);
 };
 
-export const getEthereumNetwork = (pathOrName: DerivationPath) => {
+export const getEthereumNetwork = (pathOrNetworkSymbol: DerivationPath) => {
     const networks = cloneObject(ethereumNetworks);
-    if (typeof pathOrName === 'string') {
-        const name = pathOrName.toLowerCase();
 
-        return networks.find(
-            n => n.name.toLowerCase() === name || n.shortcut.toLowerCase() === name,
-        );
+    if (typeof pathOrNetworkSymbol === 'string') {
+        const networkSymbol = pathOrNetworkSymbol.toLowerCase();
+
+        return networks.find(network => network.shortcut.toLowerCase() === networkSymbol);
     }
-    const slip44 = fromHardened(pathOrName[1]);
+
+    const slip44 = fromHardened(pathOrNetworkSymbol[1]);
 
     return networks.find(n => n.slip44 === slip44);
 };
@@ -261,7 +261,7 @@ const parseEthereumNetworksJson = (json: any) => {
             ...ethereumNetworkInfoBase,
             blockchainLink: network.blockchain_link,
             chainId: network.chain_id,
-            label: network.name,
+            label: network.label,
             name: network.name,
             shortcut: network.shortcut,
             slip44: network.slip44,