diff --git a/init/eth-contracts.js b/init/eth-contracts.js index 191c3de95..74b77a51b 100644 --- a/init/eth-contracts.js +++ b/init/eth-contracts.js @@ -97,6 +97,7 @@ class InitEthLocker { const success = await ethContractInitializer.execute( contractName, [ + RainbowConfig.getParam('eth-erc20-address'), Buffer.from(RainbowConfig.getParam('near-fun-token-account'), 'utf8'), RainbowConfig.getParam('eth-prover-address'), ], diff --git a/near-mintable-token/index.js b/near-mintable-token/index.js index c3752a658..ab622987c 100644 --- a/near-mintable-token/index.js +++ b/near-mintable-token/index.js @@ -27,7 +27,7 @@ class NearMintableToken extends BorshContract { viewMethods: [], changeMethods: [ { - methodName: 'deposit', + methodName: 'mint', inputFieldType: 'Proof', outputFieldType: null, }, diff --git a/package.json b/package.json index 1a5df97ed..4073b9f97 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rainbow-bridge-lib", - "version": "1.0.3", + "version": "1.0.2", "description": "lib lib", "author": "Near Inc.", "repository": { diff --git a/transfer-eth-erc20/to-near.js b/transfer-eth-erc20/to-near.js index 7168021ce..912a80bf8 100644 --- a/transfer-eth-erc20/to-near.js +++ b/transfer-eth-erc20/to-near.js @@ -63,11 +63,7 @@ class TransferETHERC20ToNear { const transaction = await robustWeb3.callContract( ethTokenLockerContract, 'lockToken', - [ - RainbowConfig.getParam('eth-erc20-address'), - Number(amount), - nearReceiverAccount, - ], + [Number(amount), nearReceiverAccount], { from: ethSenderAccount, gas: 5000000, @@ -183,7 +179,7 @@ class TransferETHERC20ToNear { }) } - static async deposit({ + static async mint({ proof_locker, nearTokenContract, nearTokenContractBorsh, @@ -198,17 +194,17 @@ class TransferETHERC20ToNear { ) // @ts-ignore try { - await nearTokenContractBorsh.deposit( + await nearTokenContractBorsh.mint( proof_locker, new BN('300000000000000'), - // We need to attach tokens because minting (deposit) increases the contract state, by <600 bytes, which + // We need to attach tokens because minting increases the contract state, by <600 bytes, which // requires an additional 0.06 NEAR to be deposited to the account for state staking. // Note technically 0.0537 NEAR should be enough, but we round it up to stay on the safe side. new BN('100000000000000000000').mul(new BN('600')) ) console.log('Transferred') } catch (e) { - console.log('Deposit failed with error:') + console.log('Mint failed with error:') console.log(e) TransferETHERC20ToNear.showRetryAndExit() } @@ -368,7 +364,7 @@ class TransferETHERC20ToNear { transferLog = TransferETHERC20ToNear.loadTransferLog() } if (transferLog.finished === 'block-safe') { - await TransferETHERC20ToNear.deposit({ + await TransferETHERC20ToNear.mint({ nearTokenContract, nearTokenContractBorsh, ...transferLog,