Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

services/horizon: Support new CAP-21 transaction conditions #4297

Merged
merged 22 commits into from
Mar 25, 2022
Merged

services/horizon: Support new CAP-21 transaction conditions #4297

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
d28c2ca
Add cap-21 transaction preconditions
Mar 17, 2022
cd8277a
Replace xdr.TransactionEnvelope.TimeBounds -> .Preconditions function
Mar 21, 2022
ac3fb54
Rename Signers -> ExtraSigners for more consistent naming
Mar 21, 2022
3d73d12
Store the new precondition fields in the DB
Mar 21, 2022
fc1057c
Render the new precondition fields in the resourceadapter
Mar 21, 2022
64ce98e
./gogenerate.sh
Mar 21, 2022
2b13140
use a pointer so omitempty works
Mar 21, 2022
cbe15b7
more consistent naming
Mar 21, 2022
fffacc5
Keep Timebounds helper
Mar 21, 2022
bc02876
PR feedback
Mar 22, 2022
9174f76
tidy transaction precondition helpers
Mar 22, 2022
3cdb667
typo fixes
Mar 22, 2022
b646879
remove dead param
Mar 22, 2022
3104a13
use bigint so we have enough space for a uint32
Mar 23, 2022
4574288
use text instead of varchar, to avoid future migrations
Mar 23, 2022
de9bca3
Updating scenario sqls
Mar 23, 2022
c7115b2
need to load the preconditions from the db
Mar 24, 2022
4e61c0f
Temporary passing data for v2 preconditions transaction insertion test
Mar 25, 2022
4248a0c
Update xdr/transaction_envelope_test.go
Mar 25, 2022
a400725
Update services/horizon/internal/db2/history/transaction_ledger_bound…
Mar 25, 2022
7290be4
PR feedback
Mar 25, 2022
b7807a2
Merge remote-tracking branch 'origin/horizon-protocol-19' into update…
Mar 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Temporary passing data for v2 preconditions transaction insertion test
  • Loading branch information
