@cityofzion/bs-ethereum 2.7.9 → 2.7.11

package/dist/constants/BSEthereumConstants.d.ts

@@ -4,6 +4,7 @@ export declare class BSEthereumConstants {
     static DEFAULT_DECIMALS: number;
     static DEFAULT_GAS_LIMIT: number;
     static NATIVE_SYMBOL_BY_NETWORK_ID: Record<BSEthereumNetworkId, string>;
+    static NATIVE_WRAPPED_HASH_BY_NETWORK_ID: Partial<Record<BSEthereumNetworkId, string>>;
     static RPC_LIST_BY_NETWORK_ID: Record<BSEthereumNetworkId, string[]>;
     static DEFAULT_BIP44_DERIVATION_PATH: string;
     static NEOX_TESTNET_NETWORK_ID: BSEthereumNetworkId;

package/dist/constants/BSEthereumConstants.js

@@ -26,6 +26,9 @@ BSEthereumConstants.NATIVE_SYMBOL_BY_NETWORK_ID = {
     '47763': 'GAS',
     '12227332': 'GAS',
 };
+BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID = {
+    '1': '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+};
 BSEthereumConstants.RPC_LIST_BY_NETWORK_ID = {
     '1': [
         'https://eth.llamarpc.com',

package/dist/helpers/BSEthereumHelper.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereumHelper = void 0;
+const blockchain_service_1 = require("@cityofzion/blockchain-service");
 const BSEthereumConstants_1 = require("../constants/BSEthereumConstants");
 class BSEthereumHelper {
     static getNativeAsset(network) {
@@ -28,7 +29,7 @@ class BSEthereumHelper {
         return BSEthereumConstants_1.BSEthereumConstants.MAINNET_NETWORK_IDS.includes(network.id);
     }
     static normalizeHash(hash) {
-        return hash.startsWith('0x') ? hash.slice(2) : hash;
+        return (0, blockchain_service_1.normalizeHash)(hash);
     }
     static wait(duration) {
         return new Promise(resolve => {

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

@@ -280,7 +280,7 @@ class MoralisBDSEthereum extends RpcBDSEthereum_1.RpcBDSEthereum {
     }
 }
 exports.MoralisBDSEthereum = MoralisBDSEthereum;
-MoralisBDSEthereum.BASE_URL = 'https://nxlrja2d1a.execute-api.us-east-1.amazonaws.com/production';
+MoralisBDSEthereum.BASE_URL = 'https://dora.coz.io/api/v2/meta';
 MoralisBDSEthereum.SUPPORTED_CHAINS = [
     '1',
     '11155111',

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

@@ -23,6 +23,7 @@ var _MoralisEDSEthereum_instances, _MoralisEDSEthereum_network, _MoralisEDSEther
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MoralisEDSEthereum = void 0;
 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");
 class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
@@ -47,17 +48,25 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
             const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
             let wrappedNativeToken;
             if (params.tokens.some(token => token.symbol === nativeToken.symbol)) {
-                wrappedNativeToken = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "m", _MoralisEDSEthereum_getWrappedNativeToken).call(this);
+                try {
+                    wrappedNativeToken = yield __classPrivateFieldGet(this, _MoralisEDSEthereum_instances, "m", _MoralisEDSEthereum_getWrappedNativeToken).call(this);
+                }
+                catch (_a) {
+                    /* empty */
+                }
             }
-            const tokensBody = params.tokens.map(token => {
+            const tokensBody = [];
+            params.tokens.map(token => {
                 if (token.symbol !== nativeToken.symbol) {
-                    return {
+                    tokensBody.push({
                         token_address: token.hash,
-                    };
+                    });
+                }
+                if (wrappedNativeToken) {
+                    tokensBody.push({
+                        token_address: wrappedNativeToken.hash,
+                    });
                 }
-                return {
-                    token_address: wrappedNativeToken.hash,
-                };
             });
             const splitTokensBody = [];
             for (let i = 0; i < tokensBody.length; i += __classPrivateFieldGet(this, _MoralisEDSEthereum_maxTokenPricesPerCall, "f")) {
@@ -69,10 +78,10 @@ class MoralisEDSEthereum extends blockchain_service_1.CryptoCompareEDS {
                     tokens: body,
                 });
                 data.forEach(item => {
-                    var _a;
                     let token;
-                    if (BSEthereumHelper_1.BSEthereumHelper.normalizeHash(item.tokenAddress) ===
-                        BSEthereumHelper_1.BSEthereumHelper.normalizeHash((_a = wrappedNativeToken === null || wrappedNativeToken === void 0 ? void 0 : wrappedNativeToken.hash) !== null && _a !== void 0 ? _a : '')) {
+                    if (wrappedNativeToken &&
+                        BSEthereumHelper_1.BSEthereumHelper.normalizeHash(item.tokenAddress) ===
+                            BSEthereumHelper_1.BSEthereumHelper.normalizeHash(wrappedNativeToken.hash)) {
                         token = nativeToken;
                     }
                     else {
@@ -135,10 +144,15 @@ exports.MoralisEDSEthereum = MoralisEDSEthereum;
 _MoralisEDSEthereum_network = new WeakMap(), _MoralisEDSEthereum_blockchainDataService = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByHour = new WeakMap(), _MoralisEDSEthereum_numberOfBlockByDay = new WeakMap(), _MoralisEDSEthereum_maxTokenPricesPerCall = new WeakMap(), _MoralisEDSEthereum_instances = new WeakSet(), _MoralisEDSEthereum_getWrappedNativeToken = function _MoralisEDSEthereum_getWrappedNativeToken() {
     return __awaiter(this, void 0, void 0, function* () {
         const nativeToken = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
+        const wrappedSymbol = `W${nativeToken.symbol}`;
+        const localWrappedHash = BSEthereumConstants_1.BSEthereumConstants.NATIVE_WRAPPED_HASH_BY_NETWORK_ID[__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f").id];
+        if (localWrappedHash) {
+            return Object.assign(Object.assign({}, nativeToken), { symbol: wrappedSymbol, hash: localWrappedHash });
+        }
         const client = MoralisBDSEthereum_1.MoralisBDSEthereum.getClient(__classPrivateFieldGet(this, _MoralisEDSEthereum_network, "f"));
         const { data } = yield client.get('/erc20/metadata/symbols', {
             params: {
-                symbols: [`W${nativeToken.symbol}`],
+                symbols: [wrappedSymbol],
             },
         });
         const wrapperToken = data.find(token => token.verified_contract && !token.possible_spam);

package/dist/services/ledger/EthersLedgerServiceEthereum.js

@@ -72,7 +72,7 @@ class EthersLedgerSigner extends ethers_1.Signer {
     }
     getAddress() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { address } = yield __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f"));
+            const { address } = yield BSEthereumHelper_1.BSEthereumHelper.retry(() => __classPrivateFieldGet(this, _EthersLedgerSigner_ledgerApp, "f").getAddress(__classPrivateFieldGet(this, _EthersLedgerSigner_bip44Path, "f")));
             return address;
         });
     }
@@ -98,32 +98,25 @@ class EthersLedgerSigner extends ethers_1.Signer {
         });
     }
     signTransaction(transaction) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const tx = yield ethers_1.ethers.utils.resolveProperties(transaction);
-                const unsignedTransaction = {
-                    chainId: (_a = tx.chainId) !== null && _a !== void 0 ? _a : undefined,
-                    data: (_b = tx.data) !== null && _b !== void 0 ? _b : undefined,
-                    gasLimit: (_c = tx.gasLimit) !== null && _c !== void 0 ? _c : undefined,
-                    gasPrice: (_d = tx.gasPrice) !== null && _d !== void 0 ? _d : undefined,
-                    nonce: tx.nonce ? ethers_1.ethers.BigNumber.from(tx.nonce).toNumber() : undefined,
-                    to: (_e = tx.to) !== null && _e !== void 0 ? _e : undefined,
-                    value: (_f = tx.value) !== null && _f !== void 0 ? _f : undefined,
-                };
-                const serializedUnsignedTransaction = ethers_1.ethers.utils.serializeTransaction(unsignedTransaction).substring(2);
+                const serializedUnsignedTransaction = ethers_1.ethers.utils
+                    .serializeTransaction(tx)
+                    .substring(2);
                 const resolution = yield hw_app_eth_1.ledgerService.resolveTransaction(serializedUnsignedTransaction, {}, {});
-                (_g = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _g === void 0 ? void 0 : _g.emit('getSignatureStart');
+                (_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));
-                (_h = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _h === void 0 ? void 0 : _h.emit('getSignatureEnd');
-                return ethers_1.ethers.utils.serializeTransaction(unsignedTransaction, {
+                (_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(),
                     r: '0x' + signature.r,
                     s: '0x' + signature.s,
                 });
             }
             catch (error) {
-                (_j = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _j === void 0 ? void 0 : _j.emit('getSignatureEnd');
+                (_c = __classPrivateFieldGet(this, _EthersLedgerSigner_emitter, "f")) === null || _c === void 0 ? void 0 : _c.emit('getSignatureEnd');
                 throw error;
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.7.9",
+  "version": "2.7.11",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -20,7 +20,7 @@
     "@ledgerhq/hw-app-eth": "~6.35.7",
     "@ethersproject/abstract-signer": "~5.7.0",
     "@ethersproject/properties": "~5.7.0",
-    "@cityofzion/blockchain-service": "1.13.0"
+    "@cityofzion/blockchain-service": "1.13.1"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",