txnbuild: Add support for new CAP-21 preconditions.

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)

services/friendbot/init_friendbot.go

@@ -120,7 +120,7 @@ func createMinionAccounts(botAccount internal.Account, botKeypair *keypair.Full,
 				IncrementSequenceNum: true,
 				Operations:           ops,
 				BaseFee:              txnbuild.MinBaseFee,
-				Timebounds:           txnbuild.NewTimeout(300),
+				Preconditions:        txnbuild.Preconditions{Timebounds: txnbuild.NewTimeout(300)},
 			},
 		)
 		if err != nil {

services/friendbot/internal/minion.go

@@ -117,7 +117,7 @@ func (minion *Minion) makeTx(destAddress string) (string, error) {
 			IncrementSequenceNum: true,
 			Operations:           []txnbuild.Operation{&createAccountOp},
 			BaseFee:              minion.BaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(),
+			Preconditions:        txnbuild.Preconditions{Timebounds: txnbuild.NewInfiniteTimeout()},
 		},
 	)
 	if err != nil {

services/horizon/internal/integration/negative_seq_txsub_test.go

@@ -55,7 +55,7 @@ func TestNegativeSequenceTxSubmission(t *testing.T) {
 		SourceAccount:        account,
 		Operations:           []txnbuild.Operation{&op2},
 		BaseFee:              txnbuild.MinBaseFee,
-		Timebounds:           txnbuild.NewInfiniteTimeout(),
+		Preconditions:        txnbuild.Preconditions{Timebounds: txnbuild.NewInfiniteTimeout()},
 		IncrementSequenceNum: false,
 	}
 	tx, err := txnbuild.NewTransaction(txParams)

services/horizon/internal/integration/sponsorship_test.go

@@ -311,7 +311,7 @@ func TestSponsorships(t *testing.T) {
 			SourceAccount:        newAccount,
 			Operations:           []txnbuild.Operation{preAuthOp},
 			BaseFee:              txnbuild.MinBaseFee,
-			Timebounds:           txnbuild.NewInfiniteTimeout(),
+			Preconditions:        txnbuild.Preconditions{Timebounds: txnbuild.NewInfiniteTimeout()},
 			IncrementSequenceNum: true,
 		}
 		preaAuthTx, err := txnbuild.NewTransaction(txParams)

services/horizon/internal/test/integration/integration.go

@@ -694,7 +694,7 @@ func (i *Test) CreateSignedTransaction(
 		SourceAccount:        source,
 		Operations:           ops,
 		BaseFee:              txnbuild.MinBaseFee,
-		Timebounds:           txnbuild.NewInfiniteTimeout(),
+		Preconditions:        txnbuild.Preconditions{Timebounds: txnbuild.NewInfiniteTimeout()},
 		IncrementSequenceNum: true,
 	}
 

services/regulated-assets-approval-server/internal/configureissuer/configureissuer.go

@@ -119,8 +119,8 @@ func setup(opts Options, hClient horizonclient.ClientInterface) error {
 				SourceAccount: trustorKP.Address(),
 			},
 		},
-		BaseFee:    300,
-		Timebounds: txnbuild.NewTimeout(300),
+		BaseFee:       300,
+		Preconditions: txnbuild.Preconditions{Timebounds: txnbuild.NewTimeout(300)},
 	})
 	if err != nil {
 		return errors.Wrap(err, "building transaction")