Provide Bridgehub support

.github/workflows/test.yml

@@ -1,10 +1,10 @@
 name: Run tests
 on:
   push:
-    branches: [ main, beta ]
+    branches: [ master, beta ]
   workflow_dispatch:
   pull_request:
-    branches: [ main, beta ]
+    branches: [ master, beta ]
     types: [ opened, reopened, synchronize ]
 
 permissions:
@@ -30,7 +30,7 @@ jobs:
         run: |
           git clone https://github.com/matter-labs/local-setup.git
           pushd local-setup
-          ./start.sh
+          ./start-zk-chains.sh
           popd
       - name: Prepare environment
         run: make prepare-environment

Makefile

@@ -8,7 +8,4 @@ check-code-format:
 	black --check zksync2 scripts tests
 
 format-code:
-	black zksync2 scripts tests
-
-wait:
-	python scripts/wait.py
+	black zksync2 scripts tests

scripts/setup.py

@@ -21,8 +21,8 @@ def main():
     from zksync2.module.module_builder import ZkSyncBuilder
     from zksync2.signer.eth_signer import PrivateKeyEthSigner
 
-    zksync = ZkSyncBuilder.build("http://127.0.0.1:3050")
-    eth_web3 = Web3(Web3.HTTPProvider("http://127.0.0.1:8545"))
+    zksync = ZkSyncBuilder.build("http://127.0.0.1:15100")
+    eth_web3 = Web3(Web3.HTTPProvider("http://127.0.0.1:15045"))
     account: LocalAccount = Account.from_key(
         "0x7726827caac94a7f9e1b160f7ea819f172f7b6f9d2a97f992c38edeab82d4110"
     )
@@ -41,16 +41,37 @@ def main():
 
 def deposit_token(wallet, eth_web3: Web3, zksync: Web3, zksync_contract):
     from zksync2.core.types import DepositTransaction
+    from zksync2.manage_contracts.utils import get_test_net_erc20_token
+    from zksync2.core.types import EthBlockParams
 
-    amount = 50
+    amount = 100
     l1_address = load_token()
 
+    token_contract = eth_web3.eth.contract(
+        Web3.to_checksum_address(l1_address), abi=get_test_net_erc20_token()
+    )
+    mint_tx = token_contract.functions.mint(wallet.address, 10000).build_transaction(
+        {
+            "nonce": eth_web3.eth.get_transaction_count(
+                wallet.address, EthBlockParams.LATEST.value
+            ),
+            "from": wallet.address,
+            "maxPriorityFeePerGas": 1_000_000,
+            "maxFeePerGas": eth_web3.eth.gas_price,
+        }
+    )
+
+    signed = wallet.sign_transaction(mint_tx)
+    tx_hash = eth_web3.eth.send_raw_transaction(signed.rawTransaction)
+    eth_web3.eth.wait_for_transaction_receipt(tx_hash, timeout=240, poll_latency=0.5)
+
     tx_hash = wallet.deposit(
         DepositTransaction(
             Web3.to_checksum_address(l1_address),
             amount,
             wallet.address,
             approve_erc20=True,
+            approve_base_erc20=True,
             refund_recipient=wallet.address,
         )
     )

tests/integration/test_config.py

@@ -31,5 +31,5 @@ class TestEnvironment:
 
 
 LOCAL_ENV = TestEnvironment(
-    EnvType.LOCAL_HOST, "http://127.0.0.1:3050", "http://127.0.0.1:8545"
+    EnvType.LOCAL_HOST, "http://localhost:15100", "http://127.0.0.1:15045"
 )