ABI dir fixes

scripts/call_contracts.py

@@ -8,7 +8,8 @@
 from web3.constants import ADDRESS_ZERO
 from web3.contract import Contract
 
-from beamer.contracts import contracts_for_web3
+import beamer.artifacts
+from beamer.contracts import ABIManager, obtain_contract
 from beamer.typing import URL, Address, ChainId, TokenAmount
 from beamer.util import account_from_keyfile, make_web3, setup_logging, transact
 from scripts._util import pass_args, validate_address, validate_bytes
@@ -51,7 +52,13 @@ def cli(
 
     account = account_from_keyfile(keystore_file, password)
     web3 = make_web3(eth_rpc, account)
-    contracts = contracts_for_web3(web3, artifacts_dir, abi_dir)
+
+    abi_manager = ABIManager(abi_dir)
+    deployment = beamer.artifacts.load(artifacts_dir, ChainId(web3.eth.chain_id))
+
+    contracts = {}
+    for name in ("RequestManager", "FillManager", "MintableToken"):
+        contracts[name] = obtain_contract(web3, abi_manager, deployment, name)
 
     ctx.ensure_object(dict)
     ctx.obj["web3"] = web3

scripts/e2e-test-fill.py

@@ -3,7 +3,8 @@
 import sys
 from pathlib import Path
 
-from beamer.contracts import contracts_for_web3
+import beamer.artifacts
+from beamer.contracts import ABIManager, obtain_contract
 from beamer.tests.util import create_request_id
 from beamer.typing import URL, ChainId
 from beamer.util import account_from_keyfile, make_web3
@@ -20,15 +21,17 @@ def main() -> None:
     deployer = account_from_keyfile(keystore_file, password)
     web3 = make_web3(l2_rpc, deployer)
 
-    l2_contracts = contracts_for_web3(web3, artifacts_dir, abi_dir)
+    abi_manager = ABIManager(abi_dir)
+    deployment = beamer.artifacts.load(artifacts_dir, ChainId(web3.eth.chain_id))
+
     overriden_chain_id = os.getenv("SOURCE_CHAIN_ID")
     if overriden_chain_id is None:
         source_chain_id = ChainId(web3.eth.chain_id)
     else:
         source_chain_id = ChainId(int(overriden_chain_id))
 
-    fill_manager = l2_contracts["FillManager"]
-    token = l2_contracts["MintableToken"]
+    fill_manager = obtain_contract(web3, abi_manager, deployment, "FillManager")
+    token = obtain_contract(web3, abi_manager, deployment, "MintableToken")
 
     nonce = random.randint(1, sys.maxsize)
     request_amount = 123

scripts/e2e-test-verify.py

@@ -5,7 +5,9 @@
 import eth_utils
 from web3 import HTTPProvider, Web3
 
-from beamer.contracts import contracts_for_web3
+import beamer.artifacts
+from beamer.contracts import ABIManager, obtain_contract
+from beamer.typing import ChainId
 
 
 def main() -> None:
@@ -17,8 +19,9 @@ def main() -> None:
     request_id = sys.argv[5]
 
     web3 = Web3(HTTPProvider(l2_rpc))
-    l2_contracts = contracts_for_web3(web3, artifacts_dir, abi_dir)
-    request_manager = l2_contracts["RequestManager"]
+    abi_manager = ABIManager(abi_dir)
+    deployment = beamer.artifacts.load(artifacts_dir, ChainId(web3.eth.chain_id))
+    request_manager = obtain_contract(web3, abi_manager, deployment, "RequestManager")
 
     print("Waiting for resolution data...", flush=True, end="")
     for _ in range(60):