fix: remove rainbow-bridge-cli to upgrade eth-object

aurora-is-near · Apr 28, 2021 · b13b908 · b13b908
1 parent 71bcf4f
commit b13b908
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 1,587 deletions.
diff --git a/.config.js b/.config.js
@@ -20,7 +20,7 @@ module.exports = {
     ...localConfig,
     ethNetwork: 'localhost:9545',
     ethErc20AbiText: readFileSync('./abi/erc20.abi'),
-    ethLockerAbiText: readFileSync('./node_modules/rainbow-token-connector/res/ERC20Locker.full.abi'),
+    ethLockerAbiText: readFileSync('./abi/ERC20Locker.full.abi'),
     nearClientAccount: 'rainbow_bridge_eth_on_near_client',
     nearWalletUrl: 'http://localhost:4000/',
     nearHelperUrl: 'http://localhost:3000/'
@@ -31,7 +31,7 @@ module.exports = {
     ethNearOnEthClientAbiText: readFileSync('./abi/nearOnEthClient.abi'),
     ethEd25519Address: '0xe729ee84db978d7971bbc5079fd32bb0ae8d1856',
     ethErc20AbiText: readFileSync('./abi/erc20.abi'),
-    ethLockerAbiText: readFileSync('./node_modules/rainbow-token-connector/res/BridgeTokenFactory.full.abi'),
+    ethLockerAbiText: readFileSync('./abi/ERC20Locker.full.abi'),
     ethLockerAddress: '0xb48e6441524f261e141bc766a7ebd54b19ca7465',
     ethProverAddress: '0xb3df48b0ea3e91b43226fb3c5eb335b7e3d76faa',
     ethProverAbiText: readFileSync('./abi/prover.abi'),
@@ -58,7 +58,7 @@ module.exports = {
     ethNearOnEthClientAbiText: readFileSync('./abi/nearOnEthClient.abi'),
     ethEd25519Address: '0xa9e58bed3649e535dba9fa594e67e39575db3f4b',
     ethErc20AbiText: readFileSync('./abi/erc20.abi'),
-    ethLockerAbiText: readFileSync('./node_modules/rainbow-token-connector/res/BridgeTokenFactory.full.abi'),
+    ethLockerAbiText: readFileSync('./abi/ERC20Locker.full.abi'),
     ethLockerAddress: '0x6381a3bad6b51988497dc588496ad1177d1650ea',
     ethProverAddress: '0x57d7dc68f98bd09b8d1ea46aac61c305f203f104',
     ethProverAbiText: readFileSync('./abi/prover.abi'),
@@ -82,7 +82,7 @@ module.exports = {
     ethClientAddress: '0x0151568af92125fb289f1dd81d9d8f7484efc362',
     ethNearOnEthClientAbiText: readFileSync('./abi/nearOnEthClient.abi'),
     ethErc20AbiText: readFileSync('./abi/erc20.abi'),
-    ethLockerAbiText: readFileSync('./node_modules/rainbow-token-connector/res/BridgeTokenFactory.full.abi'),
+    ethLockerAbiText: readFileSync('./abi/ERC20Locker.full.abi'),
     ethLockerAddress: '0x23ddd3e3692d1861ed57ede224608875809e127f',
     nearClientAccount: 'client.bridge.near',
     nearHelperUrl: 'https://helper.near.org',

diff --git a/abi/ERC20Locker.full.abi b/abi/ERC20Locker.full.abi
@@ -0,0 +1 @@
+[{"inputs":[{"internalType":"bytes","name":"nearTokenFactory","type":"bytes"},{"internalType":"contract INearProver","name":"prover","type":"address"},{"internalType":"uint64","name":"minBlockAcceptanceHeight","type":"uint64"},{"internalType":"address","name":"_admin","type":"address"},{"internalType":"uint256","name":"pausedFlags","type":"uint256"}],"stateMutability":"nonpayable","type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"internalType":"address","name":"token","type":"address"},{"indexed":true,"internalType":"address","name":"sender","type":"address"},{"indexed":false,"internalType":"uint256","name":"amount","type":"uint256"},{"indexed":false,"internalType":"string","name":"accountId","type":"string"}],"name":"Locked","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"internalType":"uint128","name":"amount","type":"uint128"},{"indexed":false,"internalType":"address","name":"recipient","type":"address"}],"name":"Unlocked","type":"event"},{"inputs":[],"name":"admin","outputs":[{"internalType":"address","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"target","type":"address"},{"internalType":"bytes","name":"data","type":"bytes"}],"name":"adminDelegatecall","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"uint256","name":"flags","type":"uint256"}],"name":"adminPause","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"adminReceiveEth","outputs":[],"stateMutability":"payable","type":"function"},{"inputs":[{"internalType":"address payable","name":"destination","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"adminSendEth","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"uint256","name":"key","type":"uint256"},{"internalType":"uint256","name":"value","type":"uint256"}],"name":"adminSstore","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"contract IERC20","name":"token","type":"address"},{"internalType":"address","name":"destination","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"}],"name":"adminTransfer","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"address","name":"ethToken","type":"address"},{"internalType":"uint256","name":"amount","type":"uint256"},{"internalType":"string","name":"accountId","type":"string"}],"name":"lockToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[],"name":"minBlockAcceptanceHeight_","outputs":[{"internalType":"uint64","name":"","type":"uint64"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"nearTokenFactory_","outputs":[{"internalType":"bytes","name":"","type":"bytes"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"paused","outputs":[{"internalType":"uint256","name":"","type":"uint256"}],"stateMutability":"view","type":"function"},{"inputs":[],"name":"prover_","outputs":[{"internalType":"contract INearProver","name":"","type":"address"}],"stateMutability":"view","type":"function"},{"inputs":[{"internalType":"address","name":"_from","type":"address"},{"internalType":"uint256","name":"_value","type":"uint256"},{"internalType":"bytes","name":"_data","type":"bytes"}],"name":"tokenFallback","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[{"internalType":"bytes","name":"proofData","type":"bytes"},{"internalType":"uint64","name":"proofBlockHeight","type":"uint64"}],"name":"unlockToken","outputs":[],"stateMutability":"nonpayable","type":"function"},{"inputs":[{"internalType":"bytes32","name":"","type":"bytes32"}],"name":"usedProofs_","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"view","type":"function"}]
diff --git a/package.json b/package.json
@@ -31,12 +31,11 @@
     "parcel-plugin-asset-copier": "^1.1.0",
     "parcel-transformer-google-fonts": "^0.1.3",
     "posthtml-include": "^1.7.0",
-    "rainbow-bridge-cli": "^3.0.0",
     "semantic-release": "^17.4.2"
   },
   "dependencies": {
     "@near-eth/client": "^1.2.0",
-    "@near-eth/nep141-erc20": "^1.3.2",
+    "@near-eth/nep141-erc20": "^1.3.3",
     "decimal.js": "^10.2.1",
     "near-api-js": "^0.39.0",
     "@walletconnect/web3-provider": "^1.4.1",