Merge branch 'master' into release-protocol-26

Author: hunterpack

internal/transform/schema.go

@@ -60,7 +60,7 @@ type TransactionOutput struct {
 	FeeAccount                           string         `json:"fee_account,omitempty"`
 	FeeAccountMuxed                      string         `json:"fee_account_muxed,omitempty"`
 	InnerTransactionHash                 string         `json:"inner_transaction_hash,omitempty"`
-	NewMaxFee                            uint32         `json:"new_max_fee,omitempty"`
+	NewMaxFee                            int64          `json:"new_max_fee,omitempty"`
 	LedgerBounds                         string         `json:"ledger_bounds"`
 	MinAccountSequence                   null.Int       `json:"min_account_sequence"`
 	MinAccountSequenceAge                null.Int       `json:"min_account_sequence_age"`

internal/transform/schema_parquet.go

@@ -51,7 +51,7 @@ type TransactionOutputParquet struct {
 	FeeAccount                           string   `parquet:"name=fee_account, type=BYTE_ARRAY, convertedtype=UTF8, encoding=PLAIN_DICTIONARY"`
 	FeeAccountMuxed                      string   `parquet:"name=fee_account_muxed, type=BYTE_ARRAY, convertedtype=UTF8, encoding=PLAIN_DICTIONARY"`
 	InnerTransactionHash                 string   `parquet:"name=inner_transaction_hash, type=BYTE_ARRAY, convertedtype=UTF8, encoding=PLAIN_DICTIONARY"`
-	NewMaxFee                            int64    `parquet:"name=new_max_fee, type=INT64, convertedtype=UINT_64"`
+	NewMaxFee                            int64    `parquet:"name=new_max_fee, type=INT64"`
 	LedgerBounds                         string   `parquet:"name=ledger_bounds, type=BYTE_ARRAY, convertedtype=UTF8, encoding=PLAIN_DICTIONARY"`
 	MinAccountSequence                   int64    `parquet:"name=min_account_sequence, type=INT64"`
 	MinAccountSequenceAge                int64    `parquet:"name=min_account_sequence_age, type=INT64"`

internal/transform/transaction.go

@@ -291,7 +291,7 @@ func TransformTransaction(transaction ingest.LedgerTransaction, lhe xdr.LedgerHe
 		transformedTransaction.FeeAccount = feeAccount.Address()
 		innerHash := transaction.Result.InnerHash()
 		transformedTransaction.InnerTransactionHash = hex.EncodeToString(innerHash[:])
-		transformedTransaction.NewMaxFee = uint32(transaction.Envelope.FeeBumpFee())
+		transformedTransaction.NewMaxFee = int64(transaction.Envelope.FeeBumpFee())
 		txSigners, err := getTxSigners(transaction.Envelope.FeeBump.Signatures)
 		if err != nil {
 			return TransactionOutput{}, err