Paul Bellamy committed Mar 25, 2022
commit 4e61c0fac7383db5cee325f48742e2c956083397
36 changes: 20 additions & 16 deletions services/horizon/internal/db2/history/transaction_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,8 @@ func TestInsertTransaction(t *testing.T) {
timeBoundWithMin := TimeBounds{Lower: null.IntFrom(1576195867)}
timeBoundWithMax := TimeBounds{Lower: null.IntFrom(0), Upper: null.IntFrom(1576195867)}
timeboundsWithMinAndMax := TimeBounds{Lower: null.IntFrom(1576095867), Upper: null.IntFrom(1576195867)}
ledgerboundsWithMinAndMax := LedgerBounds{MinLedger: null.IntFrom(123456), MaxLedger: null.IntFrom(1234567)}
v2TimeboundsWithMinAndMax := TimeBounds{Lower: null.IntFrom(0), Upper: null.IntFrom(1648153609)}
v2LedgerboundsWithMinAndMax := LedgerBounds{MinLedger: null.IntFrom(0), MaxLedger: null.IntFrom(1)}

withMultipleSignatures := []string{
"MID8kIOLP/yEymCyhU7A/YeVpnVTDzAqszWtv8c+/qAw542BaKWxCJxl/jsggY0mF+SR8X0bvWXvPBgyYcDZDw==",
Expand Down Expand Up @@ -742,39 +743,42 @@ func TestInsertTransaction(t *testing.T) {
{
"transaction with v2 preconditions",
buildLedgerTransaction(tt.T, testTransaction{
index: 1,
envelopeXDR: "AAAAAgAAAAEAAAAAAAAAGwAAAAAAAAAqAAAAAQAAABsAAAAqAAAAAQAAAAAAAAAOAAAAAAAAABsAAAAqAAAAAQAAAAAdBJqAD9qPq+j2nRDdjdp5KVoUh8riPkNO9ato7BNs8w==",
resultXDR: "AAAAAAAAASwAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAFAAAAAAAAAAA=",
index: 1,
envelopeXDR: "AAAAAgAAAADg3G3hclysZlFitS+s5zWyiiJD5B0STWy5LXCj6i5yxQAAAGQAAAAAAAAAAQAAAAIAAAABAAAAAAAAAAAAAAAAYjzUCQAAAAEAAAAAAAAAAQAAAAAAAAAAAAAACgAAAAIAAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAA=",
// Real values pending core accepting these txns
resultXDR: "AAAAAAAAASwAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAFAAAAAAAAAAA=",
// Real values pending core accepting these txns
feeChangesXDR: "AAAAAA==",
metaXDR: "AAAAAQAAAAAAAAAA",
hash: "7aa3419a833fb14e312ae47a98e565f668a72f23c39e0cf79f598d3d3e793b2d",
// Real values pending core accepting these txns
metaXDR: "AAAAAQAAAAAAAAAA",
hash: "7ad89c184dd2aa17f9f96105f9508521b52bb36f74cf57d5ffd6f7205a737764",
}),
Transaction{
LedgerCloseTime: ledger.ClosedAt,
TransactionWithoutLedger: TransactionWithoutLedger{
TotalOrderID: TotalOrderID{528280981504},
TransactionHash: "7aa3419a833fb14e312ae47a98e565f668a72f23c39e0cf79f598d3d3e793b2d",
TransactionHash: "7ad89c184dd2aa17f9f96105f9508521b52bb36f74cf57d5ffd6f7205a737764",
LedgerSequence: ledger.Sequence,
ApplicationOrder: 1,
Account: "GAUJETIZVEP2NRYLUESJ3LS66NVCEGMON4UDCBCSBEVPIID773P2W6AY",
AccountSequence: "123456",
Account: "GDQNY3PBOJOKYZSRMK2S7LHHGWZIUISD4QORETLMXEWXBI7KFZZMKTL3",
AccountSequence: "1",
MaxFee: 100,
FeeCharged: 300,
OperationCount: 1,
TxEnvelope: "AAAAACiSTRmpH6bHC6Ekna5e82oiGY5vKDEEUgkq9CB//t+rAAAAZAAAAAAAAeJAAAAAAQAAAABd8VB7AAAAAF3y1xsAAAAAAAAAAQAAAAAAAAALAAAAAAAS1ocAAAAAAAAAAA==",
TxEnvelope: "AAAAAgAAAADg3G3hclysZlFitS+s5zWyiiJD5B0STWy5LXCj6i5yxQAAAGQAAAAAAAAAAQAAAAIAAAABAAAAAAAAAAAAAAAAYjzUCQAAAAEAAAAAAAAAAQAAAAAAAAAAAAAACgAAAAIAAAAAAAAAAAAAAAEAAAAAAAAACwAAAAAAAAAAAAAAAAAAAAA=",
TxResult: "AAAAAAAAASwAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAFAAAAAAAAAAA=",
TxFeeMeta: "AAAAAA==",
TxMeta: "AAAAAQAAAAAAAAAA",
Signatures: emptySignatures,
InnerSignatures: nullSignatures,
MemoType: "none",
Memo: null.NewString("", false),
TimeBounds: timeboundsWithMinAndMax,
LedgerBounds: ledgerboundsWithMinAndMax,
MinAccountSequence: null.IntFrom(123456),
MinAccountSequenceAge: null.IntFrom(1),
MinAccountSequenceLedgerGap: null.IntFrom(1),
ExtraSigners: pq.StringArray{"???"},
TimeBounds: v2TimeboundsWithMinAndMax,
LedgerBounds: v2LedgerboundsWithMinAndMax,
MinAccountSequence: null.Int{},
MinAccountSequenceAge: null.IntFrom(10),
MinAccountSequenceLedgerGap: null.IntFrom(2),
ExtraSigners: pq.StringArray{},
Successful: success,
},
},
Expand Down