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.

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

FWR Holesky #62

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion l2-contracts/test/mocks/BridgeMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ contract BridgeMock {
// 1 == mainnet, 2 == l2
uint32 originId = destination == 1 ? 2 : 1;

IERC20(asset).transferFrom(msg.sender, to, amount);
if (amount != 0) {
IERC20(asset).transferFrom(msg.sender, to, amount);
}

L2RewardManager(to).xReceive(
keccak256(abi.encodePacked(to, amount, asset, delegate, callData)), // transferId
Expand Down
3 changes: 3 additions & 0 deletions mainnet-contracts/script/DeployerHelper.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,9 @@ abstract contract DeployerHelper is Script {
if (block.chainid == mainnet) {
// https://etherscan.io/address/0xC0896ab1A8cae8c2C1d27d011eb955Cca955580d
return 0xC0896ab1A8cae8c2C1d27d011eb955Cca955580d;
} else if (block.chainid == holesky) {
// https://holesky.etherscan.io/address/0xDDDeAfB492752FC64220ddB3E7C9f1d5CcCdFdF0
return 0xDDDeAfB492752FC64220ddB3E7C9f1d5CcCdFdF0;
}

revert("OPSMultisig not available for this chain");
Expand Down
Loading