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

Merge branch 'main' into patch-1

This commit is contained in:
Martín Volpe 2023-07-04 13:28:38 +02:00
parent f2fb5d8519 3b8b9e9c54
commit 6fb9c0df3d
2 changed files with 104 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ethereum/contracts/bridge/token/TokenImplementation.sol
View File

@ -351,14 +351,20 @@ contract TokenImplementation is TokenState, Context
return keccak256(abi.encodePacked(_state.chainId, _state.nativeContract));
}
/**
* @notice Reverts if not called by zero address
*/
modifier onlyVm() {
require(msg.sender == address(0), "Only VM can call");
_;
}
modifier onlyCeloChains() { // TODO add this after a first batch of testing
/**
* @notice Reverts for non-Celo chains
*/
modifier onlyCeloChains() {
address celoRegistryAddress = address(0x000000000000000000000000000000000000ce10);
require(celoRegistryAddress.code.length == 0, "Only Celo chains should have bytecode in the Celo Registry address");
require(celoRegistryAddress.code.length != 0, "Only Celo chains should have bytecode in the Celo Registry address");
_;
}
@ -371,8 +377,8 @@ contract TokenImplementation is TokenState, Context
* currency. After the tx is executed, gas is refunded to the sender and credited to the
* various tx fee recipients via a call to `creditGasFees`. Note too that the events emitted
* by `creditGasFees` reflect the *net* gas fee payments for the transaction.
*/
function debitGasFees(address from, uint256 value) external onlyVm {
*/
function debitGasFees(address from, uint256 value) external onlyVm onlyCeloChains {
_state.balances[from] = _state.balances[from] - value;
}
@ -391,7 +397,7 @@ contract TokenImplementation is TokenState, Context
* currency. Before the tx is executed, gas is debited from the sender via a call to
* `debitGasFees`. Note too that the events emitted by `creditGasFees` reflect the *net* gas fee
* payments for the transaction.
*/
*/
function creditGasFees(
address from,
address feeRecipient,
@ -401,7 +407,7 @@ contract TokenImplementation is TokenState, Context
uint256 tipTxFee,
uint256 gatewayFee,
uint256 baseTxFee
) external onlyVm {
) external onlyVm onlyCeloChains {
_state.balances[from] = _state.balances[from] + refund;
_creditGas(from, communityFund, baseTxFee);
_creditGas(from, feeRecipient, tipTxFee);

92
ethereum/forge-test/TokenImplementation.t.sol
View File

@ -51,6 +51,31 @@ contract TestTokenImplementation is TokenImplementation, Test {
);
}
function returnSetupTestEnvironmentWithInitialize() public returns (TokenImplementation) {
TokenImplementation token = new TokenImplementation();
InitiateParameters memory init;
init.name = "Valuable Token";
init.symbol = "VALU";
init.decimals = 8;
init.sequence = 1;
init.owner = _msgSender();
init.chainId = 5;
init
.nativeContract = 0x1337133713371337133713371337133713371337133713371337133713371337;
token.initialize(
init.name,
init.symbol,
init.decimals,
init.sequence,
init.owner,
init.chainId,
init.nativeContract
);
return token;
}
function setupTestEnvironmentWithOldInitialize() public {
InitiateParameters memory init;
init.name = "Old Valuable Token";
@ -392,6 +417,73 @@ contract TestTokenImplementation is TokenImplementation, Test {
);
}
function testCreditAndDebitCeloOnlyVmCanCall(
) public {
TokenImplementation token = returnSetupTestEnvironmentWithInitialize();
vm.expectRevert("Only VM can call");
token.debitGasFees(_msgSender(), 1);
}
function testCreditAndDebitCeloOnlyVmCanCallOnCelo(
) public {
TokenImplementation token = returnSetupTestEnvironmentWithInitialize();
vm.prank(address(0));
vm.expectRevert("Only Celo chains should have bytecode in the Celo Registry address");
token.debitGasFees(_msgSender(), 1);
}
function testCreditAndDebitCelo(
) public {
TokenImplementation token = returnSetupTestEnvironmentWithInitialize();
// mint
uint256 mintedAmount = 42069;
vm.prank(token.owner());
token.mint(_msgSender(), mintedAmount);
require(token.balanceOf(_msgSender()) == mintedAmount, "Balance is right before the test");
// deploy bytecode to the Celo Registry address to emulate a Celo Chain
vm.etch(address(0x000000000000000000000000000000000000ce10), address(this).code);
// should not revert
vm.prank(address(0));
token.debitGasFees(_msgSender(), mintedAmount);
require(token.balanceOf((_msgSender())) == 0, "Balance was sucessfully extracted");
address validator = address(0x8668E6F6102D7Fd403BfF0D10dcd04eb768A34D7);
address gatewayFeeRecipient = address(0x197ad2385Fb4ed27507CBf0ff94910b756c276D1);
address communityFund = address(0x069F5142892b2FbE57209bF3E792e6c0A298c772);
uint256 refundBalance = 10;
uint256 validatorBalance = 11;
uint256 gatewayFee = 12;
uint256 communityFundBalance = 12;
vm.prank(address(0));
token.creditGasFees(
_msgSender(),
validator,
gatewayFeeRecipient,
communityFund,
refundBalance,
validatorBalance,
gatewayFee,
communityFundBalance);
require(token.balanceOf(_msgSender()) == refundBalance, "Balance of user is right after the test");
require(token.balanceOf(validator) == validatorBalance, "Balance of validator is right after the test");
require(token.balanceOf(gatewayFeeRecipient) == gatewayFee, "Balance of gatewayFeeRecipient is right after the test");
require(token.balanceOf(communityFund) == communityFundBalance, "Balance of communityFund is right after the test");
}
function testFailPermitWithSameSignature(
bytes32 walletPrivateKey,
uint256 amount,