Token Transfer Processor - Derive classic events from operation and operation results

amount/main.go

@@ -133,6 +133,15 @@ func String128(v xdr.Int128Parts) string {
 	return rat.FloatString(7)
 }
 
+func String128Raw(v xdr.Int128Parts) string {
+	// the upper half of the i128 always indicates its sign regardless of its
+	// value, just like a native signed type
+	val := big.NewInt(int64(v.Hi))
+	val.Lsh(val, 64).Add(val, new(big.Int).SetUint64(uint64(v.Lo)))
+
+	return val.String()
+}
+
 // StringFromInt64 returns an "amount string" from the provided raw int64 value `v`.
 func StringFromInt64(v int64) string {
 	r := big.NewRat(v, 1)

ingest/ledger_transaction.go

@@ -32,6 +32,10 @@ func (t *LedgerTransaction) txInternalError() bool {
 	return t.Result.Result.Result.Code == xdr.TransactionResultCodeTxInternalError
 }
 
+func (t *LedgerTransaction) FeeAccount() xdr.MuxedAccount {
+	return t.Envelope.FeeAccount()
+}
+
 // GetFeeChanges returns a developer friendly representation of LedgerEntryChanges
 // connected to fees.
 func (t *LedgerTransaction) GetFeeChanges() []Change {
@@ -592,31 +596,6 @@ func (t *LedgerTransaction) AccountMuxed() (string, bool) {
 
 }
 
-func (t *LedgerTransaction) FeeAccount() (string, bool) {
-	if !t.Envelope.IsFeeBump() {
-		return "", false
-	}
-
-	feeBumpAccount := t.Envelope.FeeBumpAccount()
-	feeAccount := feeBumpAccount.ToAccountId()
-
-	return feeAccount.Address(), true
-
-}
-
-func (t *LedgerTransaction) FeeAccountMuxed() (string, bool) {
-	if !t.Envelope.IsFeeBump() {
-		return "", false
-	}
-
-	feeBumpAccount := t.Envelope.FeeBumpAccount()
-	if feeBumpAccount.Type != xdr.CryptoKeyTypeKeyTypeMuxedEd25519 {
-		return "", false
-	}
-
-	return feeBumpAccount.Address(), true
-}
-
 func (t *LedgerTransaction) InnerTransactionHash() (string, bool) {
 	if !t.Envelope.IsFeeBump() {
 		return "", false

ingest/ledger_transaction_test.go

@@ -928,16 +928,6 @@ func TestTransactionHelperFunctions(t *testing.T) {
 	assert.Equal(t, true, ok)
 	assert.Equal(t, "MAISEMYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPMJ2I", accountMuxed)
 
-	var feeAccount string
-	feeAccount, ok = transaction.FeeAccount()
-	assert.Equal(t, false, ok)
-	assert.Equal(t, "", feeAccount)
-
-	var feeAccountMuxed string
-	feeAccountMuxed, ok = transaction.FeeAccountMuxed()
-	assert.Equal(t, false, ok)
-	assert.Equal(t, "", feeAccountMuxed)
-
 	var innerTransactionHash string
 	innerTransactionHash, ok = transaction.InnerTransactionHash()
 	assert.Equal(t, false, ok)

ingest/processors/token_transfer/token_transfer_event.go

@@ -1,14 +1,15 @@
 package token_transfer
 
 import (
-	"github.com/stellar/go/ingest/address"
-	"github.com/stellar/go/ingest/asset"
+	"github.com/stellar/go/ingest"
+	addressProto "github.com/stellar/go/ingest/address"
+	assetProto "github.com/stellar/go/ingest/asset"
 	"time"
 
 	"google.golang.org/protobuf/types/known/timestamppb"
 )
 
-func NewTransferEvent(meta *EventMeta, from, to *address.Address, amount string, token *asset.Asset) *TokenTransferEvent {
+func NewTransferEvent(meta *EventMeta, from, to *addressProto.Address, amount string, token *assetProto.Asset) *TokenTransferEvent {
 	return &TokenTransferEvent{
 		Meta:  meta,
 		Asset: token,
@@ -22,7 +23,7 @@ func NewTransferEvent(meta *EventMeta, from, to *address.Address, amount string,
 	}
 }
 
-func NewMintEvent(meta *EventMeta, to *address.Address, amount string, token *asset.Asset) *TokenTransferEvent {
+func NewMintEvent(meta *EventMeta, to *addressProto.Address, amount string, token *assetProto.Asset) *TokenTransferEvent {
 	return &TokenTransferEvent{
 		Meta:  meta,
 		Asset: token,
@@ -35,7 +36,7 @@ func NewMintEvent(meta *EventMeta, to *address.Address, amount string, token *as
 	}
 }
 
-func NewBurnEvent(meta *EventMeta, from *address.Address, amount string, token *asset.Asset) *TokenTransferEvent {
+func NewBurnEvent(meta *EventMeta, from *addressProto.Address, amount string, token *assetProto.Asset) *TokenTransferEvent {
 	return &TokenTransferEvent{
 		Meta:  meta,
 		Asset: token,
@@ -48,7 +49,7 @@ func NewBurnEvent(meta *EventMeta, from *address.Address, amount string, token *
 	}
 }
 
-func NewClawbackEvent(meta *EventMeta, from *address.Address, amount string, token *asset.Asset) *TokenTransferEvent {
+func NewClawbackEvent(meta *EventMeta, from *addressProto.Address, amount string, token *assetProto.Asset) *TokenTransferEvent {
 	return &TokenTransferEvent{
 		Meta:  meta,
 		Asset: token,
@@ -61,7 +62,7 @@ func NewClawbackEvent(meta *EventMeta, from *address.Address, amount string, tok
 	}
 }
 
-func NewFeeEvent(ledgerSequence uint32, closedAt time.Time, txHash string, from *address.Address, amount string, token *asset.Asset) *TokenTransferEvent {
+func NewFeeEvent(ledgerSequence uint32, closedAt time.Time, txHash string, from *addressProto.Address, amount string, token *assetProto.Asset) *TokenTransferEvent {
 	return &TokenTransferEvent{
 		Meta: &EventMeta{
 			LedgerSequence: ledgerSequence,
@@ -77,3 +78,13 @@ func NewFeeEvent(ledgerSequence uint32, closedAt time.Time, txHash string, from
 		},
 	}
 }
+
+func NewEventMeta(tx ingest.LedgerTransaction, operationIndex *uint32, contractAddress *addressProto.Address) *EventMeta {
+	return &EventMeta{
+		LedgerSequence:  tx.Ledger.LedgerSequence(),
+		ClosedAt:        timestamppb.New(tx.Ledger.ClosedAt()),
+		TxHash:          tx.Hash.HexString(),
+		OperationIndex:  operationIndex,
+		ContractAddress: contractAddress,
+	}
+}

ingest/processors/token_transfer/token_transfer_event_test.go

@@ -1,26 +1,26 @@
 package token_transfer
 
 import (
-	"github.com/stellar/go/ingest/address"
-	"github.com/stellar/go/ingest/asset"
+	addressProto "github.com/stellar/go/ingest/address"
+	assetProto "github.com/stellar/go/ingest/asset"
 	"github.com/stretchr/testify/assert"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"testing"
 	"time"
 )
 
-func newTestAddress() *address.Address {
-	return &address.Address{
-		AddressType: address.AddressType_ADDRESS_TYPE_ACCOUNT,
+func newTestAddress() *addressProto.Address {
+	return &addressProto.Address{
+		AddressType: addressProto.AddressType_ADDRESS_TYPE_ACCOUNT,
 		StrKey:      "GBRX5D3FLJ72FHYFVFF2BOICRVDF7FESIAT6GQ4K3ST2MXXJJZC24H2F",
 	}
 }
 
-func newTestAsset() *asset.Asset {
-	return &asset.Asset{
-		AssetType: &asset.Asset_IssuedAsset{
-			IssuedAsset: &asset.IssuedAsset{
+func newTestAsset() *assetProto.Asset {
+	return &assetProto.Asset{
+		AssetType: &assetProto.Asset_IssuedAsset{
+			IssuedAsset: &assetProto.IssuedAsset{
 				AssetCode: "USDC",
 				Issuer:    "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN",
 			},
@@ -41,13 +41,13 @@ func TestEventSerialization(t *testing.T) {
 		// test fixtureName
 		fixtureName string
 		// Setup the test fixture
-		fixtureSetupFn func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string)
+		fixtureSetupFn func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string)
 		// Function to assert to see if data matches
 		assertFn func(event *TokenTransferEvent) proto.Message
 	}{
 		{
 			fixtureName: "Transfer",
-			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string) {
+			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string) {
 				from := newTestAddress()
 				to := newTestAddress()
 				amount := "1000"
@@ -62,7 +62,7 @@ func TestEventSerialization(t *testing.T) {
 		},
 		{
 			fixtureName: "Mint",
-			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string) {
+			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string) {
 				to := newTestAddress()
 				amount := "500"
 				meta := newTestEventMeta()
@@ -76,7 +76,7 @@ func TestEventSerialization(t *testing.T) {
 		},
 		{
 			fixtureName: "Burn",
-			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string) {
+			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string) {
 				from := newTestAddress()
 				amount := "200"
 				meta := newTestEventMeta()
@@ -90,7 +90,7 @@ func TestEventSerialization(t *testing.T) {
 		},
 		{
 			fixtureName: "Clawback",
-			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string) {
+			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string) {
 				from := newTestAddress()
 				amount := "300"
 				meta := newTestEventMeta()
@@ -104,7 +104,7 @@ func TestEventSerialization(t *testing.T) {
 		},
 		{
 			fixtureName: "Fee",
-			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *asset.Asset, *address.Address, string) {
+			fixtureSetupFn: func() (*TokenTransferEvent, *EventMeta, *assetProto.Asset, *addressProto.Address, string) {
 				from := newTestAddress()
 				amount := "50"
 				token := newTestAsset()