all: Merge Horizon's Protocol 19 implementation into master

.github/workflows/horizon.yml

@@ -15,7 +15,7 @@ jobs:
         go: [1.17, 1.18]
         pg: [9.6.5]
         ingestion-backend: [db, captive-core, captive-core-remote-storage]
-        captive-core: [18.5.0-873.rc1.d387c6a71.focal]
+        protocol-version: [18, 19]
     runs-on: ${{ matrix.os }}
     services:
       postgres:
@@ -32,7 +32,12 @@ jobs:
         ports:
         - 5432:5432
     env:
-      HORIZON_INTEGRATION_TESTS: "true"
+      HORIZON_INTEGRATION_TESTS_ENABLED: true
+      HORIZON_INTEGRATION_TESTS_CORE_MAX_SUPPORTED_PROTOCOL: ${{ matrix.protocol-version }}
+      PROTOCOL_19_CORE_DEBIAN_PKG_VERSION: 18.4.1-875.95d896a49.focal~v19unsafe
+      PROTOCOL_19_CORE_DOCKER_IMG: stellar/stellar-core:18.4.1-875.95d896a49.focal-v19unsafe
+      PROTOCOL_18_CORE_DEBIAN_PKG_VERSION: 18.5.0-873.rc1.d387c6a71.focal
+      PROTOCOL_18_CORE_DOCKER_IMG: stellar/stellar-core:18.5.0-873.rc1.d387c6a71.focal
       PGHOST: localhost
       PGPORT: 5432
       PGUSER: postgres
@@ -61,8 +66,11 @@ jobs:
       with:
         go-version: ${{ matrix.go }}
 
-    - name: Pull latest Stellar Core image
-      run: docker pull stellar/stellar-core
+    - name: Pull and set Stellar Core image
+      shell: bash
+      run: |
+        docker pull "$PROTOCOL_${{ matrix.protocol-version }}_CORE_DOCKER_IMG"
+        echo HORIZON_INTEGRATION_TESTS_DOCKER_IMG="$PROTOCOL_${{ matrix.protocol-version }}_CORE_DOCKER_IMG" >> $GITHUB_ENV
 
     - if: ${{ startsWith(matrix.ingestion-backend, 'captive-core') }}
       name: Install and enable Captive Core
@@ -74,14 +82,14 @@ jobs:
 
         sudo wget -qO - https://apt.stellar.org/SDF.asc | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=true sudo apt-key add -
         sudo bash -c 'echo "deb https://apt.stellar.org focal unstable" > /etc/apt/sources.list.d/SDF-unstable.list'
-        sudo apt-get update && sudo apt-get install -y stellar-core=${{ matrix.captive-core }}
+        sudo apt-get update && sudo apt-get install -y stellar-core="$PROTOCOL_${{ matrix.protocol-version }}_CORE_DEBIAN_PKG_VERSION"
         echo "Using stellar core version $(stellar-core version)"
-        echo 'HORIZON_INTEGRATION_ENABLE_CAPTIVE_CORE=true' >> $GITHUB_ENV
-        echo 'CAPTIVE_CORE_BIN=/usr/bin/stellar-core'       >> $GITHUB_ENV
+        echo 'HORIZON_INTEGRATION_TESTS_ENABLE_CAPTIVE_CORE=true' >> $GITHUB_ENV
+        echo 'HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_BIN=/usr/bin/stellar-core' >> $GITHUB_ENV
 
     - if: ${{ matrix.ingestion-backend == 'captive-core-remote-storage' }}
       name: Setup Captive Core Remote Storage
-      run: echo 'HORIZON_INTEGRATION_ENABLE_CAPTIVE_CORE_USE_DB=true' >> $GITHUB_ENV
+      run: echo 'HORIZON_INTEGRATION_TESTS_CAPTIVE_CORE_USE_DB=true' >> $GITHUB_ENV
 
     - run: go test -race -timeout 25m -v ./services/horizon/internal/integration/...
 

