chore: update e2e CI workflow to latest quickstart

.cargo/config.toml

@@ -1,7 +1,7 @@
 # paths = ["/path/to/override"] # path dependency overrides
 
 [alias] # command aliases
-install_soroban = "install --version 20.2.0 --root ./target soroban-cli --debug"
+install_soroban = "install --version 21.0.0-preview.1 --root ./target soroban-cli --debug"
 # b = "build --target wasm32-unknown-unknown --release"
 # c = "check"
 # t = "test"

.github/workflows/e2e.yml

@@ -1,4 +1,4 @@
-name: ContractClient
+name: e2e
 
 on:
   push:
@@ -7,17 +7,18 @@ on:
 
 jobs:
   test:
-    name: test generated ContractClient
+    name: test contract.Client
     runs-on: ubuntu-22.04
     services:
       rpc:
-        image: stellar/quickstart:soroban-dev@sha256:0ad51035cf7caba2fd99c7c1fad0945df6932be7d5c893e1520ccdef7d6a6ffe
+        image: stellar/quickstart:testing@sha256:bef5c451e305c914e91964ec22e7a25b9f5276a706fe0357ac23125569d93f05
         ports:
           - 8000:8000
         env:
           ENABLE_LOGS: true
           NETWORK: local
           ENABLE_SOROBAN_RPC: true
+          PROTOCOL_VERSION: 21
         options: >-
           --health-cmd "curl --no-progress-meter --fail-with-body -X POST \"http://localhost:8000/soroban/rpc\" -H 'Content-Type: application/json' -d '{\"jsonrpc\":\"2.0\",\"id\":8675309,\"method\":\"getNetwork\"}' && curl --no-progress-meter \"http://localhost:8000/friendbot\" | grep '\"invalid_field\": \"addr\"'"
           --health-interval 10s

test/e2e/initialize.sh

@@ -16,7 +16,14 @@ echo "###################### Initializing e2e tests ########################"
 
 soroban="$dirname/../../target/bin/soroban"
 if [[ -f "$soroban" ]]; then
-  echo "Using soroban binary from ./target/bin"
+  current=$($soroban --version | head -n 1 | cut -d ' ' -f 2)
+  desired=$(cat .cargo/config.toml | grep -oE -- "--version\s+\S+" | awk '{print $2}')
+  if [[ "$current" != "$desired" ]]; then
+    echo "Current pinned soroban binary: $current. Desired: $desired. Building soroban binary."
+    (cd "$dirname/../.." && cargo install_soroban)
+  else
+    echo "Using soroban binary from ./target/bin"
+  fi
 else
   echo "Building pinned soroban binary"
   (cd "$dirname/../.." && cargo install_soroban)

test/e2e/src/util.js

@@ -59,9 +59,9 @@ async function clientFor(contract, { keypair = generateFundedKeypair(), contract
   keypair = await keypair // eslint-disable-line no-param-reassign
   const wallet = basicNodeSigner(keypair, networkPassphrase)
 
-  const wasmHash = contracts[contract].hash;
+  let wasmHash = contracts[contract].hash;
   if (!wasmHash) {
-    throw new Error(`No wasm hash found for \`contracts[${contract}]\`! ${JSON.stringify(contracts[contract], null, 2)}`)
+    wasmHash = spawnSync("./target/bin/soroban", ["contract", "install", "--wasm", contracts[contract].path], { shell: true, encoding: "utf8" }).stdout.trim()
   }
 
   // TODO: do this with js-stellar-sdk, instead of shelling out to the CLI