@cityofzion/bs-ethereum 2.14.7 → 2.14.8

package/dist/BSEthereum.d.ts

@@ -1,4 +1,4 @@
-import { TBSAccount, TBSToken, TTransferParam, TGetLedgerTransport, ITokenService, TBSNetwork, IBlockchainDataService, IExchangeDataService, INftDataService, IExplorerService, TPingNetworkResponse, IWalletConnectService } from '@cityofzion/blockchain-service';
+import { TBSAccount, TIntentTransferParam, TBSToken, TTransferParam, TGetLedgerTransport, ITokenService, TBSNetwork, IBlockchainDataService, IExchangeDataService, INftDataService, IExplorerService, TPingNetworkResponse, IWalletConnectService } from '@cityofzion/blockchain-service';
 import { ethers } from 'ethers';
 import { EthersLedgerServiceEthereum } from './services/ledger/EthersLedgerServiceEthereum';
 import { IBSEthereum, TBSEthereumNetworkId, TSupportedEVM } from './types';
@@ -13,7 +13,7 @@ export declare class BSEthereum<N extends string = string, A extends string = TB
     nativeTokens: TBSToken[];
     feeToken: TBSToken;
     network: TBSNetwork<A>;
-    availableNetworkURLs: string[];
+    rpcNetworkUrls: string[];
     readonly defaultNetwork: TBSNetwork<A>;
     readonly availableNetworks: TBSNetwork<A>[];
     blockchainDataService: IBlockchainDataService;
@@ -24,6 +24,10 @@ export declare class BSEthereum<N extends string = string, A extends string = TB
     tokenService: ITokenService;
     walletConnectService: IWalletConnectService;
     constructor(name: N, evm?: TSupportedEVM, network?: TBSNetwork<A>, getLedgerTransport?: TGetLedgerTransport<N>);
+    protected _buildTransferParams(intent: TIntentTransferParam): Promise<{
+        transactionParams: ethers.utils.Deferrable<ethers.providers.TransactionRequest>;
+        gasPrice: ethers.BigNumber;
+    }>;
     generateSigner(account: TBSAccount<N>): Promise<ethers.Signer & TypedDataSigner>;
     setNetwork(network: TBSNetwork<A>): void;
     pingNode(url: string): Promise<TPingNetworkResponse>;

package/dist/BSEthereum.js

@@ -49,7 +49,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _BSEthereum_instances, _BSEthereum_buildTransferParams, _BSEthereum_setTokens;
+var _BSEthereum_instances, _BSEthereum_setTokens;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BSEthereum = void 0;
 const blockchain_service_1 = require("@cityofzion/blockchain-service");
@@ -81,6 +81,42 @@ class BSEthereum {
         this.defaultNetwork = this.availableNetworks.find(network => network.type === 'mainnet');
         this.setNetwork(network !== null && network !== void 0 ? network : this.defaultNetwork);
     }
+    _buildTransferParams(intent) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
+            let decimals = intent.tokenDecimals;
+            if (!decimals) {
+                try {
+                    const token = yield this.blockchainDataService.getTokenInfo(intent.tokenHash);
+                    decimals = token.decimals;
+                }
+                catch (_a) {
+                    decimals = 18;
+                }
+            }
+            const amount = ethersBigNumber.parseFixed(intent.amount, decimals);
+            const gasPrice = yield provider.getGasPrice();
+            let transactionParams = {
+                type: 2,
+            };
+            const isNative = this.tokenService.predicateByHash(this.feeToken, intent.tokenHash);
+            if (isNative) {
+                transactionParams.to = intent.receiverAddress;
+                transactionParams.value = amount;
+            }
+            else {
+                const contract = new ethers_1.ethers.Contract(intent.tokenHash, [
+                    'function transfer(address to, uint amount) returns (bool)',
+                ]);
+                const populatedTransaction = yield contract.populateTransaction.transfer(intent.receiverAddress, amount);
+                transactionParams = Object.assign(Object.assign({}, populatedTransaction), transactionParams);
+            }
+            return {
+                transactionParams,
+                gasPrice,
+            };
+        });
+    }
     generateSigner(account) {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
@@ -96,14 +132,14 @@ class BSEthereum {
         });
     }
     setNetwork(network) {
-        const availableURLs = BSEthereumConstants_1.BSEthereumConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
-        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, availableURLs);
+        const rpcNetworkUrls = BSEthereumConstants_1.BSEthereumConstants.RPC_LIST_BY_NETWORK_ID[network.id] || [];
+        const isValidNetwork = blockchain_service_1.BSUtilsHelper.validateNetwork(network, this.availableNetworks, rpcNetworkUrls);
         if (!isValidNetwork) {
             throw new Error(`Network with id ${network.id} is not available for ${this.name}`);
         }
         __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_setTokens).call(this, network);
         this.network = network;
