@cityofzion/bs-ethereum 2.12.1 → 2.12.3

package/dist/BSEthereum.js

@@ -51,6 +51,7 @@ const MoralisEDSEthereum_1 = require("./services/exchange-data/MoralisEDSEthereu
 const GhostMarketNDSEthereum_1 = require("./services/nft-data/GhostMarketNDSEthereum");
 const BlockscoutESEthereum_1 = require("./services/explorer/BlockscoutESEthereum");
 const RpcBDSEthereum_1 = require("./services/blockchain-data/RpcBDSEthereum");
+const BSEthereumTokenHelper_1 = require("./helpers/BSEthereumTokenHelper");
 class BSEthereum {
     constructor(name, network, getLedgerTransport) {
         _BSEthereum_instances.add(this);
@@ -226,7 +227,7 @@ _BSEthereum_instances = new WeakSet(), _BSEthereum_buildTransferParams = functio
         let transactionParams = {
             type: 2,
         };
-        const isNative = BSEthereumHelper_1.BSEthereumHelper.normalizeHash(this.feeToken.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(intent.tokenHash);
+        const isNative = BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(this.feeToken)(intent.tokenHash);
         if (isNative) {
             transactionParams.to = intent.receiverAddress;
             transactionParams.value = amount;

package/dist/constants/BSEthereumConstants.js

@@ -217,4 +217,5 @@ BSEthereumConstants.TESTNET_NETWORKS = [
     },
 ];
 BSEthereumConstants.ALL_NETWORKS = [..._a.MAINNET_NETWORKS, ..._a.TESTNET_NETWORKS];
+// If tou change this, make sure to update the tests accordingly
 BSEthereumConstants.DEFAULT_NETWORK = _a.MAINNET_NETWORKS[0];

package/dist/helpers/BSEthereumHelper.d.ts

@@ -10,7 +10,4 @@ export declare class BSEthereumHelper {
     static getNativeSymbol(network: Network<BSEthereumNetworkId>): string;
     static getRpcList(network: Network<BSEthereumNetworkId>): string[];
     static isMainnet(network: Network<BSEthereumNetworkId>): boolean;
-    static normalizeHash(hash: string): string;
-    static wait(duration: number): Promise<void>;
-    static retry<T = any>(callback: () => Promise<T>): Promise<T>;
 }

package/dist/helpers/BSEthereumHelper.js

@@ -1,21 +1,12 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereumHelper = void 0;
-const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSEthereumConstants_1 = require("../constants/BSEthereumConstants");
+const BSEthereumTokenHelper_1 = require("./BSEthereumTokenHelper");
 class BSEthereumHelper {
     static getNativeAsset(network) {
         const symbol = this.getNativeSymbol(network);
-        return { symbol, name: symbol, decimals: 18, hash: '-' };
+        return BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({ symbol, name: symbol, decimals: 18, hash: '0x' });
     }
     static getNativeSymbol(network) {
         var _a;
@@ -28,32 +19,5 @@ class BSEthereumHelper {
     static isMainnet(network) {
         return BSEthereumConstants_1.BSEthereumConstants.MAINNET_NETWORK_IDS.includes(network.id);
     }
-    static normalizeHash(hash) {
-        return (0, blockchain_service_1.normalizeHash)(hash);
-    }
-    static wait(duration) {
-        return new Promise(resolve => {
-            setTimeout(resolve, duration);
-        });
-    }
-    static retry(callback) {
-        // eslint-disable-next-line no-async-promise-executor
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            // Wait up to 5 seconds
-            for (let i = 0; i < 50; i++) {
-                try {
-                    const result = yield callback();
-                    return resolve(result);
-                }
-                catch (error) {
-                    if (error.id !== 'TransportLocked') {
-                        return reject(error);
-                    }
-                }
-                yield this.wait(100);
-            }
-            return reject(new Error('timeout'));
-        }));
-    }
 }
 exports.BSEthereumHelper = BSEthereumHelper;

package/dist/helpers/BSEthereumTokenHelper.d.ts

@@ -0,0 +1,4 @@
+import { BSTokenHelper } from '@cityofzion/blockchain-service';
+export declare class BSEthereumTokenHelper extends BSTokenHelper {
+    static normalizeHash(hash: string): string;
+}

package/dist/helpers/BSEthereumTokenHelper.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BSEthereumTokenHelper = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
+const ethers_1 = require("ethers");
+class BSEthereumTokenHelper extends blockchain_service_1.BSTokenHelper {
+    static normalizeHash(hash) {
+        let fixedHash = blockchain_service_1.BSTokenHelper.normalizeHash(hash);
+        try {
+            fixedHash = ethers_1.ethers.utils.getAddress(fixedHash); // Normalize to checksum address
+        }
+        catch (_a) {
+            /* empty */
+        }
+        return fixedHash;
+    }
+}
+exports.BSEthereumTokenHelper = BSEthereumTokenHelper;

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 export * from './BSEthereum';
 export * from './helpers/BSEthereumHelper';
+export * from './helpers/BSEthereumTokenHelper';
 export * from './constants/BSEthereumConstants';
 export * from './services/blockchain-data/MoralisBDSEthereum';
 export * from './services/blockchain-data/DoraBDSEthereum';

package/dist/index.js

@@ -16,6 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./BSEthereum"), exports);
 __exportStar(require("./helpers/BSEthereumHelper"), exports);
+__exportStar(require("./helpers/BSEthereumTokenHelper"), exports);
 __exportStar(require("./constants/BSEthereumConstants"), exports);
 __exportStar(require("./services/blockchain-data/MoralisBDSEthereum"), exports);
 __exportStar(require("./services/blockchain-data/DoraBDSEthereum"), exports);

package/dist/services/blockchain-data/DoraBDSEthereum.js

@@ -61,7 +61,8 @@ class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
             const txTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getTxTemplateUrl();
             const nftTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getNftTemplateUrl();
             const contractTemplateUrl = __classPrivateFieldGet(this, _DoraBDSEthereum_explorerService, "f").getContractTemplateUrl();
-            const itemPromises = items.map((item) => __awaiter(this, void 0, void 0, function* () {
+            const itemPromises = items.map((_c) => __awaiter(this, void 0, void 0, function* () {
+                var { networkFeeAmount, systemFeeAmount } = _c, item = __rest(_c, ["networkFeeAmount", "systemFeeAmount"]);
                 const txId = item.transactionID;
                 const newItem = {
                     txId,
@@ -70,18 +71,22 @@ class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     date: item.date,
                     invocationCount: item.invocationCount,
                     notificationCount: item.notificationCount,
-                    networkFeeAmount: (0, blockchain_service_1.formatNumber)(item.networkFeeAmount, nativeToken.decimals),
-                    systemFeeAmount: (0, blockchain_service_1.formatNumber)(item.systemFeeAmount, nativeToken.decimals),
+                    networkFeeAmount: networkFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(networkFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
+                    systemFeeAmount: systemFeeAmount
+                        ? blockchain_service_1.BSBigNumberHelper.format(systemFeeAmount, { decimals: nativeToken.decimals })
+                        : undefined,
                     events: [],
                 };
                 const eventPromises = item.events.map((event) => __awaiter(this, void 0, void 0, function* () {
-                    var _c, _d, _e, _f, _g, _h;
+                    var _d, _e, _f, _g, _h, _j;
                     let nftEvent;
                     let assetEvent;
                     const { methodName, tokenID: tokenId, contractHash: hash } = event;
-                    const from = (_c = event.from) !== null && _c !== void 0 ? _c : undefined;
-                    const to = (_d = event.to) !== null && _d !== void 0 ? _d : undefined;
-                    const standard = (_g = (_f = (_e = event.supportedStandards) === null || _e === void 0 ? void 0 : _e[0]) === null || _f === void 0 ? void 0 : _f.toLowerCase()) !== null && _g !== void 0 ? _g : '';
+                    const from = (_d = event.from) !== null && _d !== void 0 ? _d : undefined;
+                    const to = (_e = event.to) !== null && _e !== void 0 ? _e : undefined;
+                    const standard = (_h = (_g = (_f = event.supportedStandards) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.toLowerCase()) !== null && _h !== void 0 ? _h : '';
                     const isErc1155 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc1155Standards, "f").includes(standard);
                     const isErc721 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc721Standards, "f").includes(standard);
                     const isErc20 = __classPrivateFieldGet(this, _DoraBDSEthereum_supportedErc20Standards, "f").includes(standard);
@@ -94,7 +99,7 @@ class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                         const nftUrl = hash ? nftTemplateUrl === null || nftTemplateUrl === void 0 ? void 0 : nftTemplateUrl.replace('{hash}', hash).replace('{tokenId}', tokenId) : undefined;
                         nftEvent = {
                             eventType: 'nft',
-                            amount: '0',
+                            amount: undefined,
                             methodName,
                             from,
                             fromUrl,
@@ -112,10 +117,11 @@ class DoraBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
                     }
                     else {
                         const [token] = yield blockchain_service_1.BSPromisesHelper.tryCatch(() => this.getTokenInfo(hash));
-                        const amount = (0, blockchain_service_1.formatNumber)(event.amount, (_h = token === null || token === void 0 ? void 0 : token.decimals) !== null && _h !== void 0 ? _h : event.tokenDecimals);
                         assetEvent = {
                             eventType: 'token',
-                            amount,
+                            amount: event.amount
+                                ? blockchain_service_1.BSBigNumberHelper.format(event.amount, { decimals: (_j = token === null || token === void 0 ? void 0 : token.decimals) !== null && _j !== void 0 ? _j : event.tokenDecimals })
+                                : undefined,
                             methodName,
                             from,
                             fromUrl,

package/dist/services/blockchain-data/MoralisBDSEthereum.js

@@ -32,6 +32,7 @@ const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const ERC20_1 = require("../../assets/abis/ERC20");
 const dora_ts_1 = require("@cityofzion/dora-ts");
 const DoraBDSEthereum_1 = require("./DoraBDSEthereum");
+const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
     static getClient(network) {
         return axios_1.default.create({
@@ -76,12 +77,12 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                     return;
                 balances.push({
                     amount: ethers_1.ethers.utils.formatUnits(balance.balance, balance.decimals),
-                    token: {
+                    token: BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
                         decimals: balance.decimals,
                         hash: balance.token_address,
                         name: (_a = balance.name) !== null && _a !== void 0 ? _a : '',
                         symbol: balance.symbol,
-                    },
+                    }),
                 });
             });
             return balances;
@@ -96,7 +97,7 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 return _super.getTokenInfo.call(this, hash);
             }
             const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            if (BSEthereumHelper_1.BSEthereumHelper.normalizeHash(nativeAsset.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(hash))
+            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeAsset)({ hash }))
                 return nativeAsset;
             if (this._tokenCache.has(hash)) {
                 return this._tokenCache.get(hash);
@@ -108,12 +109,12 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                 },
             });
             const data = response.data[0];
-            const token = {
+            const token = BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
                 decimals: Number(data.decimals),
                 symbol: data.symbol,
                 hash,
                 name: data.name,
-            };
+            });
             this._tokenCache.set(hash, token);
             return token;
         });
@@ -223,12 +224,12 @@ class MoralisBDSEthereum extends DoraBDSEthereum_1.DoraBDSEthereum {
                         from: transfer.from_address,
                         to: transfer.to_address,
                         type: 'token',
-                        token: {
+                        token: BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
                             decimals: Number(transfer.token_decimals),
                             hash: transfer.address,
                             name: transfer.token_name,
                             symbol: transfer.token_symbol,
-                        },
+                        }),
                         contractHash: transfer.address,
                     });
                 });

