Update soroban xdr

.github/workflows/horizon.yml

@@ -34,8 +34,8 @@ jobs:
     env:
       HORIZON_INTEGRATION_TESTS_ENABLED: true
       HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
-      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.4.1-1097.4e813f20e.focal~soroban
-      PROTOCOL_20_CORE_DOCKER_IMG: sreuland/stellar-core:19.4.1-1097.4e813f20e.focal-soroban
+      PROTOCOL_20_CORE_DEBIAN_PKG_VERSION: 19.5.1-1131.f55f88376.focal~soroban
+      PROTOCOL_20_CORE_DOCKER_IMG: 2opremio/stellar-core:19.5.1-1131.f55f88376.focal-soroban
       PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 19.4.0-1075.39bee1a2b.focal
       PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:19.4.0-1075.39bee1a2b.focal
       PROTOCOL_18_CORE_DEBIAN_PKG_VERSION: 19.4.0-1075.39bee1a2b.focal

Makefile

@@ -13,7 +13,7 @@ xdr/Stellar-contract.x \
 xdr/Stellar-internal.x
 
 XDRGEN_COMMIT=2864dda63ad8a5d3b0e33430fcd6093633ce8fac
-XDRNEXT_COMMIT=d194cc6cd79e3b368c43477556b0084e81b9dcbc
+XDRNEXT_COMMIT=026c9cd074bdb28ddde8ee52f2a4502d9e518a09
 
 .PHONY: xdr xdr-clean xdr-update
 
@@ -40,7 +40,7 @@ gxdr/xdr_generated.go: $(XDRS)
 	go fmt $@
 
 xdr/%.x:
-	curl -Lsf -o $@ https://raw.githubusercontent.com/stellar/stellar-xdr-next/$(XDRNEXT_COMMIT)/$(@F)
+	curl -Lsf -o $@ https://raw.githubusercontent.com/stellar/stellar-xdr/$(XDRNEXT_COMMIT)/$(@F)
 
 xdr/xdr_commit_generated.txt:
 	printf "%s" ${XDRNEXT_COMMIT} > xdr/xdr_commit_generated.txt

exp/services/soroban-rpc/internal/test/get_contract_data_test.go

@@ -145,5 +145,5 @@ func TestGetContractDataSucceeds(t *testing.T) {
 	assert.GreaterOrEqual(t, result.LatestLedger, result.LastModifiedLedger)
 	var scVal xdr.ScVal
 	assert.NoError(t, xdr.SafeUnmarshalBase64(result.XDR, &scVal))
-	assert.Equal(t, testContract, scVal.MustObj().MustContractCode().MustWasm())
+	assert.Equal(t, testContract, scVal.MustObj().MustContractCode().MustWasmId())
 }

exp/services/soroban-rpc/internal/test/simulate_transaction_test.go

@@ -23,28 +23,47 @@ var (
 	testSalt     = sha256.Sum256([]byte("a1"))
 )
 
+// createInvokeHostOperation creates a dummy InvokeHostFunctionOp. In this case by installing a contract code.
 func createInvokeHostOperation(t *testing.T, sourceAccount string, includeFootprint bool) *txnbuild.InvokeHostFunction {
-	contractNameParameterAddr := &xdr.ScObject{
-		Type: xdr.ScObjectTypeScoBytes,
-		Bin:  &testContract,
-	}
-	contractNameParameter := xdr.ScVal{
-		Type: xdr.ScValTypeScvObject,
-		Obj:  &contractNameParameterAddr,
-	}
+	return createInstallContractCodeOperation(t, sourceAccount, testContract, includeFootprint)
+}
 