-        this.availableNetworkURLs = availableURLs;
+        this.rpcNetworkUrls = rpcNetworkUrls;
         this.nftDataService = new GhostMarketNDSEthereum_1.GhostMarketNDSEthereum(this);
         this.explorerService = new BlockscoutESEthereum_1.BlockscoutESEthereum(this);
         this.exchangeDataService = new MoralisEDSEthereum_1.MoralisEDSEthereum(this);
@@ -203,7 +239,7 @@ class BSEthereum {
             for (const intent of param.intents) {
                 let transactionHash = '';
                 try {
-                    const { transactionParams, gasPrice } = yield __classPrivateFieldGet(this, _BSEthereum_instances, "m", _BSEthereum_buildTransferParams).call(this, intent);
+                    const { transactionParams, gasPrice } = yield this._buildTransferParams(intent);
                     let gasLimit;
                     try {
                         gasLimit = yield signer.estimateGas(transactionParams);
@@ -230,7 +266,7 @@ class BSEthereum {
             const signer = yield this.generateSigner(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);
+                const { gasPrice, transactionParams } = yield this._buildTransferParams(intent);
                 const estimated = yield signer.estimateGas(transactionParams);
                 const intentFee = gasPrice.mul(estimated);
                 fee = fee.add(intentFee);
@@ -249,42 +285,7 @@ class BSEthereum {
     }
 }
 exports.BSEthereum = BSEthereum;
-_BSEthereum_instances = new WeakSet(), _BSEthereum_buildTransferParams = function _BSEthereum_buildTransferParams(intent) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
-        let decimals = intent.tokenDecimals;
-        if (!decimals) {
-            try {
-                const token = yield this.blockchainDataService.getTokenInfo(intent.tokenHash);
-                decimals = token.decimals;
-            }
-            catch (_a) {
-                decimals = 18;
-            }
-        }
-        const amount = ethersBigNumber.parseFixed(intent.amount, decimals);
-        const gasPrice = yield provider.getGasPrice();
-        let transactionParams = {
-            type: 2,
-        };
-        const isNative = this.tokenService.predicateByHash(this.feeToken, intent.tokenHash);
-        if (isNative) {
-            transactionParams.to = intent.receiverAddress;
-            transactionParams.value = amount;
-        }
-        else {
-            const contract = new ethers_1.ethers.Contract(intent.tokenHash, [
-                'function transfer(address to, uint amount) returns (bool)',
-            ]);
-            const populatedTransaction = yield contract.populateTransaction.transfer(intent.receiverAddress, amount);
-            transactionParams = Object.assign(Object.assign({}, populatedTransaction), transactionParams);
-        }
-        return {
-            transactionParams,
-            gasPrice,
-        };
-    });
-}, _BSEthereum_setTokens = function _BSEthereum_setTokens(network) {
+_BSEthereum_instances = new WeakSet(), _BSEthereum_setTokens = function _BSEthereum_setTokens(network) {
     const nativeAsset = BSEthereumHelper_1.BSEthereumHelper.getNativeAsset(network);
     this.tokens = [nativeAsset];
     this.nativeTokens = [nativeAsset];

package/dist/constants/BSEthereumConstants.js

@@ -57,7 +57,7 @@ BSEthereumConstants.RPC_LIST_BY_NETWORK_ID = {
     '56': [
         'https://binance.llamarpc.com',
         'https://bsc-rpc.publicnode.com',
-        'https://bsc-dataseed.binance.org/',
+        'https://bsc-dataseed.binance.org',
         'https://bsc-dataseed.bnbchain.org',
         'https://endpoints.omniatech.io/v1/bsc/mainnet/public',
     ],

package/dist/services/wallet-connect/WalletConnectServiceEthereum.d.ts

@@ -1,5 +1,6 @@
 import { IWalletConnectService, TBSNetworkId, TWalletConnectServiceRequestMethodParams } from '@cityofzion/blockchain-service';
 import { IBSEthereum } from '../../types';
+import { ethers } from 'ethers';
 export declare class WalletConnectServiceEthereum<N extends string, A extends TBSNetworkId> implements IWalletConnectService {
     #private;
     readonly namespace: string;
@@ -9,6 +10,11 @@ export declare class WalletConnectServiceEthereum<N extends string, A extends TB
     readonly calculableMethods: string[];
     readonly autoApproveMethods: string[];
     constructor(service: IBSEthereum<N, A>);
+    protected _resolveParams(args: TWalletConnectServiceRequestMethodParams<N>): Promise<{
+        param: any;
+        provider: ethers.providers.JsonRpcProvider;
+        wallet: ethers.Signer & import("@ethersproject/abstract-signer").TypedDataSigner;
+    }>;
     personal_sign(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
     eth_sign(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;
     eth_signTransaction(args: TWalletConnectServiceRequestMethodParams<N>): Promise<string>;

package/dist/services/wallet-connect/WalletConnectServiceEthereum.js

@@ -19,7 +19,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _WalletConnectServiceEthereum_instances, _WalletConnectServiceEthereum_service, _WalletConnectServiceEthereum_resolveParams, _WalletConnectServiceEthereum_convertHexToUtf8;
+var _WalletConnectServiceEthereum_instances, _WalletConnectServiceEthereum_service, _WalletConnectServiceEthereum_convertHexToUtf8;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WalletConnectServiceEthereum = void 0;
 const ethers_1 = require("ethers");
@@ -61,13 +61,52 @@ class WalletConnectServiceEthereum {
         __classPrivateFieldSet(this, _WalletConnectServiceEthereum_service, service, "f");
         this.chain = `${this.namespace}:${__classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").network.id.toString()}`;
     }
+    _resolveParams(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c;
+            const wallet = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").generateSigner(args.account);
+            const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").network.url);
+            const param = args.params[0];
+            if (typeof param !== 'object') {
+                throw new Error('Invalid Params');
+            }
+            if (param.gas) {
+                param.gasLimit = param.gas;
+                delete param.gas;
+            }
+            if (param.type && typeof param.type !== 'number') {
+                param.type = parseInt(param.type);
+            }
+            const gasPrice = yield provider.getGasPrice();
+            if (param.type === 2) {
+                param.maxPriorityFeePerGas = (_a = param.maxPriorityFeePerGas) !== null && _a !== void 0 ? _a : gasPrice;
+                param.maxFeePerGas = (_b = param.maxPriorityFeePerGas) !== null && _b !== void 0 ? _b : gasPrice;
+            }
+            else {
+                param.gasPrice = (_c = param.gasPrice) !== null && _c !== void 0 ? _c : gasPrice;
+            }
+            if (!param.gasLimit) {
+                const connectedWallet = wallet.connect(provider);
+                try {
+                    param.gasLimit = yield connectedWallet.estimateGas(Object.assign(Object.assign({}, param), { gasLimit: BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT }));
+                }
+                catch (_d) {
+                    param.gasLimit = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT;
+                }
+            }
+            return {
+                param,
+                provider,
+                wallet,
+            };
+        });
+    }
     personal_sign(args) {
         return __awaiter(this, void 0, void 0, function* () {
             const wallet = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").generateSigner(args.account);
             const message = args.params.filter((param) => !ethers_1.ethers.utils.isAddress(param))[0];
             const convertedMessage = __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_convertHexToUtf8).call(this, message);
-            const signedMessage = yield wallet.signMessage(convertedMessage);
-            return signedMessage;
+            return yield wallet.signMessage(convertedMessage);
         });
     }
     eth_sign(args) {
@@ -77,9 +116,8 @@ class WalletConnectServiceEthereum {
     }
     eth_signTransaction(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { param, wallet } = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_resolveParams).call(this, args);
-            const signature = yield wallet.signTransaction(param);
-            return signature;
+            const { param, wallet } = yield this._resolveParams(args);
+            return yield wallet.signTransaction(param);
         });
     }
     eth_signTypedData(args) {
@@ -90,8 +128,7 @@ class WalletConnectServiceEthereum {
             const { domain, types, message } = parsedData;
             // https://github.com/ethers-io/ethers.js/issues/687#issuecomment-714069471
             delete types.EIP712Domain;
-            const signedData = yield wallet._signTypedData(domain, types, message);
-            return signedData;
+            return yield wallet._signTypedData(domain, types, message);
         });
     }
     eth_signTypedData_v3(args) {
@@ -106,7 +143,7 @@ class WalletConnectServiceEthereum {
     }
     eth_sendTransaction(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { param, provider, wallet } = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_resolveParams).call(this, args);
+            const { param, provider, wallet } = yield this._resolveParams(args);
             const connectedWallet = wallet.connect(provider);
             const { hash } = yield connectedWallet.sendTransaction(param);
             return hash;
@@ -114,7 +151,7 @@ class WalletConnectServiceEthereum {
     }
     eth_call(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { param, provider, wallet } = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_resolveParams).call(this, args);
+            const { param, provider, wallet } = yield this._resolveParams(args);
             const connectedWallet = wallet.connect(provider);
             return yield connectedWallet.call(param);
         });
