certusone
/
wormhole
mirror of https://github.com/certusone/wormhole.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

evm: add TransferRedeemed event to Bridge.sol

This commit is contained in:
gator-boi 2023-07-06 15:42:57 +00:00 committed by Reptile
parent 3bb7fbf245
commit d5f809df8b
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ethereum/contracts/bridge/Bridge.sol
View File

@ -20,6 +20,18 @@ import "./token/TokenImplementation.sol";
contract Bridge is BridgeGovernance, ReentrancyGuard {
using BytesLib for bytes;
/**
* @notice Emitted when a transfer is completed by the token bridge.
* @param emitterChainId Wormhole chain ID of emitter on the source chain.
* @param emitterAddress Address (bytes32 zero-left-padded) of emitter on the source chain.
* @param sequence Sequence of the Wormhole message.
*/
event TransferRedeemed(
uint16 indexed emitterChainId,
bytes32 indexed emitterAddress,
uint64 indexed sequence
);
/*
* @dev Produce a AssetMeta message for a given token
*/
@ -497,6 +509,9 @@ contract Bridge is BridgeGovernance, ReentrancyGuard {
require(!isTransferCompleted(vm.hash), "transfer already completed");
setTransferCompleted(vm.hash);
// emit `TransferRedeemed` event
emit TransferRedeemed(vm.emitterChainId, vm.emitterAddress, vm.sequence);
require(transfer.toChain == chainId(), "invalid target chain");
IERC20 transferToken;

2
ethereum/contracts/bridge/interfaces/ITokenBridge.sol
View File

@ -64,6 +64,8 @@ interface ITokenBridge {
event ContractUpgraded(address indexed oldContract, address indexed newContract);
event TransferRedeemed(uint16 indexed emitterChainId, bytes32 indexed emitterAddress, uint64 indexed sequence);
function _parseTransferCommon(bytes memory encoded) external pure returns (Transfer memory transfer);
function attestToken(address tokenAddress, uint32 nonce) external payable returns (uint64 sequence);

26
ethereum/test/bridge.js
View File

@ -581,6 +581,7 @@ contract("Bridge", function () {
it("should transfer out locked assets for a valid transfer vm", async function () {
const accounts = await web3.eth.getAccounts();
const amount = "1000000000000000000";
const sequence = 1697;
const token = new web3.eth.Contract(TokenImplementation.abi, TokenImplementation.address);
const initialized = new web3.eth.Contract(BridgeImplementationFullABI, TokenBridge.address);
@ -612,7 +613,7 @@ contract("Bridge", function () {
0,
testForeignChainId,
testForeignBridgeContract,
0,
sequence,
data,
[
testSigner1PK
@ -621,7 +622,7 @@ contract("Bridge", function () {
0
);
await initialized.methods.completeTransfer("0x" + vm).send({
const tx = await initialized.methods.completeTransfer("0x" + vm).send({
value: 0,
from: accounts[0],
gasLimit: 2000000
@ -632,6 +633,14 @@ contract("Bridge", function () {
assert.equal(accountBalanceAfter.toString(10), amount);
assert.equal(bridgeBalanceAfter.toString(10), "0");
// verify the `TransferRedeemed` event
const event = tx.events.TransferRedeemed;
assert.equal(event !== undefined, true);
assert.equal(event.returnValues.emitterChainId, testForeignChainId);
assert.equal(event.returnValues.emitterAddress, testForeignBridgeContract);
assert.equal(event.returnValues.sequence, sequence);
})
it("should deposit and log transfer with payload correctly", async function () {
@ -719,6 +728,7 @@ contract("Bridge", function () {
it("should transfer out locked assets for a valid transfer with payload vm", async function () {
const accounts = await web3.eth.getAccounts();
const amount = "1000000000000000000";
const sequence = 1111;
const token = new web3.eth.Contract(TokenImplementation.abi, TokenImplementation.address);
const initialized = new web3.eth.Contract(BridgeImplementationFullABI, TokenBridge.address);
@ -751,7 +761,7 @@ contract("Bridge", function () {
0,
testForeignChainId,
testForeignBridgeContract,
0,
sequence,
data,
[
testSigner1PK
@ -760,7 +770,7 @@ contract("Bridge", function () {
0
);
await initialized.methods.completeTransferWithPayload("0x" + vm).send({
const tx = await initialized.methods.completeTransferWithPayload("0x" + vm).send({
value: 0,
from: accounts[0],
gasLimit: 2000000
@ -771,6 +781,14 @@ contract("Bridge", function () {
assert.equal(accountBalanceAfter.toString(10), new BigNumber(accountBalanceBefore).plus(amount).toString(10));
assert.equal(bridgeBalanceAfter.toString(10), "0");
// verify the `TransferRedeemed` event
const event = tx.events.TransferRedeemed;
assert.equal(event !== undefined, true);
assert.equal(event.returnValues.emitterChainId, testForeignChainId);
assert.equal(event.returnValues.emitterAddress, testForeignBridgeContract);
assert.equal(event.returnValues.sequence, sequence);
})
it("should mint bridged assets wrappers on transfer from another chain and handle fees correctly", async function () {