upd

stellar · Oct 30, 2023 · 5bbadc6 · 5bbadc6
1 parent 2d1a2e5
commit 5bbadc6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 23 deletions.
diff --git a/.github/workflows/build-soroban-dev.yml b/.github/workflows/build-soroban-dev.yml
@@ -36,7 +36,7 @@ jobs:
       arch: amd64
       tag: soroban-dev-amd64
       core_repo: https://github.com/sisuresh/stellar-core.git
-      core_ref: 35edba32d29c47cd78eea736afa2fdb498b6ecd2
+      core_ref: v20.0.0-rc.2.2
       core_supports_enable_soroban_diagnostic_events: "true"
       go_ref: horizon-v2.27.0-rc1
       soroban_tools_ref: v20.0.0-rc4
@@ -55,7 +55,7 @@ jobs:
       arch: arm64
       tag: soroban-dev-arm64
       core_repo: https://github.com/sisuresh/stellar-core.git
-      core_ref: 35edba32d29c47cd78eea736afa2fdb498b6ecd2
+      core_ref: v20.0.0-rc.2.2
       core_supports_enable_soroban_diagnostic_events: "true"
       core_build_runner_type: ubuntu-latest-16-cores
       go_ref: horizon-v2.27.0-rc1

diff --git a/.github/workflows/build-testing.yml b/.github/workflows/build-testing.yml
@@ -38,7 +38,7 @@ jobs:
       arch: amd64
       tag: testing-amd64
       core_repo: https://github.com/sisuresh/stellar-core.git
-      core_ref: 35edba32d29c47cd78eea736afa2fdb498b6ecd2
+      core_ref: v20.0.0-rc.2.2
       core_supports_enable_soroban_diagnostic_events: "true"
       go_ref: horizon-v2.27.0-rc1
       soroban_tools_ref: v20.0.0-rc4
@@ -60,7 +60,7 @@ jobs:
       arch: arm64
       tag: testing-arm64
       core_repo: https://github.com/sisuresh/stellar-core.git
-      core_ref: 35edba32d29c47cd78eea736afa2fdb498b6ecd2
+      core_ref: v20.0.0-rc.2.2
       core_supports_enable_soroban_diagnostic_events: "true"
       core_build_runner_type: ubuntu-latest-16-cores
       go_ref: horizon-v2.27.0-rc1

diff --git a/Makefile b/Makefile
@@ -27,15 +27,15 @@ build-latest:
 build-testing:
 	$(MAKE) build TAG=testing \
 		CORE_REPO=https://github.com/sisuresh/stellar-core.git \
-		CORE_REF=35edba32d29c47cd78eea736afa2fdb498b6ecd2 \
+		CORE_REF=v20.0.0-rc.2.2 \
 		CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \
 		HORIZON_REF=horizon-v2.27.0-rc1 \
 		SOROBAN_RPC_REF=v20.0.0-rc4
 
 build-soroban-dev:
 	$(MAKE) build TAG=soroban-dev \
 		CORE_REPO=https://github.com/sisuresh/stellar-core.git \
-		CORE_REF=35edba32d29c47cd78eea736afa2fdb498b6ecd2 \
+		CORE_REF=v20.0.0-rc.2.2 \
 		CORE_SUPPORTS_ENABLE_SOROBAN_DIAGNOSTIC_EVENTS=true \
 		HORIZON_REF=horizon-v2.27.0-rc1 \
 		SOROBAN_RPC_REF=v20.0.0-rc4

diff --git a/start b/start
@@ -488,23 +488,33 @@ function upgrade_local() {
   # Upgrade local network's soroban config to match testnet
   if [ $PROTOCOL_VERSION -ge 20 ]; then
     echo "upgrades: soroban config"
-    echo $NETWORK_ROOT_SECRET_KEY | stellar-core get-settings-upgrade-txs "$NETWORK_ROOT_ACCOUNT_ID" 0 "$NETWORK_PASSPHRASE" --json $COREHOME/etc/config-settings-entries.json --signtxs 2>/dev/null | { \
-      read tx; \
-      read txid; \
-      echo "upgrades: soroban config: install contract: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
-      while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "1" ]; do sleep 1; done
-      read tx; \
-      read txid; \
-      echo "upgrades: soroban config: deploy contract: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
-      while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "2" ]; do sleep 1; done
-      read tx; \
-      read txid; \
-      echo "upgrades: soroban config: upload config: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
-      while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "3" ]; do sleep 1; done
-      read key; \
-      echo "upgrades: soroban config: set config with key: $key";
-      curl -sG 'http://localhost:11626/upgrades?mode=set&upgradetime=1970-01-01T00:00:00Z' --data-urlencode "configupgradesetkey=$key"; \
-    }
+    # Generate txs for installing, deploying and executing the contract that
+    # uploads a new config. Use the network root account to submit the txs.
+    echo $NETWORK_ROOT_SECRET_KEY \
+      | stellar-core get-settings-upgrade-txs \
+        "$NETWORK_ROOT_ACCOUNT_ID" \
+        0 \
+        "$NETWORK_PASSPHRASE" \
+        --json $COREHOME/etc/config-settings-entries.json \
+        --signtxs \
+        2>/dev/null \
+      | { \
+        read tx; \
+        read txid; \
+        echo "upgrades: soroban config: install contract: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
+        while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "1" ]; do sleep 1; done
+        read tx; \
+        read txid; \
+        echo "upgrades: soroban config: deploy contract: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
+        while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "2" ]; do sleep 1; done
+        read tx; \
+        read txid; \
+        echo "upgrades: soroban config: upload config: $txid .. $(curl -sG 'http://localhost:11626/tx' --data-urlencode "blob=$tx" | jq -r '.status')"; \
+        while [ "`curl -s http://localhost:11626/metrics | jq -r '.metrics."ledger.transaction.count".count'`" != "3" ]; do sleep 1; done
+        read key; \
+        echo "upgrades: soroban config: set config with key: $key";
+        curl -sG 'http://localhost:11626/upgrades?mode=set&upgradetime=1970-01-01T00:00:00Z' --data-urlencode "configupgradesetkey=$key"; \
+      }
     echo "upgrades: soroban config done"
   fi