Merge pull request #5706 from stellar/karthik/2023-0-21/merge-master-into-p23

Merge `master` into `protocol-23` feature branch

Author: karthikiyer56

.github/workflows/horizon.yml

@@ -123,7 +123,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       GO_VERSION: 1.23.4
-      STELLAR_CORE_VERSION: 22.1.1-2291.a50f3f919.jammy~do~not~use~in~prd
+      STELLAR_CORE_VERSION: 23.0.0.1-2488.23.0.0rc.1.472e3e69d.jammy
       CAPTIVE_CORE_STORAGE_PATH: /tmp
     steps:
       - uses: actions/checkout@v3

ingest/asset/asset.go asset/asset.goingest/asset/asset.go renamed to asset/asset.go

@@ -270,13 +270,7 @@ func (t *LedgerTransaction) FeeCharged() (int64, bool) {
 	_, ok = t.GetSorobanData()
 	if ok {
 		if uint32(t.Ledger.LedgerHeaderHistoryEntry().Header.LedgerVersion) < 21 && t.Envelope.Type == xdr.EnvelopeTypeEnvelopeTypeTxFeeBump {
-			var resourceFeeRefund int64
-
-			resourceFeeRefund, ok = t.SorobanResourceFeeRefund()
-			if !ok {
-				return 0, false
-			}
-
+			resourceFeeRefund := t.SorobanResourceFeeRefund()
 			return int64(t.Result.Result.FeeCharged) - resourceFeeRefund, true
 		}
 	}
@@ -395,6 +389,11 @@ func (t *LedgerTransaction) GetSorobanData() (xdr.SorobanTransactionData, bool)
 	}
 }
 
+func (t *LedgerTransaction) IsSorobanTx() bool {
+	_, res := t.GetSorobanData()
+	return res
+}
+
 func (t *LedgerTransaction) SorobanResourceFee() (int64, bool) {
 	sorobanData, ok := t.GetSorobanData()
 	if !ok {
@@ -547,21 +546,23 @@ func getAccountBalanceFromLedgerEntryChanges(changes xdr.LedgerEntryChanges, sou
 	return accountBalanceStart, accountBalanceEnd
 }
 
-func (t *LedgerTransaction) SorobanResourceFeeRefund() (int64, bool) {
-	meta, ok := t.UnsafeMeta.GetV3()
-	if !ok {
-		return 0, false
+func (t *LedgerTransaction) OriginalFeeCharged() int64 {
+	startingBal, endingBal := getAccountBalanceFromLedgerEntryChanges(t.FeeChanges, t.FeeAccount().ToAccountId().Address())
+	if endingBal > startingBal {
+		panic("Invalid Fee")
 	}
+	return startingBal - endingBal
+}
 
-	feeAccountAddress, ok := t.FeeAccountAddress()
-	if !ok {
-		return 0, false
+func (t *LedgerTransaction) SorobanResourceFeeRefund() int64 {
+	if !t.IsSorobanTx() {
+		return 0
 	}
-
-	accountBalanceStart, accountBalanceEnd := getAccountBalanceFromLedgerEntryChanges(meta.TxChangesAfter, feeAccountAddress)
-
-	return accountBalanceEnd - accountBalanceStart, true
-
+	startingBal, endingBal := getAccountBalanceFromLedgerEntryChanges(t.UnsafeMeta.MustV3().TxChangesAfter, t.FeeAccount().ToAccountId().Address())
+	if startingBal > endingBal {
+		panic("Invalid Soroban Resource Refund")
+	}
+	return endingBal - startingBal
 }
 
 func (t *LedgerTransaction) SorobanTotalNonRefundableResourceFeeCharged() (int64, bool) {

ingest/asset/asset.pb.go asset/asset.pb.goingest/asset/asset.pb.go renamed to asset/asset.pb.go

@@ -897,8 +897,7 @@ func TestTransactionHelperFunctions(t *testing.T) {
 	assert.Equal(t, int64(-1234), inclusionFee)
 
 	var sorobanResourceFeeRefund int64
-	sorobanResourceFeeRefund, ok = transaction.SorobanResourceFeeRefund()
-	assert.Equal(t, true, ok)
+	sorobanResourceFeeRefund = transaction.SorobanResourceFeeRefund()
 	assert.Equal(t, int64(0), sorobanResourceFeeRefund)
 
 	var sorobanTotalNonRefundableResourceFeeCharged int64

ingest/asset/asset_test.go asset/asset_test.goingest/asset/asset_test.go renamed to asset/asset_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/stellar/go/ingest/processors/token_transfer"
 	"github.com/stellar/go/network"
+	"github.com/stellar/go/processors/token_transfer"
 	"github.com/stellar/go/support/log"
 	"github.com/stellar/go/xdr"
 	"google.golang.org/protobuf/encoding/protojson"

ingest/ledger_transaction.go

@@ -7,7 +7,7 @@ import (
 	"github.com/guregu/null"
 	"github.com/guregu/null/zero"
 	"github.com/stellar/go/ingest"
-	utils "github.com/stellar/go/ingest/processors/processor_utils"
+	"github.com/stellar/go/processors/utils"
 	"github.com/stellar/go/xdr"
 )
 

ingest/ledger_transaction_test.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/guregu/null"
 	"github.com/stellar/go/ingest"
-	utils "github.com/stellar/go/ingest/processors/processor_utils"
+	"github.com/stellar/go/processors/utils"
 	"github.com/stellar/go/xdr"
 )