Replace result XDR with fee_charged, result_code and is_fee_bump

internal/data/accounts_test.go

@@ -259,7 +259,7 @@ func TestAccountModelBatchGetByTxHashes(t *testing.T) {
 	require.NoError(t, err)
 
 	// Insert test transactions first
-	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at) VALUES ($1, 1, 'env1', 'res1', 'meta1', 1, NOW()), ($2, 2, 'env2', 'res2', 'meta2', 2, NOW())", txHash1, txHash2)
+	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at) VALUES ($1, 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, NOW()), ($2, 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, NOW())", txHash1, txHash2)
 	require.NoError(t, err)
 
 	// Insert test transactions_accounts links
@@ -309,7 +309,7 @@ func TestAccountModelBatchGetByOperationIDs(t *testing.T) {
 	require.NoError(t, err)
 
 	// Insert test transactions first
-	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at) VALUES ('tx1', 1, 'env1', 'res1', 'meta1', 1, NOW()), ('tx2', 2, 'env2', 'res2', 'meta2', 2, NOW())")
+	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at) VALUES ('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, NOW()), ('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, NOW())")
 	require.NoError(t, err)
 
 	// Insert test operations first
@@ -400,7 +400,7 @@ func TestAccountModelBatchGetByStateChangeIDs(t *testing.T) {
 	require.NoError(t, err)
 
 	// Insert test transactions first
-	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at) VALUES ('tx1', 1, 'env1', 'res1', 'meta1', 1, NOW()), ('tx2', 2, 'env2', 'res2', 'meta2', 2, NOW())")
+	_, err = m.DB.ExecContext(ctx, "INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at) VALUES ('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, NOW()), ('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, NOW())")
 	require.NoError(t, err)
 
 	// Insert test operations first

internal/data/ingest_store_test.go

