refactor: mv tokenProgram-related typedefs to tokenProgram pkg

0xjeffro · 0xjeffro · commit a5a046b9d55f · 2025-03-26T14:56:55.000-07:00
diff --git a/solana/parser_test.go b/solana/parser_test.go
@@ -276,7 +276,7 @@ func TestTokenProgramTransfer(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
 
-	if transferAction, ok := action.(*types.TokenProgramTransferAction); ok {
+	if transferAction, ok := action.(*tokenProgram.TransferAction); ok {
 		assert.Equal(t, transferAction.ProgramID, tokenProgram.Program)
 		assert.Equal(t, transferAction.ProgramName, tokenProgram.ProgramName)
 		assert.Equal(t, transferAction.InstructionName, "Transfer")
@@ -296,7 +296,7 @@ func TestTokenProgramTransferChecked(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
 
-	if transferAction, ok := action.(*types.TokenProgramTransferCheckedAction); ok {
+	if transferAction, ok := action.(*tokenProgram.TransferCheckedAction); ok {
 		assert.Equal(t, transferAction.ProgramID, tokenProgram.Program)
 		assert.Equal(t, transferAction.ProgramName, tokenProgram.ProgramName)
 		assert.Equal(t, transferAction.InstructionName, "TransferChecked")
@@ -318,7 +318,7 @@ func TestTokenProgramInitializeAccount(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
 
-	if initAction, ok := action.(*types.TokenProgramInitializeAccountAction); ok {
+	if initAction, ok := action.(*tokenProgram.InitializeAccountAction); ok {
 		assert.Equal(t, initAction.ProgramID, tokenProgram.Program)
 		assert.Equal(t, initAction.ProgramName, tokenProgram.ProgramName)
 		assert.Equal(t, initAction.InstructionName, "InitializeAccount")
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSolSwapParser.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSolSwapParser.go
@@ -66,14 +66,14 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.TokenProgramTransferAction:
+			case *tokenProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
-			case *types.TokenProgramTransferCheckedAction:
+			case *tokenProgram.TransferCheckedAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSplProxySwap.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSplProxySwap.go
@@ -66,14 +66,14 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.TokenProgramTransferAction:
+			case *tokenProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
-			case *types.TokenProgramTransferCheckedAction:
+			case *tokenProgram.TransferCheckedAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/swap.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/swap.go
@@ -57,11 +57,11 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.TokenProgramTransferAction:
+			case *tokenProgram.TransferAction:
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
-			case *types.TokenProgramTransferCheckedAction:
+			case *tokenProgram.TransferCheckedAction:
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
diff --git a/solana/programs/jupiterAggregatorV6/parsers/route.go b/solana/programs/jupiterAggregatorV6/parsers/route.go
@@ -65,14 +65,14 @@ func RouteParser(result *types.ParsedResult, instruction types.Instruction) (*ty
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.TokenProgramTransferAction:
+			case *tokenProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
-			case *types.TokenProgramTransferCheckedAction:
+			case *tokenProgram.TransferCheckedAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
diff --git a/solana/programs/jupiterAggregatorV6/parsers/sharedAccountsRoute.go b/solana/programs/jupiterAggregatorV6/parsers/sharedAccountsRoute.go
@@ -58,14 +58,14 @@ func SharedAccountsRouteParser(result *types.ParsedResult, instruction types.Ins
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.TokenProgramTransferAction:
+			case *tokenProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Amount
 				}
-			case *types.TokenProgramTransferCheckedAction:
+			case *tokenProgram.TransferCheckedAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Amount
 				}
diff --git a/solana/programs/raydiumLiquidityPoolV4/parsers/swap.go b/solana/programs/raydiumLiquidityPoolV4/parsers/swap.go
@@ -59,7 +59,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, instr
 			if err != nil {
 				continue
 			}
-			transferAction, ok := action.(*types.TokenProgramTransferAction)
+			transferAction, ok := action.(*tokenProgram.TransferAction)
 			if ok {
 				if transferAction.To == userDestinationTokenAccount {
 					toTokenAmount = transferAction.Amount
diff --git a/solana/programs/tokenProgram/parsers/initializeAccount.go b/solana/programs/tokenProgram/parsers/initializeAccount.go
@@ -5,9 +5,9 @@ import (
 	"github.com/0xjeffro/tx-parser/solana/types"
 )
 
-func InitializeAccountParser(result *types.ParsedResult, instruction types.Instruction) (*types.TokenProgramInitializeAccountAction, error) {
+func InitializeAccountParser(result *types.ParsedResult, instruction types.Instruction) (*tokenProgram.InitializeAccountAction, error) {
 
-	action := types.TokenProgramInitializeAccountAction{
+	action := tokenProgram.InitializeAccountAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       tokenProgram.Program,
 			ProgramName:     tokenProgram.ProgramName,
diff --git a/solana/programs/tokenProgram/parsers/transfer.go b/solana/programs/tokenProgram/parsers/transfer.go
@@ -11,14 +11,14 @@ type TransferData struct {
 	Amount        uint64
 }
 
-func TransferParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.TokenProgramTransferAction, error) {
+func TransferParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*tokenProgram.TransferAction, error) {
 	var data TransferData
 	err := borsh.Deserialize(&data, decodedData)
 	if err != nil {
 		return nil, err
 	}
 
-	action := types.TokenProgramTransferAction{
+	action := tokenProgram.TransferAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       tokenProgram.Program,
 			ProgramName:     tokenProgram.ProgramName,
diff --git a/solana/programs/tokenProgram/parsers/transferChecked.go b/solana/programs/tokenProgram/parsers/transferChecked.go
@@ -7,7 +7,7 @@ import (
 	"github.com/near/borsh-go"
 )
 
-func TransferCheckedParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.TokenProgramTransferCheckedAction, error) {
+func TransferCheckedParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*tokenProgram.TransferCheckedAction, error) {
 	var data TransferData
 	err := borsh.Deserialize(&data, decodedData)
 	if err != nil {
@@ -18,7 +18,7 @@ func TransferCheckedParser(result *types.ParsedResult, instruction types.Instruc
 	fromTokenAccount := result.AccountList[instruction.Accounts[0]]
 	mint := result.AccountList[instruction.Accounts[1]]
 	toTokenAccount := result.AccountList[instruction.Accounts[2]]
-	action := types.TokenProgramTransferCheckedAction{
+	action := tokenProgram.TransferCheckedAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       tokenProgram.Program,
 			ProgramName:     tokenProgram.ProgramName,
diff --git a/solana/programs/tokenProgram/types.go b/solana/programs/tokenProgram/types.go
@@ -1,23 +1,25 @@
-package types
+package tokenProgram
 
-type TokenProgramTransferAction struct {
-	BaseAction
+import "github.com/0xjeffro/tx-parser/solana/types"
+
+type TransferAction struct {
+	types.BaseAction
 	From   string `json:"from"`
 	To     string `json:"to"`
 	Amount uint64 `json:"amount"`
 }
 
-type TokenProgramTransferCheckedAction struct {
-	BaseAction
+type TransferCheckedAction struct {
+	types.BaseAction
 	From     string `json:"from"`
 	To       string `json:"to"`
 	Amount   uint64 `json:"amount"`
 	Mint     string `json:"mint"`
 	Decimals uint64 `json:"decimals"`
 }
 
-type TokenProgramInitializeAccountAction struct {
-	BaseAction
+type InitializeAccountAction struct {
+	types.BaseAction
 	Account    string `json:"account"`
 	Mint       string `json:"mint"`
 	Owner      string `json:"owner"`

Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,14 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst`
`66`	`66`	`continue`
`67`	`67`	`}`
`68`	`68`	`switch p := parsedData.(type) {`
`69`		`- case *types.TokenProgramTransferAction:`
	`69`	`+ case *tokenProgram.TransferAction:`
`70`	`70`	`if p.From == fromTokenAccount {`
`71`	`71`	`fromTokenAmount += p.Amount`
`72`	`72`	`}`
`73`	`73`	`if p.To == toTokenAccount {`
`74`	`74`	`toTokenAmount += p.Amount`
`75`	`75`	`}`
`76`		`- case *types.TokenProgramTransferCheckedAction:`
	`76`	`+ case *tokenProgram.TransferCheckedAction:`
`77`	`77`	`if p.From == fromTokenAccount {`
`78`	`78`	`fromTokenAmount += p.Amount`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,14 +66,14 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.`
`66`	`66`	`continue`
`67`	`67`	`}`
`68`	`68`	`switch p := parsedData.(type) {`
`69`		`- case *types.TokenProgramTransferAction:`
	`69`	`+ case *tokenProgram.TransferAction:`
`70`	`70`	`if p.From == fromTokenAccount {`
`71`	`71`	`fromTokenAmount += p.Amount`
`72`	`72`	`}`
`73`	`73`	`if p.To == toTokenAccount {`
`74`	`74`	`toTokenAmount += p.Amount`
`75`	`75`	`}`
`76`		`- case *types.TokenProgramTransferCheckedAction:`
	`76`	`+ case *tokenProgram.TransferCheckedAction:`
`77`	`77`	`if p.From == fromTokenAccount {`
`78`	`78`	`fromTokenAmount += p.Amount`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -57,11 +57,11 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod`
`57`	`57`	`continue`
`58`	`58`	`}`
`59`	`59`	`switch p := parsedData.(type) {`
`60`		`- case *types.TokenProgramTransferAction:`
	`60`	`+ case *tokenProgram.TransferAction:`
`61`	`61`	`if p.To == toTokenAccount {`
`62`	`62`	`toTokenAmount += p.Amount`
`63`	`63`	`}`
`64`		`- case *types.TokenProgramTransferCheckedAction:`
	`64`	`+ case *tokenProgram.TransferCheckedAction:`
`65`	`65`	`if p.To == toTokenAccount {`
`66`	`66`	`toTokenAmount += p.Amount`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,14 +65,14 @@ func RouteParser(result types.ParsedResult, instruction types.Instruction) (ty`
`65`	`65`	`continue`
`66`	`66`	`}`
`67`	`67`	`switch p := parsedData.(type) {`
`68`		`- case *types.TokenProgramTransferAction:`
	`68`	`+ case *tokenProgram.TransferAction:`
`69`	`69`	`if p.From == fromTokenAccount {`
`70`	`70`	`fromTokenAmount += p.Amount`
`71`	`71`	`}`
`72`	`72`	`if p.To == toTokenAccount {`
`73`	`73`	`toTokenAmount += p.Amount`
`74`	`74`	`}`
`75`		`- case *types.TokenProgramTransferCheckedAction:`
	`75`	`+ case *tokenProgram.TransferCheckedAction:`
`76`	`76`	`if p.From == fromTokenAccount {`
`77`	`77`	`fromTokenAmount += p.Amount`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,14 +58,14 @@ func SharedAccountsRouteParser(result *types.ParsedResult, instruction types.Ins`
`58`	`58`	`continue`
`59`	`59`	`}`
`60`	`60`	`switch p := parsedData.(type) {`
`61`		`- case *types.TokenProgramTransferAction:`
	`61`	`+ case *tokenProgram.TransferAction:`
`62`	`62`	`if p.From == fromTokenAccount {`
`63`	`63`	`fromTokenAmount += p.Amount`
`64`	`64`	`}`
`65`	`65`	`if p.To == toTokenAccount {`
`66`	`66`	`toTokenAmount += p.Amount`
`67`	`67`	`}`
`68`		`- case *types.TokenProgramTransferCheckedAction:`
	`68`	`+ case *tokenProgram.TransferCheckedAction:`
`69`	`69`	`if p.From == fromTokenAccount {`
`70`	`70`	`fromTokenAmount += p.Amount`
`71`	`71`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, instr`
`59`	`59`	`if err != nil {`
`60`	`60`	`continue`
`61`	`61`	`}`
`62`		`- transferAction, ok := action.(*types.TokenProgramTransferAction)`
	`62`	`+ transferAction, ok := action.(*tokenProgram.TransferAction)`
`63`	`63`	`if ok {`
`64`	`64`	`if transferAction.To == userDestinationTokenAccount {`
`65`	`65`	`toTokenAmount = transferAction.Amount`