Merge branch 'main' into feat/start-network-with-cli

.github/workflows/e2e.yml

@@ -18,12 +18,12 @@ jobs:
 
       # the soroban CLI & RPC source code to compile and run from system test
       # refers to checked out source of current git hub ref context
-      SYSTEM_TEST_SOROBAN_CLI_REF: ${{ github.workspace }}
-      SYSTEM_TEST_SOROBAN_RPC_REF: https://github.com/stellar/soroban-rpc.git
+      SYSTEM_TEST_SOROBAN_CLI_REF: ${{ github.workspace }}/soroban-cli
+      SYSTEM_TEST_SOROBAN_RPC_REF: https://github.com/stellar/soroban-rpc.git#v20.3.3
 
       # 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#v20.1.0
+      SYSTEM_TEST_CORE_GIT_REF: https://github.com/stellar/stellar-core.git#v20.2.0
       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
@@ -45,45 +45,43 @@ jobs:
       SYSTEM_TEST_JS_STELLAR_SDK_GH_REF: 
 
       # the version of rs-stellar-xdr to use for quickstart
-      SYSTEM_TEST_RS_XDR_GIT_REF: v20.0.2
+      SYSTEM_TEST_RS_XDR_GIT_REF: v20.1.0
 
-      # 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#412bb828ddb4a93745227ab5ad97c623d43f3a5f
+      # 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#eeb44ee99c564275654800edea2e426d73e966b8
 
       # 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: "v20.0.0"
+      SYSTEM_TEST_SOROBAN_EXAMPLES_GIT_HASH: "782458d31395b0191ac40c9572ac53f13f573aa3"
       SYSTEM_TEST_SOROBAN_EXAMPLES_GIT_REPO: "https://github.com/stellar/soroban-examples.git"
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+        name: checkout current pr source
+        with:
+          path: soroban-cli
+      - uses: actions/checkout@v4
         name: checkout system-test
         with:
           repository: stellar/system-test
           ref: ${{ env.SYSTEM_TEST_GIT_REF }}
           path: system-test
-      - uses: actions/checkout@v3
-        name: checkout soroban-tools
-        with:
-          repository: stellar/soroban-tools
-          path: soroban-tools
-      - uses: actions/checkout@v3
-        name: checkout soroban-rpc
-        with:
-          repository: stellar/soroban-rpc
-          path: soroban-rpc
+
       - if: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REPO != ''}}
         name: prepare local js-stellar-sdk
         run: |
           rm -rf $GITHUB_WORKSPACE/system-test/js-stellar-sdk;
+
       - if: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REPO != ''}}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REPO }}
           ref: ${{ env.SYSTEM_TEST_JS_STELLAR_SDK_GH_REF }}
           path: system-test/js-stellar-sdk
+
       - uses: stellar/actions/rust-cache@main
       - name: Build system test with component versions
         run: |
@@ -104,6 +102,7 @@ jobs:
             QUICKSTART_GIT_REF=$SYSTEM_TEST_QUICKSTART_GIT_REF \
             JS_STELLAR_SDK_NPM_VERSION=$JS_STELLAR_SDK_REF \
             build
+
       - name: Run system test scenarios
         run: |
           docker run --rm -t --name e2e_test stellar/system-test:dev \

Cargo.toml

@@ -10,7 +10,7 @@ default-members = ["cmd/soroban-cli", "cmd/crates/soroban-test"]
 exclude = ["cmd/crates/soroban-test/tests/fixtures/hello"]
 
 [workspace.package]
-version = "20.3.0"
+version = "20.3.1"
 rust-version = "1.74.0"
 
 [workspace.dependencies.soroban-env-host]
@@ -38,11 +38,11 @@ version = "=20.3.1"
 # path = "../rs-soroban-sdk/soroban-spec-rust"
 
 [workspace.dependencies.soroban-spec-json]
-version = "20.2.0"
+version = "20.3.1"
 path = "./cmd/crates/soroban-spec-json"
 
 [workspace.dependencies.soroban-spec-typescript]
-version = "20.2.0"
+version = "20.3.1"
 path = "./cmd/crates/soroban-spec-typescript"
 
 [workspace.dependencies.soroban-sdk]
@@ -61,7 +61,7 @@ version = "=20.3.1"
 # rev = "4aef54ff9295c2fca4c5b9fbd2c92d0ff99f67de"
 
 [workspace.dependencies.soroban-cli]
-version = "20.3.0"
+version = "20.3.1"
 path = "cmd/soroban-cli"
 
 [workspace.dependencies.soroban-rpc]

cmd/crates/soroban-test/Cargo.toml

@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-test"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "20.3.0"
+version = "20.3.1"
 edition = "2021"
 rust-version.workspace = true
 autobins = false

cmd/crates/soroban-test/tests/fixtures/hello/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "soroban-hello"
-version = "20.3.0"
+version = "20.3.1"
 edition = "2021"
 publish = false
 

cmd/crates/soroban-test/tests/fixtures/test-wasms/custom_type/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_custom_types"
-version = "20.3.0"
+version = "20.3.1"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/crates/soroban-test/tests/fixtures/test-wasms/hello_world/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "test_hello_world"
-version = "20.3.0"
+version = "20.3.1"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 edition = "2021"

cmd/soroban-cli/Cargo.toml

@@ -6,7 +6,7 @@ repository = "https://github.com/stellar/soroban-cli"
 authors = ["Stellar Development Foundation <[email protected]>"]
 license = "Apache-2.0"
 readme = "README.md"
-version = "20.3.0"
+version = "20.3.1"
 edition = "2021"
 rust-version.workspace = true
 autobins = false