package/dist/services/blockchain-data/RpcBDSEthereum.js

@@ -13,6 +13,7 @@ exports.RpcBDSEthereum = void 0;
 const ethers_1 = require("ethers");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const ERC20_1 = require("../../assets/abis/ERC20");
+const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class RpcBDSEthereum {
     constructor(network) {
         this._tokenCache = new Map();
@@ -37,7 +38,7 @@ class RpcBDSEthereum {
                     {
                         type: 'token',
                         amount: ethers_1.ethers.utils.formatEther(transaction.value),
-                        contractHash: '-',
+                        contractHash: token.hash,
                         from: transaction.from,
                         to: transaction.to,
                         token,
@@ -70,7 +71,7 @@ class RpcBDSEthereum {
     getTokenInfo(hash) {
         return __awaiter(this, void 0, void 0, function* () {
             const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(this._network);
-            if (BSEthereumHelper_1.BSEthereumHelper.normalizeHash(nativeAsset.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(hash))
+            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeAsset)({ hash }))
                 return nativeAsset;
             if (this._tokenCache.has(hash)) {
                 return this._tokenCache.get(hash);
@@ -79,12 +80,12 @@ class RpcBDSEthereum {
             const contract = new ethers_1.ethers.Contract(hash, ERC20_1.ERC20_ABI, provider);
             const decimals = yield contract.decimals();
             const symbol = yield contract.symbol();
-            const token = {
+            const token = BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken({
                 decimals,
                 symbol,
                 hash,
                 name: symbol,
-            };
+            });
             this._tokenCache.set(hash, token);
             return token;
         });

package/dist/services/exchange-data/MoralisEDSEthereum.js

@@ -26,6 +26,7 @@ const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
 const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
 const MoralisBDSEthereum_1 = require("../blockchain-data/MoralisBDSEthereum");
+const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
     constructor(network, blockchainDataService) {
         super();
@@ -81,9 +82,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                 });
                 data.forEach(item => {
                     let token;
-                    if (wrappedNativeToken &&
-                        BSEthereumHelper_1.BSEthereumHelper.normalizeHash(item.tokenAddress) ===
-                            BSEthereumHelper_1.BSEthereumHelper.normalizeHash(wrappedNativeToken.hash)) {
+                    if (wrappedNativeToken && BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(wrappedNativeToken)(item.tokenAddress)) {
                         token = nativeToken;
                     }
                     else {
@@ -111,7 +110,7 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                 throw new Error('Exchange is not supported on this network');
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
             let token;
-            if (BSEthereumHelper_1.BSEthereumHelper.normalizeHash(params.token.hash) === BSEthereumHelper_1.BSEthereumHelper.normalizeHash(nativeToken.hash)) {
+            if (BSEthereumTokenHelper_1.BSEthereumTokenHelper.predicateByHash(nativeToken)(params.token)) {
                 token = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "m", _MoralisEDSEthereum_getWrappedNativeToken).call(this);
             }
             else {
@@ -150,6 +149,6 @@ _MoralisEDSEthereum_network = new WeakMap(), _MoralisEDSEthereum_blockchainDataS
         const localWrappedHash = BSEthereumConstants_1.BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f").id];
         if (!localWrappedHash)
             throw new Error('Wrapper token not found');
-        return Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash });
+        return BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeToken(Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash }));
     });
 };

package/dist/services/explorer/BlockscoutESEthereum.js

@@ -14,6 +14,7 @@ var _BlockscoutESEthereum_instances, _BlockscoutESEthereum_network, _BlockscoutE
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlockscoutESEthereum = void 0;
 const BSEthereumConstants_1 = require("../../constants/BSEthereumConstants");
+const BSEthereumTokenHelper_1 = require("../../helpers/BSEthereumTokenHelper");
 const DEFAULT_BASE_URL_BY_NETWORK_ID = {
     [BSEthereumConstants_1.BSEthereumConstants.ETHEREUM_MAINNET_NETWORK_ID]: 'https://eth.blockscout.com',
     '10': 'https://optimism.blockscout.com',
@@ -35,15 +36,15 @@ class BlockscoutESEthereum {
     }
     buildTransactionUrl(hash) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/tx/${hash}`;
+        return `${baseURL}/tx/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(hash)}`;
     }
     buildContractUrl(contractHash) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/address/${contractHash}`;
+        return `${baseURL}/address/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(contractHash)}`;
     }
     buildNftUrl(params) {
         const baseURL = __classPrivateFieldGet(this, _BlockscoutESEthereum_instances, "m", _BlockscoutESEthereum_getBaseUrl).call(this, __classPrivateFieldGet(this, _BlockscoutESEthereum_network, "f"));
-        return `${baseURL}/token/${params.contractHash}/instance/${params.tokenId}`;
+        return `${baseURL}/token/${BSEthereumTokenHelper_1.BSEthereumTokenHelper.normalizeHash(params.contractHash)}/instance/${params.tokenId}`;
     }
     getAddressTemplateUrl() {
         try {

package/dist/services/ledger/EthersLedgerServiceEthereum.js

@@ -53,7 +53,9 @@ const hw_app_eth_1 = __importStar(require("@ledgerhq/hw-app-eth"));
 const ethers_1 = require("ethers");
 const properties_1 = require("@ethersproject/properties");
 const events_1 = __importDefault(require("events"));
-const BSEthereumHelper_1 = require("../../helpers/BSEthereumHelper");
+const shouldRetry = (error) => {
+    return (error === null || error === void 0 ? void 0 : error.id) !== 'TransportLocked';
+};
 class EthersLedgerSigner extends ethers_1.Signer {
     constructor(transport, bip44Path, provider, emitter) {
         super();
@@ -72,7 +74,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { address } = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f")));
+            const { address } = yield blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f")), { shouldRetry });
             return address;
         });
     }
@@ -84,7 +86,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
                     message = ethers_1.ethers.utils.toUtf8Bytes(message);
                 }
                 (_a = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
-                const obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)));
+                const obj = yield blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signPersonalMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), ethers_1.ethers.utils.hexlify(message).substring(2)), { shouldRetry });
                 (_b = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
                 // Normalize the signature for Ethers
                 obj.r = '0x' + obj.r;
@@ -107,7 +109,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
                     .substring(2);
                 const resolution = yield hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
                 (_a = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
-                const signature = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), serializedUnsignedTransaction, resolution));
+                const signature = yield blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signTransaction(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), serializedUnsignedTransaction, resolution), { shouldRetry });
                 (_b = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
                 return ethers_1.ethers.utils.serializeTransaction(tx, {
                     v: ethers_1.ethers.BigNumber.from('0x' + signature.v).toNumber(),
@@ -137,12 +139,14 @@ class EthersLedgerSigner extends ethers_1.Signer {
                 (_a = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _a === void 0 ? void 0 : _a.emit('getSignatureStart');
                 let obj;
                 try {
-                    obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), payload));
+                    obj = yield blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712Message(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), payload), {
+                        shouldRetry,
+                    });
                 }
                 catch (_d) {
                     const domainSeparatorHex = ethers_1.ethers.utils._TypedDataEncoder.hashDomain(payload.domain);
                     const hashStructMessageHex = ethers_1.ethers.utils._TypedDataEncoder.hashStruct(payload.primaryType, types, payload.message);
-                    obj = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), domainSeparatorHex, hashStructMessageHex));
+                    obj = yield blockchain_service_1.BSUtilsHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").signEIP712HashedMessage(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"), domainSeparatorHex, hashStructMessageHex), { shouldRetry });
                 }
                 (_b = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _b === void 0 ? void 0 : _b.emit('getSignatureEnd');
                 // Normalize the signature for Ethers
@@ -179,7 +183,7 @@ class EthersLedgerServiceEthereum {
         return __awaiter(this, void 0, void 0, function* () {
             const ledgerApp = new hw_app_eth_1.default(transport);
             const bip44Path = __classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").bip44DerivationPath.replace('?', index.toString());
-            const { publicKey, address } = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => ledgerApp.getAddress(bip44Path));
+            const { publicKey, address } = yield blockchain_service_1.BSUtilsHelper.retry(() => ledgerApp.getAddress(bip44Path), { shouldRetry });
             const publicKeyWithPrefix = '0x' + publicKey;
             return {
                 address,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.12.1",
+  "version": "2.12.3",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -22,7 +22,7 @@
     "@ethersproject/properties": "~5.7.0",
     "@cityofzion/dora-ts": "0.5.1",
     "date-fns": "~4.1.0",
-    "@cityofzion/blockchain-service": "1.18.1"
+    "@cityofzion/blockchain-service": "1.19.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",