Skip to content

Commit 4827c34

Browse files
committed
Move scripts to common location
This also required to change some initialization parameters to match the common API.
1 parent 2a2cc2b commit 4827c34

File tree

8 files changed

+34
-30
lines changed

8 files changed

+34
-30
lines changed

shop_orig/script/AddKeyperSet.s.sol renamed to script/AddKeyperSet.s.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
pragma solidity ^0.8.22;
33

44
import "forge-std/Script.sol";
5-
import {KeyperSet} from "../src/KeyperSet.sol";
6-
import {KeyperSetManager} from "../src/KeyperSetManager.sol";
7-
import {KeyBroadcastContract} from "../src/KeyBroadcastContract.sol";
8-
import {EonKeyPublish} from "../src/EonKeyPublish.sol";
5+
import {KeyperSet} from "../src/common/KeyperSet.sol";
6+
import {KeyperSetManager} from "../src/common/KeyperSetManager.sol";
7+
import {KeyBroadcastContract} from "../src/common/KeyBroadcastContract.sol";
8+
import {EonKeyPublish} from "../src/common/EonKeyPublish.sol";
99

1010
error ActivationDeltaTooLow();
1111
error ThresholdExceedsKeyperSetSize(uint256 threshold, uint256 keyperSetSize);

shop_orig/script/Deploy.s.sol renamed to script/Deploy.s.sol

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
pragma solidity ^0.8.22;
33

44
import "forge-std/Script.sol";
5-
import "../src/Inbox.sol";
6-
import "../src/KeyperSet.sol";
7-
import "../src/KeyperSetManager.sol";
8-
import "../src/KeyBroadcastContract.sol";
5+
import "../src/shop/Inbox.sol";
6+
import "../src/common/KeyperSet.sol";
7+
import "../src/common/KeyperSetManager.sol";
8+
import "../src/common/KeyBroadcastContract.sol";
99

1010
error ActivationDeltaTooLow();
1111

shop_orig/script/DeployGnosis.s.sol renamed to script/DeployGnosis.s.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
pragma solidity ^0.8.22;
33

44
import "forge-std/Script.sol";
5-
import {KeyperSetManager} from "../src/KeyperSetManager.sol";
6-
import {KeyBroadcastContract} from "../src/KeyBroadcastContract.sol";
5+
import {KeyperSetManager} from "../src/common/KeyperSetManager.sol";
6+
import {KeyBroadcastContract} from "../src/common/KeyBroadcastContract.sol";
77

88
contract DeployGnosis is Script {
99
function run() public {

shop_orig/script/InitKeyperSet.s.sol renamed to script/InitKeyperSet.s.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.22;
33

44
import "forge-std/Script.sol";
5-
import "../src/Inbox.sol";
6-
import "../src/KeyperSet.sol";
7-
import "../src/KeyperSetManager.sol";
8-
import "../src/KeyBroadcastContract.sol";
9-
import "../src/EonKeyPublish.sol";
5+
import "../src/shop/Inbox.sol";
6+
import "../src/common/KeyperSet.sol";
7+
import "../src/common/KeyperSetManager.sol";
8+
import "../src/common/KeyBroadcastContract.sol";
9+
import "../src/common/EonKeyPublish.sol";
1010

1111
contract DeployScript is Script {
1212
Inbox public inbox;

gnosh_orig/script/addKeyperSet.s.sol renamed to script/addKeyperSet.s.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.20;
33

44
import "forge-std/Test.sol";
55
import "forge-std/Script.sol";
6-
import "../src/KeyperSet.sol";
7-
import "../src/KeyperSetManager.sol";
6+
import "../src/common/KeyperSet.sol";
7+
import "../src/common/KeyperSetManager.sol";
88

99
contract AddKeyperSet is Script, Test {
1010
function run() external {
@@ -50,7 +50,7 @@ contract AddKeyperSet is Script, Test {
5050
KeyperSet ks = new KeyperSet();
5151
ks.addMembers(keypers);
5252
ks.setThreshold(uint64(threshold));
53-
ks.setKeyBroadcaster(key_broadcaster);
53+
ks.setPublisher(key_broadcaster);
5454
ks.setFinalized();
5555

5656
KeyperSetManager ksm = KeyperSetManager(ksmAddress);

gnosh_orig/script/deploy.s.sol renamed to script/deploy.s.sol

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,19 @@
22
pragma solidity ^0.8.20;
33

44
import "forge-std/Script.sol";
5-
import "../src/KeyBroadcastContract.sol";
6-
import "../src/KeyperSet.sol";
7-
import "../src/KeyperSetManager.sol";
8-
import "../src/Sequencer.sol";
9-
import "../src/ValidatorRegistry.sol";
5+
import "../src/common/KeyBroadcastContract.sol";
6+
import "../src/common/KeyperSet.sol";
7+
import "../src/common/KeyperSetManager.sol";
8+
import "../src/gnosh/Sequencer.sol";
9+
import "../src/gnosh/ValidatorRegistry.sol";
1010

1111
contract Deploy is Script {
12+
uint256 deployerPrivateKey;
13+
address deployerAddress;
1214
function deployKeyperSetManager() public returns (KeyperSetManager) {
13-
KeyperSetManager ksm = new KeyperSetManager();
15+
16+
deployerAddress = vm.addr(deployerPrivateKey);
17+
KeyperSetManager ksm = new KeyperSetManager(deployerAddress);
1418

1519
// add bootstrap keyper set
1620
KeyperSet fakeKeyperset = new KeyperSet();

gnosh_orig/script/deploySequencer.s.sol renamed to script/deploySequencer.s.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
pragma solidity ^0.8.20;
33

44
import "forge-std/Script.sol";
5-
import "../src/KeyBroadcastContract.sol";
6-
import "../src/KeyperSet.sol";
7-
import "../src/KeyperSetManager.sol";
8-
import "../src/Sequencer.sol";
9-
import "../src/ValidatorRegistry.sol";
5+
import "../src/common/KeyBroadcastContract.sol";
6+
import "../src/common/KeyperSet.sol";
7+
import "../src/common/KeyperSetManager.sol";
8+
import "../src/gnosh/Sequencer.sol";
9+
import "../src/gnosh/ValidatorRegistry.sol";
1010

1111
contract Deploy is Script {
1212
function run() external {

gnosh_orig/script/submitTransaction.s.sol renamed to script/submitTransaction.s.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
pragma solidity ^0.8.20;
33

44
import "forge-std/Script.sol";
5-
import "../src/Sequencer.sol";
5+
import "../src/gnosh/Sequencer.sol";
66

77
contract SubmitTransaction is Script {
88
function run() external {

0 commit comments

Comments
 (0)