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

Added l2 single/batch timelock stage #223

Merged
merged 25 commits into from
Nov 17, 2023
Merged

Added l2 single/batch timelock stage #223

Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
bf5abe6
Added l2 single/batch timelock stage
yahgwai Nov 1, 2023
7384c94
removed debug try/catch
yahgwai Nov 1, 2023
1108ec2
Merge branch 'main' into l2timelock-non-batch
yahgwai Nov 13, 2023
d8b056d
Updated audit
yahgwai Nov 13, 2023
f2453df
Console logging in genNetwork
yahgwai Nov 13, 2023
0d34471
Print addresses
yahgwai Nov 13, 2023
8a5206b
Added address logging
yahgwai Nov 13, 2023
757d1a6
Added test priv key
yahgwai Nov 13, 2023
1b70215
Use 3f1 key
yahgwai Nov 13, 2023
c6207e2
Removed unused logging
yahgwai Nov 13, 2023
c511812
Use same key for nova
yahgwai Nov 13, 2023
17dea64
Updated timeouts
yahgwai Nov 13, 2023
5a9f256
Added more logging
yahgwai Nov 13, 2023
b98da5c
Removed console logging
yahgwai Nov 13, 2023
c6e1d32
Added fine grain logging and dependency
yahgwai Nov 14, 2023
01e1304
Add more stage tracker logging
yahgwai Nov 14, 2023
2b079c7
Allow running in parallel again
yahgwai Nov 14, 2023
62a2731
Added monitoring of the node creation and confirmation
yahgwai Nov 14, 2023
137dd85
Updated to l1 provider
yahgwai Nov 14, 2023
af30cba
Try output logging
yahgwai Nov 15, 2023
03afb0f
Typo fix
yahgwai Nov 15, 2023
92d6e2b
Try with the eth key
yahgwai Nov 15, 2023
8e7b4cc
Removed assertion logging
yahgwai Nov 15, 2023
0ebbb95
Commented back in change check
yahgwai Nov 17, 2023
bd6daba
Removed unused imports
yahgwai Nov 17, 2023
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: 2 additions & 2 deletions .github/workflows/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: OffchainLabs/actions/run-nitro-test-node@main
- uses: OffchainLabs/actions/run-nitro-test-node@output-logging

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
Expand Down Expand Up @@ -198,7 +198,7 @@ jobs:
- uses: actions/checkout@v3
with:
submodules: recursive
- uses: OffchainLabs/actions/run-nitro-test-node@main
- uses: OffchainLabs/actions/run-nitro-test-node@output-logging

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
Expand Down
4 changes: 3 additions & 1 deletion audit-ci.jsonc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
// undici - only used in hardhat, not used in prod
"GHSA-wqq4-5wpv-mx2g",
// get-func-name - only used in chai, not used in prod
"GHSA-4q6p-r6v2-jvc5"
"GHSA-4q6p-r6v2-jvc5",
// axios used only in sol2uml
"GHSA-wf5p-g6vw-rhxx"
]
}
6 changes: 3 additions & 3 deletions files/local/.env-sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ ARB_URL="http://localhost:8547"
NOVA_URL="http://localhost:8547"
ETH_URL="http://localhost:8545"
## Test keys
ARB_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
ETH_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
NOVA_KEY="cb5790da63720727af975f42c79f69918580209889225fa7128c92402a6d3a65"
ARB_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"
ETH_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"
NOVA_KEY="b6b15c8cb491557369f3c7d2c287b053eb229daa9c22138887752191c9520659"

DEPLOY_CONFIG_FILE_LOCATION="./files/local/deployConfig.json"
VESTED_RECIPIENTS_FILE_LOCATION="./files/local/vestingWalletRecipients.json"
Expand Down
4 changes: 2 additions & 2 deletions scripts/genNetwork.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Wallet, ethers } from "ethers";
import { ethers } from "ethers";
import { setupNetworks, config, getSigner } from "../test-ts/testSetup";
import * as fs from "fs";

Expand All @@ -8,7 +8,7 @@ async function main() {

const ethDeployer = getSigner(ethProvider, config.ethKey);
const arbDeployer = getSigner(arbProvider, config.arbKey);

const { l1Network, l2Network } = await setupNetworks(
ethDeployer,
arbDeployer,
Expand Down
4 changes: 2 additions & 2 deletions scripts/proposalTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ async function main() {
const currentBlock = await arbProvider.getBlockNumber();
while ((await arbProvider.getBlockNumber()) - currentBlock < 2) {
if (isLocal) {
await mineBlock(ethDeployer);
await mineBlock(arbDeployer);
await mineBlock(ethDeployer, "2blocketh");
await mineBlock(arbDeployer, "2blockarb");
}
await wait(1000);
}
Expand Down
6 changes: 4 additions & 2 deletions src-ts/proposalPipeline.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
UnreachableCaseError,
getProvider,
BaseGovernorExecuteStage,
L2TimelockExecutionSingleStage,
} from "./proposalStage";
import { Signer } from "ethers";
import { Provider, TransactionReceipt } from "@ethersproject/abstract-provider";
Expand All @@ -28,6 +29,7 @@ export class StageFactory {
return [
...(await BaseGovernorExecuteStage.extractStages(receipt, this.arbOneSignerOrProvider)),
...(await L2TimelockExecutionBatchStage.extractStages(receipt, this.arbOneSignerOrProvider)),
...(await L2TimelockExecutionSingleStage.extractStages(receipt, this.arbOneSignerOrProvider)),
...(await L1TimelockExecutionSingleStage.extractStages(receipt, this.l1SignerOrProvider)),
...(await L1TimelockExecutionBatchStage.extractStages(receipt, this.l1SignerOrProvider)),
...(await RetryableExecutionStage.extractStages(receipt, this.arbOneSignerOrProvider)),
Expand Down Expand Up @@ -94,7 +96,7 @@ export class StageTracker extends EventEmitter {
while (polling) {
try {
const status = await this.stage.status();
if (currentStatus !== status) {
// if (currentStatus !== status) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

woops, good catch

// emit an event if the status changes
this.emit(TrackerEventName.TRACKER_STATUS, {
status,
Expand All @@ -108,7 +110,7 @@ export class StageTracker extends EventEmitter {
this.stage instanceof GovernorQueueStage ? this.stage.description : undefined,
});
currentStatus = status;
}
// }
switch (status) {
case ProposalStageStatus.TERMINATED:
// end of the road
Expand Down
Loading