diff --git a/package-lock.json b/package-lock.json index 522e404..de540b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1647,9 +1647,9 @@ "dev": true }, "node_modules/browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, "funding": [ { @@ -1662,10 +1662,10 @@ } ], "dependencies": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "update-browserslist-db": "^1.0.9" }, "bin": { "browserslist": "cli.js" @@ -1741,9 +1741,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001375", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz", - "integrity": "sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==", + "version": "1.0.30001415", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz", + "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==", "dev": true, "funding": [ { @@ -1996,9 +1996,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.213", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz", - "integrity": "sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg==", + "version": "1.4.271", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz", + "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA==", "dev": true }, "node_modules/elliptic": { @@ -3515,9 +3515,9 @@ } }, "node_modules/update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", + "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", "dev": true, "funding": [ { @@ -5053,15 +5053,15 @@ } }, "browserslist": { - "version": "4.21.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.3.tgz", - "integrity": "sha512-898rgRXLAyRkM1GryrrBHGkqA5hlpkV5MhtZwg9QXeiyLUYs2k00Un05aX5l2/yJIOObYKOpS2JNo8nJDE7fWQ==", + "version": "4.21.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.4.tgz", + "integrity": "sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001370", - "electron-to-chromium": "^1.4.202", + "caniuse-lite": "^1.0.30001400", + "electron-to-chromium": "^1.4.251", "node-releases": "^2.0.6", - "update-browserslist-db": "^1.0.5" + "update-browserslist-db": "^1.0.9" } }, "bs58": { @@ -5113,9 +5113,9 @@ } }, "caniuse-lite": { - "version": "1.0.30001375", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001375.tgz", - "integrity": "sha512-kWIMkNzLYxSvnjy0hL8w1NOaWNr2rn39RTAVyIwcw8juu60bZDWiF1/loOYANzjtJmy6qPgNmn38ro5Pygagdw==", + "version": "1.0.30001415", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001415.tgz", + "integrity": "sha512-ER+PfgCJUe8BqunLGWd/1EY4g8AzQcsDAVzdtMGKVtQEmKAwaFfU6vb7EAVIqTMYsqxBorYZi2+22Iouj/y7GQ==", "dev": true }, "chalk": { @@ -5322,9 +5322,9 @@ } }, "electron-to-chromium": { - "version": "1.4.213", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.213.tgz", - "integrity": "sha512-+3DbGHGOCHTVB/Ms63bGqbyC1b8y7Fk86+7ltssB8NQrZtSCvZG6eooSl9U2Q0yw++fL2DpHKOdTU0NVEkFObg==", + "version": "1.4.271", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.271.tgz", + "integrity": "sha512-BCPBtK07xR1/uY2HFDtl3wK2De66AW4MSiPlLrnPNxKC/Qhccxd59W73654S3y6Rb/k3hmuGJOBnhjfoutetXA==", "dev": true }, "elliptic": { @@ -6439,9 +6439,9 @@ "dev": true }, "update-browserslist-db": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.5.tgz", - "integrity": "sha512-dteFFpCyvuDdr9S/ff1ISkKt/9YZxKjI9WlRR99c180GaztJtRa/fn18FdxGVKVsnPY7/a/FDN68mcvUmP4U7Q==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.9.tgz", + "integrity": "sha512-/xsqn21EGVdXI3EXSum1Yckj3ZVZugqyOZQ/CxYPBD/R+ko9NSUScf8tFF4dOKY+2pvSSJA/S+5B8s4Zr4kyvg==", "dev": true, "requires": { "escalade": "^3.1.1", diff --git a/package.json b/package.json index e03205c..2f6220e 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,10 @@ "url": "https://github.com/terra-money/bridge-sdk/issues" }, "homepage": "https://github.com/terra-money/bridge-sdk#readme", + "browserslist": [ + "IE 11", + "last 3 Chrome versions" + ], "devDependencies": { "@types/node": "^18.6.5", "buffer": "^6.0.3", diff --git a/src/const/index.ts b/src/const/index.ts index f23da10..937886d 100644 --- a/src/const/index.ts +++ b/src/const/index.ts @@ -1,4 +1,4 @@ export * from './bridges' export * from './chains' export * from './coin' -export * from './wallet' \ No newline at end of file +export * from './wallet' diff --git a/src/util/index.ts b/src/util/index.ts index a3b4f55..6f5a556 100644 --- a/src/util/index.ts +++ b/src/util/index.ts @@ -1 +1 @@ -export * from './address' \ No newline at end of file +export * from './address' diff --git a/src/wallets/metamask/MetaMaskWallet.ts b/src/wallets/metamask/MetaMaskWallet.ts index 4f42c6d..388ee8d 100644 --- a/src/wallets/metamask/MetaMaskWallet.ts +++ b/src/wallets/metamask/MetaMaskWallet.ts @@ -4,7 +4,7 @@ import { chainIDs, ChainType } from '../../const/chains' import { getAxelarDepositAddress } from '../../packages/axelar' import { Tx, TxResult, Wallet } from '../Wallet' import { ethers } from 'ethers' -import abi from './abi.json' +import abi from './abi' declare global { interface Window { diff --git a/src/wallets/metamask/abi.json b/src/wallets/metamask/abi.json deleted file mode 100644 index 93cb183..0000000 --- a/src/wallets/metamask/abi.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - "function balanceOf(address owner) view returns (uint256)", - "function decimals() view returns (uint8)", - "function symbol() view returns (string)", - - "function earned(address account) public view returns (uint256)", - "function allowance(address owner, address spender) external view returns (uint256)", - - "function totalSupply() public view returns (uint256)", - "function currentReward() public view returns (uint256)", - "function lastTimeRewardApplicable() public view returns (uint256)", - "function rewardPerToken() public view returns (uint256)", - - "function transfer(address to, uint amount) returns (boolean)", - "function burn(uint256 amount, bytes32 to) returns (boolean)", - "function approve(address spender, uint256 amount) external returns (bool)", - "function stake(uint256 amount) external", - "function withdraw(uint256 amount) external", - "function getReward() external", - "function claim(uint256 index, address account, uint256 amount, bytes32[] calldata merkleProof) external", - - "event Transfer(address indexed from, address indexed to, uint amount)" -] diff --git a/src/wallets/metamask/abi.ts b/src/wallets/metamask/abi.ts new file mode 100644 index 0000000..38e0fe4 --- /dev/null +++ b/src/wallets/metamask/abi.ts @@ -0,0 +1,23 @@ +export default [ + 'function balanceOf(address owner) view returns (uint256)', + 'function decimals() view returns (uint8)', + 'function symbol() view returns (string)', + + 'function earned(address account) public view returns (uint256)', + 'function allowance(address owner, address spender) external view returns (uint256)', + + 'function totalSupply() public view returns (uint256)', + 'function currentReward() public view returns (uint256)', + 'function lastTimeRewardApplicable() public view returns (uint256)', + 'function rewardPerToken() public view returns (uint256)', + + 'function transfer(address to, uint amount) returns (boolean)', + 'function burn(uint256 amount, bytes32 to) returns (boolean)', + 'function approve(address spender, uint256 amount) external returns (bool)', + 'function stake(uint256 amount) external', + 'function withdraw(uint256 amount) external', + 'function getReward() external', + 'function claim(uint256 index, address account, uint256 amount, bytes32[] calldata merkleProof) external', + + 'event Transfer(address indexed from, address indexed to, uint amount)', +] diff --git a/tsconfig.json b/tsconfig.json index 4c4f249..5cf86fd 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,5 +1,3 @@ - - { "include": ["src", "types"], "exclude": ["/node_modules/", "./src/**/*.spec.ts"], @@ -25,10 +23,10 @@ "strictFunctionTypes": true, "strictNullChecks": true, "strictPropertyInitialization": true, - "resolveJsonModule": true, "target": "es5", "paths": { "*": ["src/*"] - } + }, + "resolveJsonModule": true } } \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 5b9e631..b4cbb61 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,6 +1,5 @@ const webpack = require('webpack') const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin') -// const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin; const commonConfig = { mode: 'production', @@ -9,7 +8,7 @@ const commonConfig = { module: { rules: [ { - test: /\.tsx?$/, + test: /\.ts$/, use: 'ts-loader', exclude: /node_modules/, }, @@ -26,7 +25,7 @@ const webConfig = { ...commonConfig, target: 'web', output: { - filename: 'bundle.js', + filename: 'index.js', libraryTarget: 'umd', library: 'Terra', }, @@ -34,8 +33,8 @@ const webConfig = { ...commonConfig.resolve, fallback: { stream: require.resolve('stream-browserify'), - crypto: require.resolve('crypto-browserify'), buffer: require.resolve('buffer'), + crypto: require.resolve('crypto-browserify'), path: require.resolve('path-browserify'), }, }, @@ -50,13 +49,4 @@ const webConfig = { ], } -const nodeConfig = { - ...commonConfig, - target: 'node', - output: { - libraryTarget: 'commonjs', - filename: 'bundle.node.js', - }, -} - module.exports = [webConfig]