Merge branch 'main' into fix/e2e-test

EspressoSystems · Feb 16, 2024 · 7d42f4c · 7d42f4c
2 parents 5ae80bb + d71c344
commit 7d42f4c
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 16 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -54,4 +54,4 @@ jobs:
           args: --workspace --all-features --all-targets -- -D warnings
 
       - name: Audit
-        run: cargo audit --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2022-0093 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2023-0053 --ignore RUSTSEC-2023-0065 --ignore RUSTSEC-2024-0003
+        run: cargo audit --ignore RUSTSEC-2020-0071 --ignore RUSTSEC-2023-0052 --ignore RUSTSEC-2023-0065 --ignore RUSTSEC-2024-0003 --ignore RUSTSEC-2024-0011
diff --git a/scripts/build-l1-image b/scripts/build-l1-image
@@ -57,21 +57,38 @@ done
 
 echo "Funding accounts."
 
-# Retry a few times because sending transactions may still fail for a while
-# after the RPC is up.
-for try in $(seq 1 5); do
-    echo "Transfer from coinbase to account 0"
-    geth --exec \
-        'eth.sendTransaction({from: eth.coinbase, to: "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", value: "1000000000000000000000000000"})' \
-        attach http://localhost:$RPC_PORT && break || sleep "$BLOCK_PERIOD";
-done
-echo "Transfer done!"
-
-echo "Transfer from coinbase to account 1"
-geth --exec \
-    'eth.sendTransaction({from: eth.coinbase, to: "0x70997970C51812dc3A010C7d01b50e0d17dc79C8", value: "1000000000000000000000000000"})' \
-    attach http://localhost:$RPC_PORT
-echo "Transfer done!"
+# Loop over accounts and fund them.
+while read address; do
+    # Retry a few times because sending transactions may still fail for a while
+    # after the RPC is up.
+    for try in $(seq 1 5); do
+        echo "Transfer from coinbase to $address"
+        geth --exec \
+            "eth.sendTransaction({from: eth.coinbase, to: \"$address\", value: \"10000000000000000000000000000000000000000\"})" \
+            attach http://localhost:$RPC_PORT && break || sleep "$BLOCK_PERIOD";
+    done
+done <<EOF
+0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
+0x70997970C51812dc3A010C7d01b50e0d17dc79C8
+0x3C44CdDdB6a900fa2b585dd299e03d12FA4293BC
+0x90F79bf6EB2c4f870365E785982E1f101E93b906
+0x15d34AAf54267DB7D7c367839AAf71A00a2C6A65
+0x9965507D1a55bcC2695C58ba16FB37d819B0A4dc
+0x976EA74026E726554dB657fA54763abd0C3a0aa9
+0x14dC79964da2C08b23698B3D3cc7Ca32193d9955
+0x23618e81E3f5cdF7f54C3d65f7FBc0aBf5B21E8f
+0xa0Ee7A142d267C1f36714E4a8F75612F20a79720
+0xBcd4042DE499D14e55001CcbB24a551F3b954096
+0x71bE63f3384f5fb98995898A86B02Fb2426c5788
+0xFABB0ac9d68B0B445fB7357272Ff202C5651694a
+0x1CBd3b2770909D4e10f157cABC84C7264073C9Ec
+0xdF3e18d64BC6A983f673Ab319CCaE4f1a57C7097
+0xcd3B766CCDd6AE721141F452C550Ca635964ce71
+0x2546BcD3c84621e976D8185a91A922aE77ECEc30
+0xbDA5747bFD65F08deb54cb465eB87D40e51B197E
+0xdD2FD4581271e230360230F9337D5c0430Bf44C0
+0x8626f6940E2eb28930eFb4CeF49B2d1F2C9C1199
+EOF
 
 # Deploy the contracts. Retry a few times because sending transactions may fail
 # for a while after having funded the account.