From ca72a323570f52346ea56d4b01f71abf86a1d505 Mon Sep 17 00:00:00 2001 From: "Tyler.S" Date: Tue, 30 Jan 2024 14:30:06 -0800 Subject: [PATCH 1/5] Build Soroban RPC from new repo --- .github/workflows/build-future.yml | 5 +++-- .github/workflows/build-latest.yml | 5 +++-- .github/workflows/build-testing.yml | 5 +++-- .github/workflows/build.yml | 10 +++++----- Makefile | 2 +- README.md | 2 +- 6 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml index 17818382..e408fca6 100644 --- a/.github/workflows/build-future.yml +++ b/.github/workflows/build-future.yml @@ -35,7 +35,7 @@ jobs: core_ref: v20.1.0 core_supports_enable_soroban_diagnostic_events: "true" go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 test_matrix: | { "network": ["local"], @@ -56,7 +56,8 @@ jobs: core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_cli_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 9f900a23..5065544b 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -35,7 +35,7 @@ jobs: xdr_ref: v20.0.2 core_ref: v20.1.0 go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 test_matrix: | { "network": ["pubnet", "local"], @@ -58,7 +58,8 @@ jobs: core_ref: v20.1.0 core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_cli_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index a4c1210b..aa577c38 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -37,7 +37,7 @@ jobs: core_ref: v20.1.0 core_supports_enable_soroban_diagnostic_events: "true" go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 test_matrix: | { "network": ["testnet", "pubnet", "local"], @@ -61,7 +61,8 @@ jobs: core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_tools_ref: v20.1.0 + soroban_cli_ref: v20.1.0 + soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d951cebc..87637c91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -46,8 +46,8 @@ on: description: 'Git ref for the stellar/rs-stellar-xdr repo' type: 'string' required: false - soroban_tools_ref: - description: 'Git ref for the stellar/soroban-tools repo (soroban-rpc)' + soroban_rpc_ref: + description: 'Git ref for the stellar/soroban-rpc repo (soroban-rpc)' type: 'string' required: true soroban_rpc_build_runner_type: @@ -66,7 +66,7 @@ on: env: IMAGE: ${{ format('{0}/{1}:{2}', secrets.DOCKERHUB_TOKEN && 'docker.io' || 'ghcr.io', github.repository, github.event_name == 'pull_request' && format('pr{0}-{1}', github.event.pull_request.number, inputs.tag) || inputs.tag) }} GO_REPO_BRANCH: ${{ inputs.go_ref }} - SOROBAN_TOOLS_REPO_BRANCH: ${{ inputs.soroban_tools_ref }} + SOROBAN_RPC_REPO_BRANCH: ${{ inputs.soroban_rpc_ref }} CORE_REPO: ${{ inputs.core_repo }} CORE_REPO_REF: ${{ inputs.core_ref }} XDR_REPO_REF: ${{ inputs.xdr_ref }} @@ -160,7 +160,7 @@ jobs: uses: actions/cache@v3 with: path: /tmp/image - key: image-stellar-soroban-rpc-${{ inputs.arch }}-${{ env.SOROBAN_TOOLS_REPO_BRANCH }} + key: image-stellar-soroban-rpc-${{ inputs.arch }}-${{ env.SOROBAN_RPC_REPO_BRANCH }} - if: steps.cache.outputs.cache-hit != 'true' && inputs.arch == 'arm64' uses: docker/setup-qemu-action@e81a89b1732b9c48d79cd809d8d81d79c4647a18 with: @@ -175,7 +175,7 @@ jobs: -t stellar-soroban-rpc:${{ inputs.arch }} -o type=docker,dest=/tmp/image --build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true - https://github.com/stellar/soroban-tools.git#${{ env.SOROBAN_TOOLS_REPO_BRANCH }} + https://github.com/stellar/soroban-rpc.git#${{ env.SOROBAN_RPC_REPO_BRANCH }} - name: Upload Stellar-Soroban-Rpc Image uses: actions/upload-artifact@v4 with: diff --git a/Makefile b/Makefile index 9eefaaad..088fa121 100644 --- a/Makefile +++ b/Makefile @@ -71,4 +71,4 @@ build-deps-friendbot: docker build -t stellar-friendbot:$(FRIENDBOT_REF) -f services/friendbot/docker/Dockerfile https://github.com/stellar/go.git#$(FRIENDBOT_REF) build-deps-soroban-rpc: - docker build -t stellar-soroban-rpc:$(SOROBAN_RPC_REF) -f cmd/soroban-rpc/docker/Dockerfile --target build https://github.com/stellar/soroban-tools.git#$(SOROBAN_RPC_REF) --build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true + docker build -t stellar-soroban-rpc:$(SOROBAN_RPC_REF) -f cmd/soroban-rpc/docker/Dockerfile --target build https://github.com/stellar/soroban-rpc.git#$(SOROBAN_RPC_REF) --build-arg BUILDKIT_CONTEXT_KEEP_GIT_DIR=true diff --git a/README.md b/README.md index 73ac20d6..2b8c28c4 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ The image uses the following software: - [stellar-core](https://github.com/stellar/stellar-core) - [horizon](https://github.com/stellar/go/tree/master/services/horizon) - [friendbot](https://github.com/stellar/go/tree/master/services/friendbot) -- [soroban-rpc](https://github.com/stellar/soroban-tools/tree/main/cmd/soroban-rpc) +- [soroban-rpc](https://github.com/stellar/soroban-rpc/tree/main/cmd/soroban-rpc) - Supervisord is used from managing the processes of the services above ## Usage From 07c951ac4464bb8703a1bbec0a3566006f3dfc7d Mon Sep 17 00:00:00 2001 From: "Tyler.S" Date: Tue, 30 Jan 2024 14:33:08 -0800 Subject: [PATCH 2/5] Use soroban-rpc repo in script --- scripts/soroban_repo_to_horizon_repo.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/soroban_repo_to_horizon_repo.sh b/scripts/soroban_repo_to_horizon_repo.sh index 410957e4..812cefe9 100755 --- a/scripts/soroban_repo_to_horizon_repo.sh +++ b/scripts/soroban_repo_to_horizon_repo.sh @@ -16,9 +16,9 @@ fi GO_MONOREPO=github.com/stellar/go SOROBAN_BRANCH=$1 -SOROBAN_REPO_GOMOD=https://raw.githubusercontent.com/stellar/soroban-tools/${SOROBAN_BRANCH}/go.mod +SOROBAN_REPO_GOMOD=https://raw.githubusercontent.com/stellar/soroban-rpc/${SOROBAN_BRANCH}/go.mod -# find the short commit from the soroban-tools repository. +# find the short commit from the soroban-rpc repository. SHORT_COMMIT=$(curl -s ${SOROBAN_REPO_GOMOD} -o - | grep "${GO_MONOREPO} " | cut -d- -f3) # find the long commit from the actual go repository using the short commit. From aacd282ca41628823200282466cf734c1b00f250 Mon Sep 17 00:00:00 2001 From: "Tyler.S" Date: Tue, 30 Jan 2024 14:43:46 -0800 Subject: [PATCH 3/5] Remove extra soroban_cli_ref --- .github/workflows/build-future.yml | 1 - .github/workflows/build-latest.yml | 1 - .github/workflows/build-testing.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml index e408fca6..13bb8174 100644 --- a/.github/workflows/build-future.yml +++ b/.github/workflows/build-future.yml @@ -56,7 +56,6 @@ jobs: core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_cli_ref: v20.1.0 soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index 5065544b..0326495a 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -58,7 +58,6 @@ jobs: core_ref: v20.1.0 core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_cli_ref: v20.1.0 soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index aa577c38..701f7580 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -61,7 +61,6 @@ jobs: core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.0 - soroban_cli_ref: v20.1.0 soroban_rpc_ref: v20.1.0 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | From ab906f0c1934b66e3dcc10262fb54ad475d912d3 Mon Sep 17 00:00:00 2001 From: pritsheth Date: Wed, 21 Feb 2024 13:04:40 -0800 Subject: [PATCH 4/5] Update soroban-rpc-ref to latest release --- .github/workflows/build-latest.yml | 4 ++-- .github/workflows/build-testing.yml | 4 ++-- Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-latest.yml b/.github/workflows/build-latest.yml index e86b9378..9ad28a9e 100644 --- a/.github/workflows/build-latest.yml +++ b/.github/workflows/build-latest.yml @@ -35,7 +35,7 @@ jobs: xdr_ref: v20.1.0 core_ref: v20.2.0 go_ref: horizon-v2.28.3 - soroban_rpc_ref: v20.3.0 + soroban_rpc_ref: v20.3.2 test_matrix: | { "network": ["pubnet", "local"], @@ -58,7 +58,7 @@ jobs: core_ref: v20.2.0 core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.3 - soroban_rpc_ref: v20.3.0 + soroban_rpc_ref: v20.3.2 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml index 9a8c2f8c..2a563e3e 100644 --- a/.github/workflows/build-testing.yml +++ b/.github/workflows/build-testing.yml @@ -37,7 +37,7 @@ jobs: core_ref: v20.2.0 core_supports_enable_soroban_diagnostic_events: "true" go_ref: horizon-v2.28.3 - soroban_rpc_ref: v20.3.0 + soroban_rpc_ref: v20.3.2 test_matrix: | { "network": ["testnet", "pubnet", "local"], @@ -61,7 +61,7 @@ jobs: core_supports_enable_soroban_diagnostic_events: "true" core_build_runner_type: ubuntu-latest-16-cores go_ref: horizon-v2.28.3 - soroban_rpc_ref: v20.3.0 + soroban_rpc_ref: v20.3.2 soroban_rpc_build_runner_type: ubuntu-latest-16-cores test_matrix: | { diff --git a/Makefile b/Makefile index 0d049925..8cf693f1 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ build-latest: CORE_REF=v20.2.0 \ CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \ HORIZON_REF=horizon-v2.28.3 \ - SOROBAN_RPC_REF=v20.3.0 + SOROBAN_RPC_REF=v20.3.2 build-testing: $(MAKE) build TAG=testing \ @@ -35,7 +35,7 @@ build-testing: CORE_REF=v20.2.0 \ CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \ HORIZON_REF=horizon-v2.28.3 \ - SOROBAN_RPC_REF=v20.3.0 + SOROBAN_RPC_REF=v20.3.2 build-future: $(MAKE) build TAG=future \ From 5695054bd9ffae45f0a5a8386f8bea0bf5e12f8f Mon Sep 17 00:00:00 2001 From: Leigh McCulloch <351529+leighmcculloch@users.noreply.github.com> Date: Thu, 22 Feb 2024 04:11:00 -0800 Subject: [PATCH 5/5] fix --- .github/workflows/build-future.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-future.yml b/.github/workflows/build-future.yml index 97ea4b47..39019917 100644 --- a/.github/workflows/build-future.yml +++ b/.github/workflows/build-future.yml @@ -34,6 +34,7 @@ jobs: xdr_ref: v20.0.2 core_ref: v20.1.0 core_supports_enable_soroban_diagnostic_events: "true" + go_ref: horizon-v2.28.3 soroban_rpc_ref: v20.1.0 test_matrix: | {