Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ethereum: Validate valid_till_block_height #68

Merged
merged 8 commits into from
Apr 25, 2023
Merged

Ethereum: Validate valid_till_block_height #68

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
512a4ad
Validate `valid till block height`
karim-en Apr 20, 2023
4d6a52c
Update storage layout
karim-en Apr 20, 2023
e0b2556
Fix block validation
karim-en Apr 22, 2023
39259ce
Fix solidity tests
karim-en Apr 23, 2023
836d0af
Add tests for invalid block
karim-en Apr 24, 2023
293db95
Update abi
karim-en Apr 24, 2023
383ad4f
Replace `uint` with `uint256`
karim-en Apr 24, 2023
48ac105
Change error message
karim-en Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions eth/artifacts/contracts/EthErc20FastBridge.sol/EthErc20FastBridge.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion eth/contracts/EthErc20FastBridge.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,10 @@ contract EthErc20FastBridge is Initializable, UUPSUpgradeable, AccessControlUpgr
address payable _recipient,
uint256 _nonce,
uint256 _amount,
string memory _unlock_recipient
string calldata _unlock_recipient,
uint _valid_till_block_height
) external payable whenNotPaused isWhitelisted(_token) {
require(block.number < _valid_till_block_height, "Invalid block number");
sept-en marked this conversation as resolved.
Show resolved Hide resolved
require(_recipient != address(0) && _recipient != msg.sender, "Wrong recipient provided");
require(_amount != 0, "Wrong amount provided");

Expand Down
4 changes: 3 additions & 1 deletion eth/res/EthErc20FastBridge_flat.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,8 +2463,10 @@ contract EthErc20FastBridge is Initializable, UUPSUpgradeable, AccessControlUpgr
address payable _recipient,
uint256 _nonce,
uint256 _amount,
string memory _unlock_recipient
string calldata _unlock_recipient,
uint _valid_till_block_height
) external payable whenNotPaused isWhitelisted(_token) {
require(block.number < _valid_till_block_height, "Invalid block number");
sept-en marked this conversation as resolved.
Show resolved Hide resolved
sept-en marked this conversation as resolved.
Show resolved Hide resolved
require(_recipient != address(0) && _recipient != msg.sender, "Wrong recipient provided");
require(_amount != 0, "Wrong amount provided");

Expand Down
Loading