Skip to content

Commit 2b18d37

Browse files
committed
feat(op-deployer): make room for multisig specs in deployer args
1 parent bab18ca commit 2b18d37

3 files changed

Lines changed: 18 additions & 1 deletion

File tree

src/contracts/input_parser.star

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ _DEFAULT_ARGS = {
88
"l1_artifacts_locator": None,
99
"l2_artifacts_locator": None,
1010
"overrides": {},
11+
"multisig": {},
1112
}
1213

1314

@@ -33,5 +34,16 @@ def parse(args, registry):
3334
_registry.OP_CONTRACTS
3435
)
3536

37+
_validate_string_map("overrides", op_deployer_params["overrides"])
38+
_validate_string_map("multisig", op_deployer_params["multisig"])
39+
3640
return struct(**op_deployer_params)
3741

42+
43+
def _validate_string_map(name, string_map):
44+
if type(string_map) != "dict":
45+
fail("{} must be a dict, got {}".format(name, type(string_map)))
46+
47+
for key, value in string_map.items():
48+
if type(value) != "string":
49+
fail("{} must be a dict of strings, got {}".format(name, type(value)))

src/package_io/registry.star

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ OP_BLOCKSCOUT = "op-blockscout"
4141
OP_BLOCKSCOUT_VERIFIER = "op-blockscout-verifier"
4242

4343
OP_CONTRACTS = "op-contracts"
44+
SAFE_UTILS = "safe-utils"
4445

4546

4647
_DEFAULT_IMAGES = {
@@ -95,6 +96,8 @@ _DEFAULT_IMAGES = {
9596
OP_BLOCKSCOUT_VERIFIER: "ghcr.io/blockscout/smart-contract-verifier:v1.9.0",
9697
# Contracts artifact
9798
OP_CONTRACTS: "https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz",
99+
# Safe-utils
100+
SAFE_UTILS: "us-docker.pkg.dev/oplabs-tools-artifacts/images/safe-utils:develop",
98101
}
99102

100103

test/contracts/input_parser_test.star

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ def test_contracts_input_parser_default_args(plan):
1616
l1_artifacts_locator="https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz",
1717
l2_artifacts_locator="https://storage.googleapis.com/oplabs-contract-artifacts/artifacts-v1-02024c5a26c16fc1a5c716fff1c46b5bf7f23890d431bb554ddbad60971211d4.tar.gz",
1818
overrides={},
19+
multisig={},
1920
),
2021
)
2122

@@ -35,5 +36,6 @@ def test_contracts_input_parser_custom_args(plan):
3536
l1_artifacts_locator="artifact://l1-artifacts",
3637
l2_artifacts_locator="artifact://l2-artifacts",
3738
overrides={},
39+
multisig={},
3840
),
39-
)
41+
)

0 commit comments

Comments
 (0)