clients/horizonclient/client.go

@@ -653,10 +653,10 @@ func (c *Client) StreamOrderBooks(ctx context.Context, request OrderBookRequest,
 // It defaults to localtime when the server time is not available.
 // Note that this will generate your timebounds when you init the transaction, not when you build or submit
 // the transaction! So give yourself enough time to get the transaction built and signed before submitting.
-func (c *Client) FetchTimebounds(seconds int64) (txnbuild.Timebounds, error) {
+func (c *Client) FetchTimebounds(seconds int64) (txnbuild.TimeBounds, error) {
 	serverURL, err := url.Parse(c.HorizonURL)
 	if err != nil {
-		return txnbuild.Timebounds{}, errors.Wrap(err, "unable to parse horizon url")
+		return txnbuild.TimeBounds{}, errors.Wrap(err, "unable to parse horizon url")
 	}
 	currentTime := currentServerTime(serverURL.Hostname(), c.clock.Now().UTC().Unix())
 	if currentTime != 0 {

clients/horizonclient/examples_test.go

@@ -1100,7 +1100,7 @@ func ExampleClient_SubmitFeeBumpTransaction() {
 			IncrementSequenceNum: false,
 			Operations:           []txnbuild.Operation{&op},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(), // Use a real timeout in production!
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewInfiniteTimeout()}, // Use a real timeout in production!
 		},
 	)
 	if err != nil {
@@ -1154,7 +1154,7 @@ func ExampleClient_SubmitFeeBumpTransactionWithOptions() {
 			IncrementSequenceNum: false,
 			Operations:           []txnbuild.Operation{&op},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(), // Use a real timeout in production!
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewInfiniteTimeout()}, // Use a real timeout in production!
 		},
 	)
 	if err != nil {
@@ -1211,7 +1211,7 @@ func ExampleClient_SubmitTransaction() {
 			IncrementSequenceNum: false,
 			Operations:           []txnbuild.Operation{&op},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(), // Use a real timeout in production!
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewInfiniteTimeout()}, // Use a real timeout in production!
 		},
 	)
 	if err != nil {
@@ -1253,7 +1253,7 @@ func ExampleClient_SubmitTransactionWithOptions() {
 			IncrementSequenceNum: false,
 			Operations:           []txnbuild.Operation{&op},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(), // Use a real timeout in production!
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewInfiniteTimeout()}, // Use a real timeout in production!
 		},
 	)
 	if err != nil {
@@ -1295,7 +1295,7 @@ func ExampleClient_SubmitTransactionWithOptions_skip_memo_required_check() {
 			IncrementSequenceNum: false,
 			Operations:           []txnbuild.Operation{&op},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(), // Use a real timeout in production!
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewInfiniteTimeout()}, // Use a real timeout in production!
 		},
 	)
 	if err != nil {

clients/horizonclient/main_test.go

@@ -146,7 +146,7 @@ func TestCheckMemoRequired(t *testing.T) {
 					IncrementSequenceNum: true,
 					Operations:           tc.operations,
 					BaseFee:              txnbuild.MinBaseFee,
-					Timebounds:           txnbuild.NewTimebounds(0, 10),
+					Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 				},
 			)
 			tt.NoError(err)
@@ -878,7 +878,7 @@ func TestSubmitTransactionRequest(t *testing.T) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -946,7 +946,7 @@ func TestSubmitTransactionRequestMuxedAccounts(t *testing.T) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1006,7 +1006,7 @@ func TestSubmitFeeBumpTransaction(t *testing.T) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1075,7 +1075,7 @@ func TestSubmitTransactionWithOptionsRequest(t *testing.T) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1168,7 +1168,7 @@ func TestSubmitTransactionWithOptionsRequest(t *testing.T) {
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
 			Memo:                 txnbuild.MemoText("HelloWorld"),
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1202,7 +1202,7 @@ func TestSubmitFeeBumpTransactionWithOptions(t *testing.T) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1293,7 +1293,7 @@ func TestSubmitFeeBumpTransactionWithOptions(t *testing.T) {
 			Operations:           []txnbuild.Operation{&payment},
 			BaseFee:              txnbuild.MinBaseFee,
 			Memo:                 txnbuild.MemoText("HelloWorld"),
-			Timebounds:           txnbuild.NewTimebounds(0, 10),
+			Preconditions:        txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 10)},
 		},
 	)
 	assert.NoError(t, err)
