Skip to content
Draft
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
2 changes: 1 addition & 1 deletion orbit-actions
Submodule orbit-actions updated 61 files
+7 −1 .gas-snapshot
+1 −1 .github/workflows/audit.yml
+2 −2 .github/workflows/lint.yml
+3 −3 .github/workflows/test-e2e.yml
+1 −1 .github/workflows/test-fork.yml
+5 −5 .github/workflows/test.yml
+2 −1 .gitignore
+1 −1 .gitmodules
+17 −1 README.md
+62 −0 contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point2UpgradeAction.sol
+100 −0 contracts/parent-chain/contract-upgrades/NitroContracts2Point1Point3UpgradeAction.sol
+36 −0 contracts/parent-chain/espresso-migration/2.1.0/Deploy2Point1Point0EspressoSequencerInbox.s.sol
+36 −0 contracts/parent-chain/espresso-migration/2.1.3/Deploy2Point1Point3EspressoSequencerInbox.s.sol
+123 −0 contracts/parent-chain/espresso-migration/2.1.3/EspressoNitroContracts2Point1Point3UpgradeAction.sol
+5 −3 foundry.toml
+1 −1 lib/forge-std
+1 −1 lib/nitro-contracts
+1 −1 migration/2.1.0/SequencerInbox.sol
+894 −0 migration/2.1.3/SequencerInbox.sol
+17 −3 migration/README.md
+4 −0 migration/espresso-2.1.0/SequencerInbox.dbg.json
+1,245 −0 migration/espresso-2.1.0/SequencerInbox.json
+4 −0 migration/espresso-2.1.3/SequencerInbox.dbg.json
+1,289 −0 migration/espresso-2.1.3/SequencerInbox.json
+6 −0 migration/espresso-2.1.3/info.md
+3 −0 package.json
+1 −1 scripts/foundry/contract-upgrades/2.1.0/README.md
+6 −0 scripts/foundry/contract-upgrades/2.1.2/.env.sample
+26 −0 scripts/foundry/contract-upgrades/2.1.2/DeployNitroContracts2Point1Point2UpgradeAction.s.sol
+41 −0 scripts/foundry/contract-upgrades/2.1.2/ExecuteNitroContracts2Point1Point2Upgrade.s.sol
+87 −0 scripts/foundry/contract-upgrades/2.1.2/README.md
+7 −0 scripts/foundry/contract-upgrades/2.1.3/.env.sample
+62 −0 scripts/foundry/contract-upgrades/2.1.3/DeployNitroContracts2Point1Point3UpgradeAction.s.sol
+48 −0 scripts/foundry/contract-upgrades/2.1.3/ExecuteNitroContracts2Point1Point3Upgrade.s.sol
+86 −0 scripts/foundry/contract-upgrades/2.1.3/README.md
+64 −0 scripts/foundry/contract-upgrades/espresso-2.1.3/DeployEspressoNitroContracts2Point1Point3UpgradeAction.s.sol
+49 −0 scripts/foundry/contract-upgrades/espresso-2.1.3/ExecuteEspressoNitroContracts2Point1Point3Upgrade.s.sol
+4 −4 scripts/foundry/fast-confirm/README.md
+203 −33 scripts/orbit-versioner/orbitVersioner.ts
+176 −26 scripts/orbit-versioner/referentMetadataHashes.json
+11 −5 test/signatures/AddWasmCacheManagerAction
+13 −6 test/signatures/EnableFastConfirmAction
+15 −7 test/signatures/NitroContracts1Point2Point1UpgradeAction
+21 −10 test/signatures/NitroContracts2Point1Point0UpgradeAction
+9 −0 test/signatures/NitroContracts2Point1Point2UpgradeAction
+15 −0 test/signatures/NitroContracts2Point1Point3UpgradeAction
+15 −7 test/signatures/SetSequencerInboxMaxTimeVariationAction
+11 −5 test/signatures/UpgradeArbOSVersionAtTimestampAction
+5 −1 test/storage/AddWasmCacheManagerAction
+5 −1 test/storage/EnableFastConfirmAction
+5 −1 test/storage/NitroContracts1Point2Point1UpgradeAction
+5 −1 test/storage/NitroContracts2Point1Point0UpgradeAction
+6 −0 test/storage/NitroContracts2Point1Point2UpgradeAction
+6 −0 test/storage/NitroContracts2Point1Point3UpgradeAction
+5 −1 test/storage/SetSequencerInboxMaxTimeVariationAction
+5 −1 test/storage/UpgradeArbOSVersionAtTimestampAction
+116 −0 test/unit/NitroContracts2Point1Point2UpgradeAction.t.sol
+230 −0 test/unit/NitroContracts2Point1Point3UpgradeAction.t.sol
+1 −1 test/unit/test-unit.bash
+2 −2 test/util/forge-inspect.bash
+225 −18 yarn.lock
8 changes: 4 additions & 4 deletions scripts/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ function writeConfigs(argv: any) {

if (argv.espresso) {
let config = baseConfig as any;
config.node["batch-poster"]["hotshot-url"] = "";
config.node["batch-poster"]["hotshot-urls"] = "";
config.node["batch-poster"]["light-client-address"] = "";
}

Expand All @@ -328,7 +328,7 @@ function writeConfigs(argv: any) {
}
if (argv.espresso) {
simpleConfig.node.feed.output.enable = true;
simpleConfig.node["batch-poster"]["hotshot-url"] = argv.espressoUrl;
simpleConfig.node["batch-poster"]["hotshot-urls"] = [argv.espressoUrl];
simpleConfig.node["batch-poster"]["light-client-address"] =
argv.lightClientAddress;
simpleConfig.node["block-validator"]["dangerous"][
Expand Down Expand Up @@ -442,7 +442,7 @@ function writeConfigs(argv: any) {
let posterConfig = JSON.parse(baseConfJSON);
if (argv.espresso) {
posterConfig.node.feed.input.url.push("ws://sequencer:9642");
posterConfig.node["batch-poster"]["hotshot-url"] = argv.espressoUrl;
posterConfig.node["batch-poster"]["hotshot-urls"] = [argv.espressoUrl];
posterConfig.node["batch-poster"]["light-client-address"] =
argv.lightClientAddress;
} else {
Expand Down Expand Up @@ -480,7 +480,7 @@ function writeConfigs(argv: any) {
l3Config.node.feed.output.enable = true;
l3Config.node.dangerous["no-sequencer-coordinator"] = true;
l3Config.node.feed.input.url.push("ws://sequencer:9642");
l3Config.node["batch-poster"]["hotshot-url"] = argv.espressoUrl;
l3Config.node["batch-poster"]["hotshot-urls"] = [argv.espressoUrl];
l3Config.node["batch-poster"]["light-client-address"] =
argv.lightClientAddress;
}
Expand Down
Loading