carbon-js-sdk 0.11.2 → 0.11.3-beta.1

package/lib/constant/ibc.js

@@ -204,7 +204,6 @@ exports.EmbedChainInfosInit = {
                 coinGeckoId: "cosmos",
             },
         ],
-        coinType: 118,
         features: ["ibc-transfer", "ibc-go"],
         explorerUrlToTx: "https://www.mintscan.io/cosmos/txs/{txHash}",
         tmRpc: "https://rpc.cosmos.network/",
@@ -303,7 +302,6 @@ exports.EmbedChainInfosInit = {
                 coinGeckoId: "secret",
             },
         ],
-        coinType: 118,
         features: ["ibc-transfer", "ibc-go"],
         explorerUrlToTx: "https://secretnodes.com/secret/chains/secret-4/transactions/{txHash}",
     },
@@ -338,7 +336,6 @@ exports.EmbedChainInfosInit = {
                 coinGeckoId: "akash-network",
             },
         ],
-        coinType: 118,
         features: ["ibc-transfer", "ibc-go"],
         explorerUrlToTx: "https://www.mintscan.io/akash/txs/{txHash}",
     },
@@ -1138,7 +1135,6 @@ exports.EmbedChainInfosInit = {
                 coinGeckoId: "pool:ulum",
             },
         ],
-        coinType: 118,
         features: ["ibc-transfer", "ibc-go"],
         explorerUrlToTx: "https://www.mintscan.io/lum/txs/{txHash}",
         tmRpc: "https://node0.mainnet.lum.network/rpc/",
@@ -1174,7 +1170,6 @@ exports.EmbedChainInfosInit = {
                 coinGeckoId: "vidulum",
             },
         ],
-        coinType: 370,
         features: ["ibc-transfer", "ibc-go"],
         explorerUrlToTx: "https://explorers.vidulum.app/vidulum/tx/{txHash}",
         tmRpc: "https://mainnet-rpc.vidulum.app/",
@@ -1889,7 +1884,6 @@ exports.EmbedChainInfosInit = {
             coinType: 60,
         },
         bech32Config: exports.IBCAddress.defaultBech32Config("canto"),