@@ -1483,7 +1483,7 @@ func TestFetchTimebounds(t *testing.T) {
 	ServerTimeMap["localhost"] = newRecord
 	st, err = client.FetchTimebounds(100)
 	assert.NoError(t, err)
-	assert.IsType(t, st, txnbuild.Timebounds{})
+	assert.IsType(t, st, txnbuild.TimeBounds{})
 	assert.Equal(t, st.MinTime, int64(0))
 	// time should be 200, serverTime + 100seconds
 	assert.Equal(t, st.MaxTime, int64(200))

exp/services/recoverysigner/internal/serve/account_sign_signing_address_test.go

@@ -349,8 +349,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedButSigningAddressInvalid(
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -411,8 +411,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedOtherSignerSelected(t *te
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -477,8 +477,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedTxSourceAccountValid(t *t
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -544,8 +544,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedTxAndOpSourceAccountValid
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -610,8 +610,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedTxSourceAccountInvalid(t
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -673,8 +673,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedOpSourceAccountInvalid(t
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -737,8 +737,8 @@ func TestAccountSign_signingAddressAccountAuthenticatedTxAndOpSourceAccountInval
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -806,8 +806,8 @@ func TestAccountSign_signingAddressPhoneNumberOwnerAuthenticated(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -878,8 +878,8 @@ func TestAccountSign_signingAddressPhoneNumberOtherAuthenticated(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -950,8 +950,8 @@ func TestAccountSign_signingAddressEmailOwnerAuthenticated(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -1031,8 +1031,8 @@ func TestAccountSign_signingAddressEmailOwnerAuthenticatedOpSourceAccountIsAllow
 				},
 				&txnbuild.EndSponsoringFutureReserves{},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -1108,8 +1108,8 @@ func TestAccountSign_signingAddressEmailOwnerAuthenticatedOpSourceAccountInvalid
 				},
 				&txnbuild.EndSponsoringFutureReserves{},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -1175,8 +1175,8 @@ func TestAccountSign_signingAddressEmailOtherAuthenticated(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -1281,8 +1281,8 @@ func TestAccountSign_signingAddressRejectsFeeBumpTx(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)
@@ -1351,8 +1351,8 @@ func TestAccountSign_signingAddressValidContentTypeForm(t *testing.T) {
 					},
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Timebounds: txnbuild.NewTimebounds(0, 1),
+			BaseFee:       txnbuild.MinBaseFee,
+			Preconditions: txnbuild.Preconditions{TimeBounds: txnbuild.NewTimebounds(0, 1)},
 		},
 	)
 	require.NoError(t, err)

exp/services/webauth/internal/serve/token_test.go

@@ -1136,9 +1136,11 @@ func TestToken_jsonInputNoWebAuthDomainSuccess(t *testing.T) {
 					Value:         []byte("ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg"),
 				},
 			},
-			BaseFee:    txnbuild.MinBaseFee,
-			Memo:       nil,
-			Timebounds: txnbuild.NewTimebounds(txMinTimebounds, txMaxTimebounds),
+			BaseFee: txnbuild.MinBaseFee,
+			Memo:    nil,
+			Preconditions: txnbuild.Preconditions{
+				TimeBounds: txnbuild.NewTimebounds(txMinTimebounds, txMaxTimebounds),
+			},
 		},
 	)
 	require.NoError(t, err)