Update to OP stack v1.3.0

.gitignore

@@ -21,3 +21,8 @@
 # Private configuration
 /.env
 /config.toml
+
+# Misc
+
+## jwt file path in optimism doc config
+jwt.txt

Makefile

@@ -6,7 +6,7 @@ lint-fix:
 	@ruff check . --fix
 .PHONY: lint-fix
 
-AUTOPEP8_EXCLUDES=optimism,op-geth,venv,account-abstraction
+AUTOPEP8_EXCLUDES=bin,venv,optimism,op-geth,account-abstraction,paymaster,blockscout
 AUTOPEP8_OPTIONS=--recursive . --exclude $(AUTOPEP8_EXCLUDES) --max-line-length 100
 
 format-check:

README.md

@@ -51,7 +51,7 @@ always for your permission before installing anything outside the current direct
 ## Usage
 
 ```
-usage: rollop [-h] [--name NAME] [--preset {dev,prod}] [--config CONFIG_PATH] [--clean] [--stack-trace] [--no-ansi-esc] <command> ...
+usage: rollop <options> <command> <command_options> ...
 
 Helps you spin up an op-stack rollup.
 Use `rollop <command> --help` to get more detailed help for a command.
@@ -70,11 +70,12 @@ commands:
 
     -- MAIN COMMANDS --
 
-    help                show this help message and exit~~~~
+    help                show this help message and exit
     setup               installs prerequisites and builds the optimism repository
     devnet              starts a local devnet, comprising an L1 node and all L2 components
     clean               cleans up deployment outputs and databases
     l2                  deploys and starts a local L2 blockchain
+    aa                  starts an ERC-4337 bundler and a paymaster signer service
 
     -- GRANULAR COMMANDS --
 
@@ -89,8 +90,9 @@ commands:
     -- CLEANUP --
 
     clean-build         cleans up build outputs (but not deployment outputs or databases)
-    clean-l1            cleans up deployment outputs & databases for L1
-    clean-l2            cleans up deployment outputs & databases for L2
+    clean-aa            cleans up deployment outputs for account abstraction
+    clean-l1            cleans up deployment outputs & databases for L1, deploy config is preserved
+    clean-l2            cleans up deployment outputs & databases for L2, deploy config is preserved
 ```
 
 You can also use the `roll.py` script directly as `./roll.py` or `python3 roll.py`  as an
@@ -102,7 +104,7 @@ repository and can be symlinked if required.
 ```bash
 ./rollop setup
 ./rollop setup --yes # auto-install all dependencies
-./rollop --clean devnet
+./rollop --clean devnet # default deployment name is "rollup"
 
 # equivalent with a different deployment name
 ./rollop --clean --name=testing --preset=dev --config=config.toml.example devnet

account_abstraction.py

@@ -126,7 +126,7 @@ def start_bundler(config: Config):
         bundler_key = bundler_key[2:]
 
     env = {**os.environ,
-           "ERC4337_BUNDLER_ETH_CLIENT_URL": config.l2_engine_rpc,
+           "ERC4337_BUNDLER_ETH_CLIENT_URL": config.l2_engine_rpc_url,
            "ERC4337_BUNDLER_PRIVATE_KEY": bundler_key}
 
     log_file_path = "logs/stackup_bundler.log"
@@ -163,7 +163,7 @@ def start_paymaster(config: Config):
     ).strip().split(' ')[-1]
 
     env = {**os.environ,
-           "RPC_URL": config.l2_engine_rpc,
+           "RPC_URL": config.l2_engine_rpc_url,
            "PAYMASTER_RPC_URL": "http://localhost:3000",
            "ENTRYPOINT_ADDRESS": entrypoint_address,
            "SIMPLE_ACCOUNT_FACTORY_ADDRESS": simple_account_factory_address,

block_explorer.py

@@ -34,3 +34,8 @@ def launch_blockscout():
 
 
 ####################################################################################################
+
+def clean():
+    pass  # TODO
+
+####################################################################################################