-        coinType: 60,
         currencies: [
             {
                 coinDenom: "CANTO",

package/lib/provider/keplr/KeplrAccount.js

@@ -50,13 +50,13 @@ class KeplrAccount {
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
             try {
-                const request = yield ethermint_1.populateEvmTransactionDetails(api, req);
+                const unsignedTx = yield ethermint_1.populateUnsignedEvmTranscation(api, req);
                 const signedTx = yield keplr.signEthereum(
                 // carbon chain id
                 (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.getChainId()) !== null && _b !== void 0 ? _b : '', 
                 // cosmos address
-                (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(request), types_1.EthSignType.TRANSACTION);
-                const rlpEncodedHex = `0x${Buffer.from(signedTx).toString('hex')}`;
+                (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
+                const rlpEncodedHex = ethers_1.ethers.utils.serializeTransaction(unsignedTx, signedTx);
                 const provider = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[api.network].evmJsonRpcUrl);
                 return (yield provider.sendTransaction(rlpEncodedHex)).hash;
             }
@@ -96,13 +96,14 @@ class KeplrAccount {
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c, _d;
             try {
-                const request = yield ethermint_1.populateEvmTransactionDetails(api, req);
+                const unsignedTx = yield ethermint_1.populateUnsignedEvmTranscation(api, req);
                 const signedTx = yield keplr.signEthereum(
                 // carbon chain id
                 (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.getChainId()) !== null && _b !== void 0 ? _b : '', 
                 // cosmos address
-                (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(request), types_1.EthSignType.TRANSACTION);
-                const rlpEncodedHex = `0x${Buffer.from(signedTx).toString('hex')}`;
+                (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
+                // const rlpEncodedHex = `0x${Buffer.from(signedTx).toString('hex')}`
+                const rlpEncodedHex = ethers_1.ethers.utils.serializeTransaction(unsignedTx, signedTx);
                 const provider = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[api.network].evmJsonRpcUrl);
                 return (yield provider.sendTransaction(rlpEncodedHex)).hash;
             }
@@ -199,6 +200,10 @@ class KeplrAccount {
                 rpc: config.tmRpcUrl,
                 chainName: `Carbon (${config.network})`,
                 chainId: chainId,
+                evm: {
+                    chainId: Number(ethermint_1.parseChainId(constant_1.CarbonEvmChainIDs[config.network])),
+                    rpc: config.evmJsonRpcUrl,
+                },
                 bech32Config: {
                     bech32PrefixAccAddr: `${bech32Prefix}`,
                     bech32PrefixAccPub: `${bech32Prefix}pub`,

package/lib/provider/leap/LeapAccount.js

@@ -12,7 +12,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const constant_1 = require("../../constant");
 const util_1 = require("../../util");
 const wallet_1 = require("../../wallet");
+const types_1 = require("@keplr-wallet/types");
+const ethers_1 = require("ethers");
 const provider_1 = require("../../util/provider");
+const ethermint_1 = require("../../util/ethermint");
+const error_1 = require("../metamask/error");
 const SWTH = {
     coinDenom: "SWTH",
     coinMinimalDenom: "swth",
@@ -45,7 +49,29 @@ class LeapAccount {
             ];
         });
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
-            throw new Error("signing not available");
+            var _a, _b, _c, _d;
+            try {
+                // workaround for version mismatch in cosmos-kit/leap and leap-extension
+                const leapInterface = leap;
+                if (typeof leapInterface.signEthereum === 'function') {
+                    const unsignedTx = yield ethermint_1.populateUnsignedEvmTranscation(api, req);
+                    const signedTx = yield leapInterface.signEthereum(
+                    // carbon chain id
+                    (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.getChainId()) !== null && _b !== void 0 ? _b : '', 
+                    // cosmos address
+                    (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
+                    const rlpEncodedHex = ethers_1.ethers.utils.serializeTransaction(unsignedTx, signedTx);
+                    const provider = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[api.network].evmJsonRpcUrl);
+                    return (yield provider.sendTransaction(rlpEncodedHex)).hash;
+                }
+                else {
+                    throw new Error("signing not available");
+                }
+            }
+            catch (error) {
+                console.error(error);
+                throw (error_1.parseEvmError(error));
+            }
         });
         const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
             const { signature } = yield leap.signArbitrary(chainId, address, message);
@@ -78,7 +104,29 @@ class LeapAccount {
             ];
         });
         const sendEvmTransaction = (api, req) => __awaiter(this, void 0, void 0, function* () {
-            throw new Error("signing not available");
+            var _a, _b, _c, _d;
+            try {
+                const leapInterface = leap;
+                if (typeof leapInterface.signEthereum === 'function') {
+                    const unsignedTx = yield ethermint_1.populateUnsignedEvmTranscation(api, req);
+                    console.log('xx unsignedTx', unsignedTx);
+                    const signedTx = yield leapInterface.signEthereum(
+                    // carbon chain id
+                    (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.getChainId()) !== null && _b !== void 0 ? _b : '', 
+                    // cosmos address
+                    (_d = (_c = api.wallet) === null || _c === void 0 ? void 0 : _c.bech32Address) !== null && _d !== void 0 ? _d : '', JSON.stringify(unsignedTx), types_1.EthSignType.TRANSACTION);
+                    const rlpEncodedHex = ethers_1.ethers.utils.serializeTransaction(unsignedTx, signedTx);
+                    const provider = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[api.network].evmJsonRpcUrl);
+                    return (yield provider.sendTransaction(rlpEncodedHex)).hash;
+                }
+                else {
+                    throw new Error("signing not available");
+                }
+            }
+            catch (error) {
+                console.error(error);
+                throw (error_1.parseEvmError(error));
+            }
         });
         const signMessage = (address, message) => __awaiter(this, void 0, void 0, function* () {
             const { signature } = yield leap.signArbitrary(chainId, address, message);

package/lib/util/ethermint.d.ts

@@ -6,3 +6,4 @@ export declare const PUBLIC_KEY_SIGNING_TEXT = "Sign your public key to merge yo
 export declare function encodeAnyEthSecp256k1PubKey(pubkey: Uint8Array): Any;
 export declare function parseChainId(evmChainId?: string): string;
 export declare function populateEvmTransactionDetails(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<ethers.providers.TransactionRequest>;
+export declare function populateUnsignedEvmTranscation(api: CarbonSDK, req: ethers.providers.TransactionRequest): Promise<ethers.utils.UnsignedTransaction>;

package/lib/util/ethermint.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.populateEvmTransactionDetails = exports.parseChainId = exports.encodeAnyEthSecp256k1PubKey = exports.PUBLIC_KEY_SIGNING_TEXT = exports.ETH_SECP256K1_TYPE = void 0;
+exports.populateUnsignedEvmTranscation = exports.populateEvmTransactionDetails = exports.parseChainId = exports.encodeAnyEthSecp256k1PubKey = exports.PUBLIC_KEY_SIGNING_TEXT = exports.ETH_SECP256K1_TYPE = void 0;
 const codec_1 = require("../codec");
 const keys_1 = require("../codec/ethermint/crypto/v1/ethsecp256k1/keys");
 const constant_1 = require("../constant");
@@ -72,3 +72,47 @@ function populateEvmTransactionDetails(api, req) {
     });
 }
 exports.populateEvmTransactionDetails = populateEvmTransactionDetails;
+function populateUnsignedEvmTranscation(api, req) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    return __awaiter(this, void 0, void 0, function* () {
+        const provider = new ethers_1.ethers.providers.JsonRpcProvider(constant_1.NetworkConfigs[api.network].evmJsonRpcUrl);
+        const evmHexAddress = (_b = (_a = api.wallet) === null || _a === void 0 ? void 0 : _a.evmHexAddress) !== null && _b !== void 0 ? _b : '';
+        const nonce = (_c = req.nonce) !== null && _c !== void 0 ? _c : (yield provider.getTransactionCount(evmHexAddress));
+        const chainId = (_d = req.chainId) !== null && _d !== void 0 ? _d : Number(parseChainId((_f = yield ((_e = api.wallet) === null || _e === void 0 ? void 0 : _e.getEvmChainId())) !== null && _f !== void 0 ? _f : ''));
+        const value = req.value ? `0x${Number(req.value).toString(16)}` : undefined;
+        const baseTx = {
+            to: (_g = req.to) !== null && _g !== void 0 ? _g : '',
+            from: (_h = req.from) !== null && _h !== void 0 ? _h : (_j = api.wallet) === null || _j === void 0 ? void 0 : _j.evmHexAddress,
+            nonce,
+            data: req.data,
+            value,
+            chainId,
+            // type = 0, 1 or 2 where 0 = legacyTx, 1 = AccessListTx, 2 = DynamicTx. Defaults to DynamicTx 
+            type: (_k = req.type) !== null && _k !== void 0 ? _k : 2,
+            accessList: req.accessList,
+        };
+        const gasLimit = (yield provider.estimateGas(baseTx)).toHexString();
+        const gasFee = yield provider.getFeeData();
+        const unsignedTx = {
+            to: (_l = req.to) !== null && _l !== void 0 ? _l : '',
+            nonce: parseInt(nonce.toString()),
+            data: req.data,
+            value,
+            chainId,
+            // type = 0, 1 or 2 where 0 = legacyTx, 1 = AccessListTx, 2 = DynamicTx. Defaults to DynamicTx 
+            type: (_m = req.type) !== null && _m !== void 0 ? _m : 2,
+            accessList: req.accessList,
+        };
+        if (!req.gasPrice) {
+            // Dynamic Tx
+            return Object.assign(Object.assign({}, unsignedTx), { maxPriorityFeePerGas: (_o = req.maxPriorityFeePerGas) !== null && _o !== void 0 ? _o : (_p = gasFee.maxPriorityFeePerGas) === null || _p === void 0 ? void 0 : _p.toHexString(), maxFeePerGas: (_q = req.maxFeePerGas) !== null && _q !== void 0 ? _q : (_r = gasFee.maxFeePerGas) === null || _r === void 0 ? void 0 : _r.toHexString(), gasLimit, type: 2 });
+        }
+        if (req.accessList) {
+            // AccessList Tx 
+            return Object.assign(Object.assign({}, unsignedTx), { gasLimit, type: 1 });
+        }
+        // LegacyTx
+        return Object.assign(Object.assign({}, unsignedTx), { gasLimit, type: 0 });
+    });
+}
+exports.populateUnsignedEvmTranscation = populateUnsignedEvmTranscation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.11.2",
+  "version": "0.11.3-beta.1",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -44,7 +44,7 @@
     "@cosmos-kit/leap": "^0.15.12",
     "@improbable-eng/grpc-web": "^0.15.0",
     "@improbable-eng/grpc-web-node-http-transport": "^0.15.0",
-    "@keplr-wallet/types": "^0.11.64",
+    "@keplr-wallet/types": "^0.12.107",
     "@ledgerhq/hw-transport-webhid": "^6.20.0",
     "@ledgerhq/hw-transport-webusb": "^6.20.0",
     "@metamask/detect-provider": "^2.0.0",