@@ -164,7 +201,7 @@ class WalletConnectServiceEthereum {
     }
     calculateRequestFee(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { param, wallet, provider } = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_instances, "m", _WalletConnectServiceEthereum_resolveParams).call(this, args);
+            const { param, wallet, provider } = yield this._resolveParams(args);
             const connectedWallet = wallet.connect(provider);
             const gasPrice = yield provider.getGasPrice();
             const estimated = yield connectedWallet.estimateGas(param);
@@ -173,46 +210,7 @@ class WalletConnectServiceEthereum {
     }
 }
 exports.WalletConnectServiceEthereum = WalletConnectServiceEthereum;
-_WalletConnectServiceEthereum_service = new WeakMap(), _WalletConnectServiceEthereum_instances = new WeakSet(), _WalletConnectServiceEthereum_resolveParams = function _WalletConnectServiceEthereum_resolveParams(args) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const wallet = yield __classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").generateSigner(args.account);
-        const provider = new ethers_1.ethers.providers.JsonRpcProvider(__classPrivateFieldGet(this, _WalletConnectServiceEthereum_service, "f").network.url);
-        const param = args.params[0];
-        if (typeof param !== 'object') {
-            throw new Error('Invalid Params');
-        }
-        if (param.gas) {
-            param.gasLimit = param.gas;
-            delete param.gas;
-        }
-        if (param.type && typeof param.type !== 'number') {
-            param.type = parseInt(param.type);
-        }
-        const gasPrice = yield provider.getGasPrice();
-        if (param.type === 2) {
-            param.maxPriorityFeePerGas = (_a = param.maxPriorityFeePerGas) !== null && _a !== void 0 ? _a : gasPrice;
-            param.maxFeePerGas = (_b = param.maxPriorityFeePerGas) !== null && _b !== void 0 ? _b : gasPrice;
-        }
-        else {
-            param.gasPrice = (_c = param.gasPrice) !== null && _c !== void 0 ? _c : gasPrice;
-        }
-        if (!param.gasLimit) {
-            const connectedWallet = wallet.connect(provider);
-            try {
-                param.gasLimit = yield connectedWallet.estimateGas(Object.assign(Object.assign({}, param), { gasLimit: BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT }));
-            }
-            catch (_d) {
-                param.gasLimit = BSEthereumConstants_1.BSEthereumConstants.DEFAULT_GAS_LIMIT;
-            }
-        }
-        return {
-            param,
-            provider,
-            wallet,
-        };
-    });
-}, _WalletConnectServiceEthereum_convertHexToUtf8 = function _WalletConnectServiceEthereum_convertHexToUtf8(value) {
+_WalletConnectServiceEthereum_service = new WeakMap(), _WalletConnectServiceEthereum_instances = new WeakSet(), _WalletConnectServiceEthereum_convertHexToUtf8 = function _WalletConnectServiceEthereum_convertHexToUtf8(value) {
     if (ethers_1.ethers.utils.isHexString(value)) {
         return ethers_1.ethers.utils.toUtf8String(value);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "2.14.7",
+  "version": "2.14.8",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",
@@ -19,7 +19,7 @@
     "@ledgerhq/hw-app-eth": "~6.45.19",
     "axios": "~1.12.2",
     "ethers": "5.8.0",
-    "@cityofzion/blockchain-service": "1.22.5"
+    "@cityofzion/blockchain-service": "1.22.6"
   },
   "devDependencies": {
     "@ledgerhq/hw-transport": "~6.31.11",