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

fix: use primev multisig as l1 gateway owner addr #547

Merged
merged 3 commits into from
Dec 30, 2024
Merged

fix: use primev multisig as l1 gateway owner addr #547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a02927
feat: introduce mainnet profile
mrekucci Dec 24, 2024
a6cb8a2
l1 gateway owner address
shaspitz Dec 24, 2024
60a6bb6
Update environments.yml
shaspitz Dec 28, 2024
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
8 changes: 6 additions & 2 deletions contracts/scripts/standard-bridge/DeployStandardBridge.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {L1Gateway} from "../../contracts/standard-bridge/L1Gateway.sol";
import {Allocator} from "../../contracts/standard-bridge/Allocator.sol";
import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";
import {console} from "forge-std/console.sol";
import {MainnetConstants} from "../MainnetConstants.sol";

contract BridgeBase is Script {
// Amount of ETH to initially fund the relayer account on the mev-commit chain.
Expand Down Expand Up @@ -145,7 +146,10 @@ contract DeployL1Gateway is BridgeBase {
}

function _getL1OwnerAddress() internal view returns (address ownerAddr) {
ownerAddr = vm.envAddress("L1_OWNER_ADDRESS");
require(ownerAddr != address(0), L1OwnerAddressNotSet(ownerAddr));
if (block.chainid == 1) {
ownerAddr = MainnetConstants.PRIMEV_TEAM_MULTISIG;
} else {
ownerAddr = msg.sender;
}
}
}
1 change: 0 additions & 1 deletion infrastructure/nomad/playbooks/templates/jobs/contracts-deployer.nomad.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@ job "{{ job.name }}" {
echo '{{ .Data.data.bridge_relayer_keystore }}' > local/bridge_relayer_keystore
{{ end }}
{% endraw %}
export L1_OWNER_ADDRESS=${SENDER} #TODO: this should be a multisig address on mainnet.

# --verify flag in entrypoint.sh only works when running forge script from the contracts directory.
# Here we setup the environment variables to function when cd'ing into the contracts directory.
Expand Down
Loading