Merge branch 'main' into tsachi/ledgerentries

stellar · Oct 11, 2023 · f2655d2 · f2655d2
2 parents b721201 + bce5e56
commit f2655d2
Show file tree

Hide file tree

Showing 88 changed files with 2,649 additions and 1,325 deletions.
diff --git a/.github/workflows/dependency-check.yml b/.github/workflows/dependency-check.yml
@@ -20,6 +20,7 @@ jobs:
           go-version: 1.20.1
       - run: scripts/check-dependencies.bash
   validate-rust-git-rev-deps:
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: stellar/actions/rust-check-git-rev-deps@main
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -14,18 +14,19 @@ jobs:
     runs-on: ubuntu-latest-4-cores
     env:
       # the gh tag of system-test repo version to run
-      SYSTEM_TEST_GIT_REF: 1e39ad9fe1e0852ba286e7668aee1f899dd0b96d
+      SYSTEM_TEST_GIT_REF: 352cc1d4ea96af8cfb2c2b7335c3b51da000f889
 
       # the soroban tools source code to compile and run from system test
       # refers to checked out source of current git hub ref context
       SYSTEM_TEST_SOROBAN_TOOLS_REF: ${{ github.workspace }}/soroban-tools
 
       # core git ref should be latest commit for stable soroban functionality
       # the core bin can either be compiled in-line here as part of ci,
-      SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#22b9bb38416e5ce058eb9c1fadfdd414a4661833
-      SYSTEM_TEST_CORE_COMPILE_CONFIGURE_FLAGS: "--disable-tests --enable-next-protocol-version-unsafe-for-production"
-      # or can use option to pull a pre-compiled image instead
-      # SYSTEM_TEST_CORE_IMAGE:
+      SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#ecb24df104c2453a00fa5097d2e879d7731b9596
+      SYSTEM_TEST_CORE_COMPILE_CONFIGURE_FLAGS: "--disable-tests"
+      # or set SYSTEM_TEST_CORE_GIT_REF to empty, and set SYSTEM_TEST_CORE_IMAGE
+      # to pull a pre-compiled image from dockerhub instead
+      SYSTEM_TEST_CORE_IMAGE:
 
       # sets the version of rust toolchain that will be pre-installed in the
       # test runtime environment, tests invoke rustc/cargo
@@ -35,21 +36,22 @@ jobs:
       # resolution options, using npm release or a gh ref:
       #
       # option #1, set the version of soroban-js-client based on a npm release version
-      SYSTEM_TEST_JS_SOROBAN_CLIENT_NPM_VERSION: 
+      SYSTEM_TEST_JS_SOROBAN_CLIENT_NPM_VERSION: 1.0.0-beta.2
       # option #2, set the version of soroban-js-client used as a ref to a gh repo
-      # if this value is present it takes precedence over any SYSTEM_TEST_JS_SOROBAN_CLIENT_NPM_VERSION
-      SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO: stellar/js-soroban-client
-      SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REF: refs/pull/132/head
+      # if a value is set on SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO, it takes precedence 
+      # over any SYSTEM_TEST_JS_SOROBAN_CLIENT_NPM_VERSION
+      SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO:
+      SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REF:
 
       # system test will build quickstart image internally to use for running the service stack
       # configured in standalone network mode(core, rpc)
-      SYSTEM_TEST_QUICKSTART_GIT_REF: https://github.com/stellar/quickstart.git#c8826f5d8f80d54e819d1aca310cec3005f89175
+      SYSTEM_TEST_QUICKSTART_GIT_REF: https://github.com/stellar/quickstart.git#69a1089eee9aaac4bafe4cbfc0639de18222db6a
 
       # triggers system test to log out details from quickstart's logs and test steps
       SYSTEM_TEST_VERBOSE_OUTPUT: "true"
 
       # the soroban test cases will compile various contracts from the examples repo
-      SYSTEM_TEST_SOROBAN_EXAMPLES_GIT_HASH: "testnet"
+      SYSTEM_TEST_SOROBAN_EXAMPLES_GIT_HASH: "main"
       SYSTEM_TEST_SOROBAN_EXAMPLES_GIT_REPO: "https://github.com/stellar/soroban-examples.git"
     steps:
       - uses: actions/checkout@v3
@@ -62,11 +64,11 @@ jobs:
         name: checkout soroban-tools
         with:
           path: soroban-tools
-      - if: ${{ env.SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO }}   
+      - if: ${{ env.SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO != ''}}   
         name: prepare local js-soroban-client
         run: |
           rm -rf $GITHUB_WORKSPACE/system-test/js-soroban-client;
-      - if: ${{ env.SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO }}    
+      - if: ${{ env.SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO != ''}}    
         uses: actions/checkout@v3
         with:
           repository: ${{ env.SYSTEM_TEST_JS_SOROBAN_CLIENT_GH_REPO }}

diff --git a/.github/workflows/soroban-rpc.yml b/.github/workflows/soroban-rpc.yml
@@ -109,7 +109,7 @@ jobs:
     env:
       SOROBAN_RPC_INTEGRATION_TESTS_ENABLED: true
       SOROBAN_RPC_INTEGRATION_TESTS_CAPTIVE_CORE_BIN: /usr/bin/stellar-core
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1469.76fed6ead.focal~soroban
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.13.1-1481.3acf6dd26.focal
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -123,11 +123,12 @@ jobs:
       - uses: ./.github/actions/setup-go
         with:
           go-version: ${{ matrix.go }}
-
+      - uses: stellar/actions/rust-cache@main
       - name: Build soroban contract fixtures
         run: |
           rustup update
           rustup target add wasm32-unknown-unknown
+          make build_rust
           make build-test-wasms
 
       - name: Install Captive Core