@@ -231,8 +231,8 @@ func Test_IngestStoreModel_GetLedgerGaps(t *testing.T) {
 				// Insert consecutive ledgers: 100, 101, 102
 				for i, ledger := range []uint32{100, 101, 102} {
 					_, err := dbConnectionPool.ExecContext(ctx,
-						`INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-						VALUES ($1, $2, 'env', 'res', 'meta', $3, NOW())`,
+						`INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at)
+						VALUES ($1, $2, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', $3, NOW())`,
 						fmt.Sprintf("hash%d", i), i+1, ledger)
 					require.NoError(t, err)
 				}
@@ -245,8 +245,8 @@ func Test_IngestStoreModel_GetLedgerGaps(t *testing.T) {
 				// Insert ledgers 100 and 105, creating gap 101-104
 				for i, ledger := range []uint32{100, 105} {
 					_, err := dbConnectionPool.ExecContext(ctx,
-						`INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-						VALUES ($1, $2, 'env', 'res', 'meta', $3, NOW())`,
+						`INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at)
+						VALUES ($1, $2, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', $3, NOW())`,
 						fmt.Sprintf("hash%d", i), i+1, ledger)
 					require.NoError(t, err)
 				}
@@ -261,8 +261,8 @@ func Test_IngestStoreModel_GetLedgerGaps(t *testing.T) {
 				// Insert ledgers 100, 105, 110, creating gaps 101-104 and 106-109
 				for i, ledger := range []uint32{100, 105, 110} {
 					_, err := dbConnectionPool.ExecContext(ctx,
-						`INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-						VALUES ($1, $2, 'env', 'res', 'meta', $3, NOW())`,
+						`INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at)
+						VALUES ($1, $2, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', $3, NOW())`,
 						fmt.Sprintf("hash%d", i), i+1, ledger)
 					require.NoError(t, err)
 				}
@@ -278,8 +278,8 @@ func Test_IngestStoreModel_GetLedgerGaps(t *testing.T) {
 				// Insert ledgers 100 and 102, creating gap of just 101
 				for i, ledger := range []uint32{100, 102} {
 					_, err := dbConnectionPool.ExecContext(ctx,
-						`INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-						VALUES ($1, $2, 'env', 'res', 'meta', $3, NOW())`,
+						`INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at)
+						VALUES ($1, $2, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', $3, NOW())`,
 						fmt.Sprintf("hash%d", i), i+1, ledger)
 					require.NoError(t, err)
 				}

internal/data/operations_test.go

@@ -68,19 +68,23 @@ func Test_OperationModel_BatchInsert(t *testing.T) {
 		Hash:            "tx1",
 		ToID:            1,
 		EnvelopeXDR:     &envelope1,
-		ResultXDR:       "result1",
+		FeeCharged:      100,
+		ResultCode:      "TransactionResultCodeTxSuccess",
 		MetaXDR:         &meta1,
 		LedgerNumber:    1,
 		LedgerCreatedAt: now,
+		IsFeeBump:       false,
 	}
 	tx2 := types.Transaction{
 		Hash:            "tx2",
 		ToID:            2,
 		EnvelopeXDR:     &envelope2,
-		ResultXDR:       "result2",
+		FeeCharged:      200,
+		ResultCode:      "TransactionResultCodeTxSuccess",
 		MetaXDR:         &meta2,
 		LedgerNumber:    2,
 		LedgerCreatedAt: now,
+		IsFeeBump:       true,
 	}
 
 	// Insert transactions
@@ -251,19 +255,23 @@ func Test_OperationModel_BatchCopy(t *testing.T) {
 		Hash:            "tx1",
 		ToID:            1,
 		EnvelopeXDR:     &envelope1,
-		ResultXDR:       "result1",
+		FeeCharged:      100,
+		ResultCode:      "TransactionResultCodeTxSuccess",
 		MetaXDR:         &meta1,
 		LedgerNumber:    1,
 		LedgerCreatedAt: now,
+		IsFeeBump:       false,
 	}
 	tx2 := types.Transaction{
 		Hash:            "tx2",
 		ToID:            2,
 		EnvelopeXDR:     &envelope2,
-		ResultXDR:       "result2",
+		FeeCharged:      200,
+		ResultCode:      "TransactionResultCodeTxSuccess",
 		MetaXDR:         &meta2,
 		LedgerNumber:    2,
 		LedgerCreatedAt: now,
+		IsFeeBump:       true,
 	}
 
 	// Insert transactions
@@ -417,8 +425,8 @@ func Test_OperationModel_BatchCopy_DuplicateFails(t *testing.T) {
 
 	// Create a parent transaction that the operation will reference
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES ('tx_for_dup_test', 1, 'env', 'res', 'meta', 1, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES ('tx_for_dup_test', 1, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', 1, $1, false)
 	`, now)
 	require.NoError(t, err)
 
@@ -498,18 +506,18 @@ func TestOperationModel_GetAll(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1),
-			('tx3', 3, 'env3', 'res3', 'meta3', 3, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true),
+			('tx3', 3, 'env3', 300, 'TransactionResultCodeTxSuccess', 'meta3', 3, $1, false)
 	`, now)
 	require.NoError(t, err)
 
 	// Create test operations
 	_, err = dbConnectionPool.ExecContext(ctx, `
 		INSERT INTO operations (id, tx_hash, operation_type, operation_xdr, ledger_number, ledger_created_at)
-		VALUES 
+		VALUES
 			(1, 'tx1', 'payment', 'xdr1', 1, $1),
 			(2, 'tx2', 'create_account', 'xdr2', 2, $1),
 			(3, 'tx3', 'payment', 'xdr3', 3, $1)
@@ -545,11 +553,11 @@ func TestOperationModel_BatchGetByTxHashes(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1),
-			('tx3', 3, 'env3', 'res3', 'meta3', 3, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true),
+			('tx3', 3, 'env3', 300, 'TransactionResultCodeTxSuccess', 'meta3', 3, $1, false)
 	`, now)
 	require.NoError(t, err)
 
@@ -733,17 +741,17 @@ func TestOperationModel_BatchGetByTxHash(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true)
 	`, now)
 	require.NoError(t, err)
 
 	// Create test operations
 	_, err = dbConnectionPool.ExecContext(ctx, `
 		INSERT INTO operations (id, tx_hash, operation_type, operation_xdr, ledger_number, ledger_created_at)
-		VALUES 
+		VALUES
 			(1, 'tx1', 'payment', 'xdr1', 1, $1),
 			(2, 'tx2', 'create_account', 'xdr2', 2, $1),
 			(3, 'tx1', 'payment', 'xdr3', 3, $1)
@@ -786,18 +794,18 @@ func TestOperationModel_BatchGetByAccountAddresses(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1),
-			('tx3', 3, 'env3', 'res3', 'meta3', 3, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true),
+			('tx3', 3, 'env3', 300, 'TransactionResultCodeTxSuccess', 'meta3', 3, $1, false)
 	`, now)
 	require.NoError(t, err)
 
 	// Create test operations
 	_, err = dbConnectionPool.ExecContext(ctx, `
 		INSERT INTO operations (id, tx_hash, operation_type, operation_xdr, ledger_number, ledger_created_at)
-		VALUES 
+		VALUES
 			(1, 'tx1', 'payment', 'xdr1', 1, $1),
 			(2, 'tx2', 'create_account', 'xdr2', 2, $1),
 			(3, 'tx3', 'payment', 'xdr3', 3, $1)
@@ -834,17 +842,17 @@ func TestOperationModel_GetByID(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true)
 	`, now)
 	require.NoError(t, err)
 
 	// Create test operations
 	_, err = dbConnectionPool.ExecContext(ctx, `
 		INSERT INTO operations (id, tx_hash, operation_type, operation_xdr, ledger_number, ledger_created_at)
-		VALUES 
+		VALUES
 			(1, 'tx1', 'payment', 'xdr1', 1, $1),
 			(2, 'tx2', 'create_account', 'xdr2', 2, $1)
 	`, now)
@@ -897,18 +905,18 @@ func TestOperationModel_BatchGetByStateChangeIDs(t *testing.T) {
 
 	// Create test transactions first
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES 
-			('tx1', 1, 'env1', 'res1', 'meta1', 1, $1),
-			('tx2', 2, 'env2', 'res2', 'meta2', 2, $1),
-			('tx3', 3, 'env3', 'res3', 'meta3', 3, $1)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES
+			('tx1', 1, 'env1', 100, 'TransactionResultCodeTxSuccess', 'meta1', 1, $1, false),
+			('tx2', 2, 'env2', 200, 'TransactionResultCodeTxSuccess', 'meta2', 2, $1, true),
+			('tx3', 3, 'env3', 300, 'TransactionResultCodeTxSuccess', 'meta3', 3, $1, false)
 	`, now)
 	require.NoError(t, err)
 
 	// Create test operations
 	_, err = dbConnectionPool.ExecContext(ctx, `
 		INSERT INTO operations (id, tx_hash, operation_type, operation_xdr, ledger_number, ledger_created_at)
-		VALUES 
+		VALUES
 			(1, 'tx1', 'payment', 'xdr1', 1, $1),
 			(2, 'tx2', 'create_account', 'xdr2', 2, $1),
 			(3, 'tx3', 'payment', 'xdr3', 3, $1)
@@ -965,8 +973,8 @@ func BenchmarkOperationModel_BatchInsert(b *testing.B) {
 	const txHash = "benchmark_tx_hash"
 	now := time.Now()
 	_, err = dbConnectionPool.ExecContext(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES ($1, 1, 'env', 'res', 'meta', 1, $2)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES ($1, 1, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', 1, $2, false)
 	`, txHash, now)
 	if err != nil {
 		b.Fatalf("failed to create parent transaction: %v", err)
@@ -1029,8 +1037,8 @@ func BenchmarkOperationModel_BatchCopy(b *testing.B) {
 	const txHash = "benchmark_tx_hash"
 	now := time.Now()
 	_, err = conn.Exec(ctx, `
-		INSERT INTO transactions (hash, to_id, envelope_xdr, result_xdr, meta_xdr, ledger_number, ledger_created_at)
-		VALUES ($1, 1, 'env', 'res', 'meta', 1, $2)
+		INSERT INTO transactions (hash, to_id, envelope_xdr, fee_charged, result_code, meta_xdr, ledger_number, ledger_created_at, is_fee_bump)
+		VALUES ($1, 1, 'env', 100, 'TransactionResultCodeTxSuccess', 'meta', 1, $2, false)
 	`, txHash, now)
 	if err != nil {
 		b.Fatalf("failed to create parent transaction: %v", err)