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.

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

monorepo: remove devnet-tasks #11257

Merged
merged 1 commit into from
Jul 26, 2024
Merged
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
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ The Optimism Immunefi program offers up to $2,000,042 for in-scope critical vuln
├── <a href="./ops-bedrock">ops-bedrock</a>: Bedrock devnet work
├── <a href="./packages">packages</a>
│ ├── <a href="./packages/contracts-bedrock">contracts-bedrock</a>: OP Stack smart contracts
│ ├── <a href="./packages/devnet-tasks">devnet-tasks</a>: Legacy Hardhat tasks used within devnet CI tests
├── <a href="./proxyd">proxyd</a>: Configurable RPC request router and proxy
├── <a href="./specs">specs</a>: Specs of the rollup starting at the Bedrock upgrade
</pre>
Expand Down
23 changes: 0 additions & 23 deletions bedrock-devnet/devnet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
parser = argparse.ArgumentParser(description='Bedrock devnet launcher')
parser.add_argument('--monorepo-dir', help='Directory of the monorepo', default=os.getcwd())
parser.add_argument('--allocs', help='Only create the allocs and exit', type=bool, action=argparse.BooleanOptionalAction)
parser.add_argument('--test', help='Tests the deployment, must already be deployed', type=bool, action=argparse.BooleanOptionalAction)

log = logging.getLogger()

Expand Down Expand Up @@ -70,7 +69,6 @@ def main():
devnet_config_path = pjoin(deploy_config_dir, 'devnetL1.json')
devnet_config_template_path = pjoin(deploy_config_dir, 'devnetL1-template.json')
ops_chain_ops = pjoin(monorepo_dir, 'op-chain-ops')
tasks_dir = pjoin(monorepo_dir, 'packages', 'devnet-tasks')

paths = Bunch(
mono_repo_dir=monorepo_dir,
Expand All @@ -85,7 +83,6 @@ def main():
op_node_dir=op_node_dir,
ops_bedrock_dir=ops_bedrock_dir,
ops_chain_ops=ops_chain_ops,
tasks_dir=tasks_dir,
genesis_l1_path=pjoin(devnet_dir, 'genesis-l1.json'),
genesis_l2_path=pjoin(devnet_dir, 'genesis-l2.json'),
allocs_l1_path=pjoin(devnet_dir, 'allocs-l1.json'),
Expand All @@ -94,11 +91,6 @@ def main():
rollup_config_path=pjoin(devnet_dir, 'rollup.json')
)

if args.test:
log.info('Testing deployed devnet')
devnet_test(paths)
return

os.makedirs(devnet_dir, exist_ok=True)

if args.allocs:
Expand Down Expand Up @@ -330,21 +322,6 @@ def wait_for_rpc_server(url):
CommandPreset = namedtuple('Command', ['name', 'args', 'cwd', 'timeout'])


def devnet_test(paths):
# Run the two commands with different signers, so the ethereum nonce management does not conflict
# And do not use devnet system addresses, to avoid breaking fee-estimation or nonce values.
run_commands([
CommandPreset('erc20-test',
['npx', 'hardhat', 'deposit-erc20', '--network', 'devnetL1',
'--l1-contracts-json-path', paths.addresses_json_path, '--signer-index', '14'],
cwd=paths.tasks_dir, timeout=8*60),
CommandPreset('eth-test',
['npx', 'hardhat', 'deposit-eth', '--network', 'devnetL1',
'--l1-contracts-json-path', paths.addresses_json_path, '--signer-index', '15'],
cwd=paths.tasks_dir, timeout=8*60)
], max_workers=1)


def run_commands(commands: list[CommandPreset], max_workers=2):
with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
futures = [executor.submit(run_command_preset, cmd) for cmd in commands]
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@
"nx": "18.2.2",
"nx-cloud": "latest",
"prettier": "^2.8.0",
"rimraf": "^5.0.5",
"typescript": "^5.5.4"
},
"dependencies": {
Expand Down
18 changes: 0 additions & 18 deletions packages/devnet-tasks/.depcheckrc

This file was deleted.

4 changes: 0 additions & 4 deletions packages/devnet-tasks/.eslintrc.js

This file was deleted.

2 changes: 0 additions & 2 deletions packages/devnet-tasks/.example.env

This file was deleted.

3 changes: 0 additions & 3 deletions packages/devnet-tasks/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions packages/devnet-tasks/.lintstagedrc.yml

This file was deleted.

3 changes: 0 additions & 3 deletions packages/devnet-tasks/.prettierrc.js

This file was deleted.

22 changes: 0 additions & 22 deletions packages/devnet-tasks/LICENSE

This file was deleted.

4 changes: 0 additions & 4 deletions packages/devnet-tasks/README.md

This file was deleted.

89 changes: 0 additions & 89 deletions packages/devnet-tasks/hardhat.config.ts

This file was deleted.

49 changes: 0 additions & 49 deletions packages/devnet-tasks/package.json

This file was deleted.

Loading