@cityofzion/bs-ethereum 2.6.2 → 2.7.1

package/dist/BSEthereum.d.ts

@@ -1,31 +1,31 @@
 import { Account, BSCalculableFee, BSWithExplorerService, BSWithLedger, BSWithNameService, BSWithNft, BlockchainDataService, BlockchainService, ExchangeDataService, ExplorerService, Network, NftDataService, Token, TransferParam, GetLedgerTransport } from '@cityofzion/blockchain-service';
 import { BSEthereumNetworkId } from './constants/BSEthereumConstants';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
-export declare class BSEthereum<BSCustomName extends string = string> implements BlockchainService<BSCustomName, BSEthereumNetworkId>, BSWithNft, BSWithNameService, BSCalculableFee, BSWithLedger, BSWithExplorerService {
+export declare class BSEthereum<BSName extends string = string> implements BlockchainService<BSName, BSEthereumNetworkId>, BSWithNft, BSWithNameService, BSCalculableFee<BSName>, BSWithLedger<BSName>, BSWithExplorerService {
     #private;
-    readonly blockchainName: BSCustomName;
+    readonly name: BSName;
     readonly bip44DerivationPath: string;
     feeToken: Token;
     blockchainDataService: BlockchainDataService;
     exchangeDataService: ExchangeDataService;
-    ledgerService: EthersLedgerServiceEthereum;
+    ledgerService: EthersLedgerServiceEthereum<BSName>;
     tokens: Token[];
     nftDataService: NftDataService;
     network: Network<BSEthereumNetworkId>;
     explorerService: ExplorerService;
-    constructor(blockchainName: BSCustomName, network?: Network<BSEthereumNetworkId>, getLedgerTransport?: GetLedgerTransport);
+    constructor(name: BSName, network?: Network<BSEthereumNetworkId>, getLedgerTransport?: GetLedgerTransport<BSName>);
     testNetwork(network: Network<BSEthereumNetworkId>): Promise<void>;
     setNetwork(network: Network<BSEthereumNetworkId>): void;
     validateAddress(address: string): boolean;
     validateEncrypted(json: string): boolean;
     validateKey(key: string): boolean;
     validateNameServiceDomainFormat(domainName: string): boolean;
-    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Account;
-    generateAccountFromKey(key: string): Account;
-    generateAccountFromPublicKey(publicKey: string): Account;
-    decrypt(json: string, password: string): Promise<Account>;
+    generateAccountFromMnemonic(mnemonic: string[] | string, index: number): Account<BSName>;
+    generateAccountFromKey(key: string): Account<BSName>;
+    generateAccountFromPublicKey(publicKey: string): Account<BSName>;
+    decrypt(json: string, password: string): Promise<Account<BSName>>;
     encrypt(key: string, password: string): Promise<string>;
-    transfer(param: TransferParam): Promise<string[]>;
-    calculateTransferFee(param: TransferParam): Promise<string>;
+    transfer(param: TransferParam<BSName>): Promise<string[]>;
+    calculateTransferFee(param: TransferParam<BSName>): Promise<string>;
     resolveNameServiceDomain(domainName: string): Promise<string>;
 }

package/dist/BSEthereum.js

@@ -31,18 +31,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _BSEthereum_instances, _BSEthereum_getLedgerTransport, _BSEthereum_generateSigner, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
+var _BSEthereum_instances, _BSEthereum_generateSigner, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const ethers_1 = require("ethers");
@@ -60,13 +54,11 @@ const GhostMarketNDSEthereum_1 = require("./services/nft-data/GhostMarketNDSEthe
 const BlockscoutESEthereum_1 = require("./services/explorer/BlockscoutESEthereum");
 const RpcBDSEthereum_1 = require("./services/blockchain-data/RpcBDSEthereum");
 class BSEthereum {
-    constructor(blockchainName, network, getLedgerTransport) {
+    constructor(name, network, getLedgerTransport) {
         _BSEthereum_instances.add(this);
-        _BSEthereum_getLedgerTransport.set(this, void 0);
         network = network !== null && network !== void 0 ? network : BSEthereumConstants_1.BSEthereumConstants.DEFAULT_NETWORK;
-        this.blockchainName = blockchainName;
+        this.name = name;
         this.ledgerService = new EthersLedgerServiceEthereum_1.EthersLedgerServiceEthereum(this, getLedgerTransport);
-        __classPrivateFieldSet(this, _BSEthereum_getLedgerTransport, getLedgerTransport, "f");
         this.bip44DerivationPath = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_BIP44_DERIVATION_PATH;
         this.setNetwork(network);
     }
@@ -118,6 +110,7 @@ class BSEthereum {
             key: wallet.privateKey,
             type: 'privateKey',
             bip44Path,
+            blockchain: this.name,
         };
     }
     generateAccountFromKey(key) {
@@ -126,6 +119,7 @@ class BSEthereum {
             address: wallet.address,
             key,
             type: 'privateKey',
+            blockchain: this.name,
         };
     }
     generateAccountFromPublicKey(publicKey) {
@@ -134,6 +128,7 @@ class BSEthereum {
             address,
             key: publicKey,
             type: 'publicKey',
+            blockchain: this.name,
         };
     }
     decrypt(json, password) {
@@ -143,6 +138,7 @@ class BSEthereum {
                 address: wallet.address,
                 key: wallet.privateKey,
                 type: 'privateKey',
+                blockchain: this.name,
             };
         });
     }
@@ -154,7 +150,7 @@ class BSEthereum {
     }
     transfer(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_generateSigner).call(this, param.senderAccount, param.isLedger);
+            const signer = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_generateSigner).call(this, param.senderAccount);
             const sentTransactionHashes = [];
             for (const intent of param.intents) {
                 let transactionHash = '';
@@ -180,7 +176,7 @@ class BSEthereum {
     }
     calculateTransferFee(param) {
         return __awaiter(this, void 0, void 0, function* () {
-            const signer = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_generateSigner).call(this, param.senderAccount, param.isLedger);
+            const signer = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_generateSigner).call(this, param.senderAccount);
             let fee = ethers_1.ethers.utils.parseEther('0');
             for (const intent of param.intents) {
                 const { gasPrice, transactionParams } = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_buildTransferParams).call(this, intent);
@@ -202,10 +198,10 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
-_BSEthereum_getLedgerTransport = new WeakMap(), _BSEthereum_instances = new WeakSet(), _BSEthereum_generateSigner = function _BSEthereum_generateSigner(account, isLedger) {
+_BSEthereum_instances = new WeakSet(), _BSEthereum_generateSigner = function _BSEthereum_generateSigner(account) {
     return __awaiter(this, void 0, void 0, function* () {
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-        if (isLedger) {
+        if (account.isHardware) {
             if (!this.ledgerService.getLedgerTransport)
                 throw new Error('You must provide getLedgerTransport function to use Ledger');
             if (typeof account.bip44Path !== 'string')
@@ -216,10 +212,18 @@ _BSEthereum_getLedgerTransport = new WeakMap(), _BSEthereum_instances = new Weak
         return new ethers_1.ethers.Wallet(account.key, provider);
     });
 }, _BSEthereum_buildTransferParams = function _BSEthereum_buildTransferParams(intent) {
-    var _a;
     return __awaiter(this, void 0, void 0, function* () {
         const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-        const decimals = (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
+        let decimals = intent.tokenDecimals;
+        if (!decimals) {
+            try {
+                const token = yield this.blockchainDataService.getTokenInfo(intent.tokenHash);
+                decimals = token.decimals;
+            }
+            catch (error) {
+                decimals = 18;
+            }
+        }
         const amount = ethersBigNumber.parseFixed(intent.amount, decimals);
         const gasPrice = yield provider.getGasPrice();
         let transactionParams = {

package/dist/constants/BSEthereumConstants.d.ts

@@ -1,9 +1,8 @@
-import { Network, NetworkId, Token } from '@cityofzion/blockchain-service';
+import { Network, NetworkId } from '@cityofzion/blockchain-service';
 export type BSEthereumNetworkId = NetworkId<'1' | '10' | '25' | '56' | '137' | '250' | '1101' | '8453' | '80002' | '42161' | '42220' | '43114' | '59144' | '11155111' | '47763' | '12227332'>;
 export declare class BSEthereumConstants {
     static DEFAULT_DECIMALS: number;
     static DEFAULT_GAS_LIMIT: number;
-    static NATIVE_ASSET: Token;
     static NATIVE_SYMBOL_BY_NETWORK_ID: Record<BSEthereumNetworkId, string>;
     static RPC_LIST_BY_NETWORK_ID: Record<BSEthereumNetworkId, string[]>;
     static DEFAULT_BIP44_DERIVATION_PATH: string;

package/dist/constants/BSEthereumConstants.js

@@ -8,12 +8,6 @@ exports.BSEthereumConstants = BSEthereumConstants;
 _a = BSEthereumConstants;
 BSEthereumConstants.DEFAULT_DECIMALS = 18;
 BSEthereumConstants.DEFAULT_GAS_LIMIT = 0x5208;
-BSEthereumConstants.NATIVE_ASSET = {
-    decimals: 18,
-    hash: '-',
-    name: 'ETH',
-    symbol: 'ETH',
-};
 BSEthereumConstants.NATIVE_SYMBOL_BY_NETWORK_ID = {
     '1': 'ETH',
     '10': 'ETH',

package/dist/helpers/BSEthereumHelper.d.ts

@@ -4,8 +4,8 @@ export declare class BSEthereumHelper {
     static getNativeAsset(network: Network<BSEthereumNetworkId>): {
         symbol: string;
         name: string;
-        hash: string;
         decimals: number;
+        hash: string;
     };
     static getNativeSymbol(network: Network<BSEthereumNetworkId>): string;
     static getRpcList(network: Network<BSEthereumNetworkId>): string[];

package/dist/helpers/BSEthereumHelper.js

@@ -14,7 +14,7 @@ const BSEthereumConstants_1 = require("../constants/BSEthereumConstants");
 class BSEthereumHelper {
     static getNativeAsset(network) {
         const symbol = this.getNativeSymbol(network);
-        return Object.assign(Object.assign({}, BSEthereumConstants_1.BSEthereumConstants.NATIVE_ASSET), { symbol, name: symbol });
+        return { symbol, name: symbol, decimals: 18, hash: '-' };
     }
     static getNativeSymbol(network) {
         var _a;

package/dist/services/ledger/EthersLedgerServiceEthereum.d.ts

@@ -12,12 +12,12 @@ export declare class EthersLedgerSigner extends Signer implements TypedDataSigne
     signTransaction(transaction: ethers.utils.Deferrable<ethers.providers.TransactionRequest>): Promise<string>;
     _signTypedData(domain: ethers.TypedDataDomain, types: Record<string, ethers.TypedDataField[]>, value: Record<string, any>): Promise<string>;
 }
-export declare class EthersLedgerServiceEthereum implements LedgerService {
+export declare class EthersLedgerServiceEthereum<BSName extends string = string> implements LedgerService<BSName> {
     #private;
     emitter: LedgerServiceEmitter;
-    getLedgerTransport?: GetLedgerTransport;
-    constructor(blockchainService: BSEthereum, getLedgerTransport?: GetLedgerTransport);
-    getAccounts(transport: Transport): Promise<Account[]>;
-    getAccount(transport: Transport, index: number): Promise<Account>;
+    getLedgerTransport?: GetLedgerTransport<BSName>;
+    constructor(blockchainService: BSEthereum<BSName>, getLedgerTransport?: GetLedgerTransport<BSName>);
+    getAccounts(transport: Transport): Promise<Account<BSName>[]>;
+    getAccount(transport: Transport, index: number): Promise<Account<BSName>>;
     getSigner(transport: Transport, path: string, provider?: ethers.providers.Provider): EthersLedgerSigner;
 }

package/dist/services/ledger/EthersLedgerServiceEthereum.js

@@ -178,7 +178,7 @@ class EthersLedgerServiceEthereum {
             const accountsByBlockchainService = yield (0, blockchain_service_1.fetchAccountsForBlockchainServices)([__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f")], (_service, index) => __awaiter(this, void 0, void 0, function* () {
                 return this.getAccount(transport, index);
             }));
-            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").blockchainName);
+            const accounts = accountsByBlockchainService.get(__classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").name);
             return accounts !== null && accounts !== void 0 ? accounts : [];
         });
     }
@@ -193,6 +193,7 @@ class EthersLedgerServiceEthereum {
                 key: publicKeyWithPrefix,
                 type: 'publicKey',
                 bip44Path,
+                blockchain: __classPrivateFieldGet(this, _EthersLedgerServiceEthereum_blockchainService, "f").name,
             };
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "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.7.0"
+    "@cityofzion/blockchain-service": "1.9.0"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport-node-hid": "~6.28.5",