-	saltySlice := testSalt[:]
-	saltParameterAddr := &xdr.ScObject{
-		Type: xdr.ScObjectTypeScoBytes,
-		Bin:  &saltySlice,
+func createInstallContractCodeOperation(t *testing.T, sourceAccount string, contractCode []byte, includeFootprint bool) *txnbuild.InvokeHostFunction {
+	var footprint xdr.LedgerFootprint
+	if includeFootprint {
+		// TODO: Check this is still right
+		ledgerKey := xdr.LedgerKeyContractData{
+			ContractId: xdr.Hash(getContractID(t, sourceAccount, testSalt)),
+			Key:        getContractCodeLedgerKey(),
+		}
+		footprint = xdr.LedgerFootprint{
+			ReadWrite: []xdr.LedgerKey{
+				{
+					Type:         xdr.LedgerEntryTypeContractData,
+					ContractData: &ledgerKey,
+				},
+			},
+		}
 	}
-	saltParameter := xdr.ScVal{
-		Type: xdr.ScValTypeScvObject,
-		Obj:  &saltParameterAddr,
+
+	return &txnbuild.InvokeHostFunction{
+		Footprint: footprint,
+		Function: xdr.HostFunction{
+			Type: xdr.HostFunctionTypeHostFunctionTypeInstallContractCode,
+			InstallContractCodeArgs: &xdr.InstallContractCodeArgs{
+				Code: contractCode,
+			},
+		},
+		SourceAccount: sourceAccount,
 	}
+}
+
+func createCreateContractOperation(t *testing.T, sourceAccount string, contractCode []byte, includeFootprint bool) *txnbuild.InvokeHostFunction {
+	saltParam := xdr.Uint256(testSalt)
 
 	var footprint xdr.LedgerFootprint
 	if includeFootprint {
+		// TODO: Check this is still right
 		ledgerKey := xdr.LedgerKeyContractData{
 			ContractId: xdr.Hash(getContractID(t, sourceAccount, testSalt)),
 			Key:        getContractCodeLedgerKey(),
@@ -59,12 +78,25 @@ func createInvokeHostOperation(t *testing.T, sourceAccount string, includeFootpr
 		}
 	}
 
+	installContractCodeArgs, err := xdr.InstallContractCodeArgs{Code: contractCode}.MarshalBinary()
+	assert.NoError(t, err)
+	contractHash := xdr.Hash(sha256.Sum256(installContractCodeArgs))
+
+	// two operations, install, then create.
 	return &txnbuild.InvokeHostFunction{
 		Footprint: footprint,
-		Function:  xdr.HostFunctionHostFnCreateContractWithSourceAccount,
-		Parameters: xdr.ScVec{
-			contractNameParameter,
-			saltParameter,
+		Function: xdr.HostFunction{
+			Type: xdr.HostFunctionTypeHostFunctionTypeCreateContract,
+			CreateContractArgs: &xdr.CreateContractArgs{
+				ContractId: xdr.ContractId{
+					Type: xdr.ContractIdTypeContractIdFromSourceAccount,
+					Salt: &saltParam,
+				},
+				Source: xdr.ScContractCode{
+					Type:   xdr.ScContractCodeTypeSccontractCodeWasmRef,
+					WasmId: &contractHash,
+				},
+			},
 		},
 		SourceAccount: sourceAccount,
 	}
@@ -106,9 +138,11 @@ func TestSimulateTransactionSucceeds(t *testing.T) {
 			Sequence:  0,
 		},
 		IncrementSequenceNum: false,
-		Operations:           []txnbuild.Operation{createInvokeHostOperation(t, sourceAccount, false)},
-		BaseFee:              txnbuild.MinBaseFee,
-		Memo:                 nil,
+		Operations: []txnbuild.Operation{
+			createInvokeHostOperation(t, sourceAccount, false),
+		},
+		BaseFee: txnbuild.MinBaseFee,
+		Memo:    nil,
 		Preconditions: txnbuild.Preconditions{
 			TimeBounds: txnbuild.NewInfiniteTimeout(),
 		},
@@ -201,7 +235,7 @@ func TestSimulateTransactionError(t *testing.T) {
 
 	sourceAccount := keypair.Root(StandaloneNetworkPassphrase).Address()
 	invokeHostOp := createInvokeHostOperation(t, sourceAccount, false)
-	invokeHostOp.Parameters = invokeHostOp.Parameters[:len(invokeHostOp.Parameters)-1]
+	invokeHostOp.Function.InstallContractCodeArgs = nil
 	tx, err := txnbuild.NewTransaction(txnbuild.TransactionParams{
 		SourceAccount: &txnbuild.SimpleAccount{
 			AccountID: keypair.Root(StandaloneNetworkPassphrase).Address(),
@@ -242,8 +276,8 @@ func TestSimulateTransactionMultipleOperations(t *testing.T) {
 		},
 		IncrementSequenceNum: false,
 		Operations: []txnbuild.Operation{
-			createInvokeHostOperation(t, sourceAccount, false),
-			createInvokeHostOperation(t, sourceAccount, false),
+			createInstallContractCodeOperation(t, sourceAccount, testContract, false),
+			createCreateContractOperation(t, sourceAccount, testContract, false),
 		},
 		BaseFee: txnbuild.MinBaseFee,
 		Memo:    nil,