Skip to content

Fix gnosh deploy script post merge #2

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix gnosh deploy script post merge #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/forge-std
Open in desktop
Submodule forge-std updated 38 files
+1 −0 .gitattributes
+6 −12 .github/workflows/ci.yml
+3 −1 .github/workflows/sync.yml
+0 −3 .gitmodules
+1 −1 README.md
+3 −3 foundry.toml
+0 −1 lib/ds-test
+1 −1 package.json
+635 −0 scripts/vm.py
+518 −225 src/StdAssertions.sol
+40 −13 src/StdChains.sol
+4 −4 src/StdCheats.sol
+18 −3 src/StdInvariant.sol
+7 −11 src/StdJson.sol
+202 −107 src/StdStorage.sol
+179 −0 src/StdToml.sol
+61 −33 src/StdUtils.sol
+4 −4 src/Test.sol
+1,619 −448 src/Vm.sol
+401 −382 src/console.sol
+1 −1,555 src/console2.sol
+234 −0 src/mocks/MockERC20.sol
+231 −0 src/mocks/MockERC721.sol
+693 −4 src/safeconsole.sol
+39 −909 test/StdAssertions.t.sol
+40 −32 test/StdChains.t.sol
+20 −12 test/StdCheats.t.sol
+3 −1 test/StdError.t.sol
+49 −0 test/StdJson.t.sol
+8 −8 test/StdMath.t.sol
+167 −11 test/StdStorage.t.sol
+49 −0 test/StdToml.t.sol
+20 −20 test/StdUtils.t.sol
+3 −3 test/Vm.t.sol
+8 −0 test/fixtures/test.json
+6 −0 test/fixtures/test.toml
+441 −0 test/mocks/MockERC20.t.sol
+721 −0 test/mocks/MockERC721.t.sol
2 changes: 1 addition & 1 deletion lib/openzeppelin
Open in desktop
Submodule openzeppelin updated 465 files
16 changes: 11 additions & 5 deletions script/Deploy.gnosh.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,19 @@ import "../src/gnosh/ValidatorRegistry.sol";

contract Deploy is Script {
function deployKeyperSetManager(
address deployerAddress
address deployerAddress,
address bootstrapKeyper
) public returns (KeyperSetManager) {
KeyperSetManager ksm = new KeyperSetManager(deployerAddress);

address[] memory bootstrapMembers = new address[](1);
bootstrapMembers[0] = bootstrapKeyper;

// add bootstrap keyper set
KeyperSet fakeKeyperset = new KeyperSet();
fakeKeyperset.setFinalized();
ksm.addKeyperSet(0, address(fakeKeyperset));
KeyperSet bootstrapKeyperset = new KeyperSet();
bootstrapKeyperset.addMembers(bootstrapMembers);
bootstrapKeyperset.setFinalized();
ksm.addKeyperSet(0, address(bootstrapKeyperset));

console.log("KeyperSetManager:", address(ksm));
return ksm;
Expand Down Expand Up @@ -45,11 +50,12 @@ contract Deploy is Script {

function run() external {
uint256 deployKey = vm.envUint("DEPLOY_KEY");
address bootstrapKeyper = vm.envAddress("BOOTSTRAP_KEYPER");
address deployerAddress = vm.addr(deployKey);
console.log("Deployer:", deployerAddress);
vm.startBroadcast(deployKey);

KeyperSetManager ksm = deployKeyperSetManager(deployerAddress);
KeyperSetManager ksm = deployKeyperSetManager(deployerAddress, bootstrapKeyper);
deployKeyBroadcastContract(ksm);
deploySequencer();
deployValidatorRegistry();
Expand Down
4 changes: 3 additions & 1 deletion src/common/KeyperSetManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ contract KeyperSetManager is RestrictedPausable, IKeyperSetManager {
address contractAddress;
}

constructor(address initializer) RestrictedPausable(initializer) {}
constructor(address initializer) RestrictedPausable(initializer) {
initialize(msg.sender, msg.sender);
}

KeyperSetData[] private keyperSets;

Expand Down
Loading