From 0cd521b5e778e58dadfa159ed2c04fbabcf3ea8b Mon Sep 17 00:00:00 2001 From: Simon Dosch Date: Tue, 5 Dec 2023 15:28:40 +0100 Subject: [PATCH] add depositBulk test, mapToken --- .../root/depositManager/DepositManager.sol | 2 +- .../root/DepositManagerUpdate.test.js | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/contracts/root/depositManager/DepositManager.sol b/contracts/root/depositManager/DepositManager.sol index 4abb411f..447d56ff 100644 --- a/contracts/root/depositManager/DepositManager.sol +++ b/contracts/root/depositManager/DepositManager.sol @@ -25,7 +25,7 @@ contract DepositManager is DepositManagerStorage, IDepositManager, ERC721Holder modifier isTokenMapped(address _token) { // new: exception for POL token require( - registry.isTokenMapped(_token) || _token == registry.contractMap(keccak256("pol")), + registry.isTokenMapped(_token), "TOKEN_NOT_SUPPORTED" ); _; diff --git a/test/integration/root/DepositManagerUpdate.test.js b/test/integration/root/DepositManagerUpdate.test.js index c13e2f21..3536ed74 100644 --- a/test/integration/root/DepositManagerUpdate.test.js +++ b/test/integration/root/DepositManagerUpdate.test.js @@ -4,6 +4,7 @@ import chai from 'chai' import chaiAsPromised from 'chai-as-promised' import * as artifacts from '../../helpers/artifacts.js' import StatefulUtils from '../../helpers/StatefulUtils' +import logDecoder from '../../helpers/log-decoder' const predicateTestUtils = require('./predicates/predicateTestUtils') const ethUtils = require('ethereumjs-util') @@ -51,6 +52,12 @@ contract('DepositManager Update @skip-on-coverage', async function(accounts) { registry.contract.methods.updateContractMap(ethUtils.keccak256('pol'), pol.address).encodeABI() ) + // map POL token + await governance.update( + registry.address, + registry.contract.methods.mapToken(pol.address, e20.childToken.address, false).encodeABI() + ) + await polygonMigrationTest.contract.methods.setTokenAddresses(e20.rootERC20.address, pol.address).send({ from: accounts[0] }) @@ -119,6 +126,27 @@ contract('DepositManager Update @skip-on-coverage', async function(accounts) { utils.assertBigNumberEquality(await e20.childToken.balanceOf(bob), amount) }) + it('depositBulk: bridges MATIC when depositing POL', async() => { + const bob = '0x' + crypto.randomBytes(20).toString('hex') + const totalAmount = amount.mul(web3.utils.toBN(2)) + + await pol.approve(depositManager.address, totalAmount) + + const result = await depositManager.depositBulk([pol.address, pol.address], [amount, amount], bob) + + const logs = logDecoder.decodeLogs(result.receipt.rawLogs) + const newDepositBlockEvent = logs.find( + log => log.event === 'NewDepositBlock' + ) + + // token has been changed to MATIC + assert.strictEqual(newDepositBlockEvent.args.token, e20.rootERC20.address) + await utils.fireDepositFromMainToMatic(childContracts.childChain, '0xa', bob, e20.rootERC20.address, totalAmount, newDepositBlockEvent.args.depositBlockId) + + // deposit on child chain is technically still in MATIC + utils.assertBigNumberEquality(await e20.childToken.balanceOf(bob), totalAmount) + }) + it('returns POL when withdrawing MATIC', async() => { // no POL on this account utils.assertBigNumberEquality(await pol.balanceOf(accounts[1]), 0)