carbon-js-sdk 0.3.34 → 0.3.35-beta.1

package/lib/clients/ETHClient.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ETHClient = exports.FEE_MULTIPLIER = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const constant_1 = require("../constant");
 const eth_1 = require("../eth");
 const util_1 = require("../util");
@@ -91,20 +90,22 @@ class ETHClient {
             const { fromToken, toToken, amount, toAddress, fromAddress, recoveryAddress, signer, gasPriceGwei, gasLimit, feeAmount, signCompleteCallback, } = params;
             const networkConfig = this.getNetworkConfig();
             const rpcProvider = this.getProvider();
-            if (!recoveryAddress.match(/^swth[a-z0-9]{39}$/)) {
+            const recoveryAddrRegex = new RegExp(`^${networkConfig.Bech32Prefix}[a-z0-9]{39}$`);
+            if (!recoveryAddress.match(recoveryAddrRegex)) {
                 throw new Error("Invalid recovery address");
             }
+            const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
             const fromTokenAddress = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
-            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
+            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(util_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const nonce = yield rpcProvider.getTransactionCount(fromAddress);
             const contract = new ethers_1.ethers.Contract(this.getBridgeEntranceAddr(), eth_1.ABIs.bridgeEntrance, rpcProvider);
             const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);
             const tokenCreator = fromToken.creator;
-            const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, CarbonSDK_1.default.Network.MainNet);
+            const targetAddressBytes = util_1.AddressUtils.SWTHAddress.getAddressBytes(tokenCreator, carbonNetwork);
             const targetProxyHash = ethers_1.ethers.utils.hexlify(targetAddressBytes);
             const ethAmount = fromToken.tokenAddress === constant_1.NativeTokenHash ? amount : number_1.BN_ZERO;
             const bridgeResultTx = yield contract.connect(signer).lock(fromTokenAddress, // the asset to deposit (from) (0x00 if eth)

package/lib/clients/ZILClient.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZILClient = exports.balanceBatchRequest = exports.tokenBalanceBatchRequest = exports.BatchRequestType = void 0;
-const CarbonSDK_1 = __importDefault(require("../CarbonSDK"));
 const index_1 = require("../index");
 const address_1 = require("../util/address");
 const blockchain_1 = require("../util/blockchain");
@@ -201,14 +200,16 @@ class ZILClient {
         return __awaiter(this, void 0, void 0, function* () {
             const { fromToken, toToken, amount, fromAddress, recoveryAddress, toAddress, signer, gasPrice, gasLimit, feeAmount, signCompleteCallback, } = params;
             const networkConfig = this.getNetworkConfig();
-            if (!recoveryAddress.match(/^swth[a-z0-9]{39}$/)) {
+            const recoveryAddrRegex = new RegExp(`^${networkConfig.Bech32Prefix}[a-z0-9]{39}$`);
+            if (!recoveryAddress.match(recoveryAddrRegex)) {
                 throw new Error("Invalid recovery address");
             }
+            const carbonNetwork = networkConfig.network;
             const fromTokenId = fromToken.id;
             const fromTokenAddr = (0, generic_1.appendHexPrefix)(fromToken.tokenAddress);
             const toTokenDenom = toToken.denom;
             const targetProxyHash = (0, generic_1.appendHexPrefix)(this.getTargetProxyHash(fromToken));
-            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, CarbonSDK_1.default.Network.MainNet));
+            const recoveryAddressHex = ethers_1.ethers.utils.hexlify(index_1.AddressUtils.SWTHAddress.getAddressBytes(recoveryAddress, carbonNetwork));
             const fromAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(fromTokenId));
             const toAssetHash = ethers_1.ethers.utils.hexlify(ethers_1.ethers.utils.toUtf8Bytes(toTokenDenom));
             const feeAddress = (0, generic_1.appendHexPrefix)(networkConfig.feeAddress);

package/lib/constant/ibc.js

@@ -1859,6 +1859,7 @@ exports.EmbedChainInfosInit = {
             coinType: 60,
         },
         bech32Config: exports.IBCAddress.defaultBech32Config("canto"),
+        coinType: 60,
         currencies: [
             {
                 coinDenom: "CANTO",

package/lib/constant/network.js

@@ -125,7 +125,7 @@ exports.NetworkConfigs = {
             networkMagic: neon_core_next_1.CONST.MAGIC_NUMBER.TestNet,
         },
         zil: {
-            rpcURL: "",
+            rpcURL: "https://dev-api.zilliqa.com",
             lockProxyAddr: "0xe7bef341044f1b8d5ab1a25172e2678a1e75479a",
             bridgeEntranceAddr: "0xccf798e633d6fb6505b494fc010903f9be3bc99b",
             chainId: 111,

package/lib/util/blockchain.d.ts

@@ -1,3 +1,4 @@
+import { Network } from "../constant/network";
 import { SimpleMap } from "./type";
 export declare enum Blockchain {
     Neo = "neo",
@@ -54,4 +55,4 @@ export declare const chainIdsByBlockchain: SimpleMap<ChainIds>;
 export declare function parseBlockchain(value: string | null): Blockchain | null;
 export declare function getChainFromID(id: number): string | undefined;
 export declare const getBlockchainFromChain: (chainId?: number | undefined) => Blockchain.Ethereum | Blockchain.BinanceSmartChain | Blockchain.Zilliqa | Blockchain.Arbitrum | undefined;
-export declare const blockchainForChainId: (chainId?: number | undefined) => Blockchain | undefined;
+export declare const blockchainForChainId: (chainId?: number | undefined, network?: Network) => Blockchain | undefined;

package/lib/util/blockchain.js

@@ -127,68 +127,101 @@ const getBlockchainFromChain = (chainId) => {
     return undefined;
 };
 exports.getBlockchainFromChain = getBlockchainFromChain;
-const blockchainForChainId = (chainId) => {
-    switch (chainId) {
-        case 0:
-            return Blockchain.Native;
-        case 1:
-            return Blockchain.Btc;
-        case 2:
-        case 350: // devnet
-            return Blockchain.Ethereum;
-        case 4:
-        case 5: // devnet
-            return Blockchain.Neo;
-        case 6:
-        case 79: // devnet
-            return Blockchain.BinanceSmartChain;
-        case 9: // mainnet
-        case 10:
-        case 18:
-        case 110: // testnet
-        case 111:
-            return Blockchain.Zilliqa;
-        case 14: // mainnet
-        case 88: // testnet
-            return Blockchain.Neo3;
-        case 19: // mainnet
-            return Blockchain.Arbitrum;
-        case 244: // mainnet
-            return Blockchain.Osmosis;
-        case 245: // mainnet
-            return Blockchain.Terra;
-        case 246: // mainnet
-            return Blockchain.CosmosHub;
-        case 247: // mainnet
-            return Blockchain.Juno;
-        case 248: // mainnet
-            return Blockchain.Evmos;
-        case 249: // mainnet
-            return Blockchain.Axelar;
-        case 313: // mainnet
-            return Blockchain.Stride;
-        case 314: // mainnnet
-            return Blockchain.Kujira;
-        case 315: // mainnnet
-            return Blockchain.Terra2;
-        case 316: // mainnnet
-            return Blockchain.Quicksilver;
-        case 317: // mainnnet
-            return Blockchain.Comdex;
-        case 318: // mainnnet
-            return Blockchain.StafiHub;
-        case 319: // mainnnet
-            return Blockchain.Persistence;
-        case 320: // mainnnet
-            return Blockchain.Stargaze;
-        case 321: // mainnnet
-            return Blockchain.Canto;
-        case 322: // mainnnet
-            return Blockchain.OmniFlixHub;
-        case 323: // mainnnet
-            return Blockchain.Agoric;
-        case 42161: // mainnnet
-            return Blockchain.Arbitrum;
+const blockchainForChainId = (chainId, network = network_1.Network.MainNet) => {
+    switch (network) {
+        case network_1.Network.MainNet:
+            switch (chainId) {
+                case 0:
+                    return Blockchain.Native;
+                case 1:
+                    return Blockchain.Btc;
+                case 2:
+                    return Blockchain.Ethereum;
+                case 4:
+                    return Blockchain.Neo;
+                case 6:
+                    return Blockchain.BinanceSmartChain;
+                case 14:
+                    return Blockchain.Neo3;
+                case 9: /* FALLTHROUGH */
+                case 18:
+                    return Blockchain.Zilliqa;
+                case 244:
+                    return Blockchain.Osmosis;
+                case 13: /* FALLTHROUGH */
+                case 245:
+                    return Blockchain.Terra;
+                case 246:
+                    return Blockchain.CosmosHub;
+                case 5: /* FALLTHROUGH */
+                case 247:
+                    return Blockchain.Juno;
+                case 7: /* FALLTHROUGH */
+                case 248:
+                    return Blockchain.Evmos;
+                case 8: /* FALLTHROUGH */
+                case 249:
+                    return Blockchain.Axelar;
+                case 313:
+                    return Blockchain.Stride;
+                case 314:
+                    return Blockchain.Kujira;
+                case 315:
+                    return Blockchain.Terra2;
+                case 316:
+                    return Blockchain.Quicksilver;
+                case 12: /* FALLTHROUGH */
+                case 317:
+                    return Blockchain.Comdex;
+                case 318:
+                    return Blockchain.StafiHub;
+                case 15: /* FALLTHROUGH */
+                case 319:
+                    return Blockchain.Persistence;
+                case 16: /* FALLTHROUGH */
+                case 320:
+                    return Blockchain.Stargaze;
+                case 321:
+                    return Blockchain.Canto;
+                case 322:
+                    return Blockchain.OmniFlixHub;
+                case 323:
+                    return Blockchain.Agoric;
+                case 19: /* FALLTHROUGH */
+                case 42161:
+                    return Blockchain.Arbitrum;
+                default:
+                    return undefined;
+            }
+        case network_1.Network.TestNet:
+            switch (chainId) {
+                case 1:
+                    return Blockchain.Btc;
+                case 5:
+                    return Blockchain.Carbon;
+                case 79:
+                    return Blockchain.BinanceSmartChain;
+                case 88:
+                    return Blockchain.Neo3;
+                case 111:
+                    return Blockchain.Zilliqa;
+                case 2: /* FALLTHROUGH */
+                case 502:
+                    return Blockchain.Ethereum;
+                default:
+                    return undefined;
+            }
+        case network_1.Network.DevNet:
+            switch (chainId) {
+                case 350:
+                    return Blockchain.Ethereum;
+                case 5:
+                    return Blockchain.Neo;
+                case 79:
+                    return Blockchain.BinanceSmartChain;
+            }
+        case network_1.Network.LocalHost:
+            return undefined;
         default:
             return undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "carbon-js-sdk",
-  "version": "0.3.34",
+  "version": "0.3.35-beta.1+753bb5becabd",
   "description": "TypeScript SDK for Carbon blockchain",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",