refactor: move pumpfun-related type definitions to pumpfun package

0xjeffro · 0xjeffro · commit 3e1209c79110 · 2025-03-25T19:46:42.000-07:00
diff --git a/solana/parser_test.go b/solana/parser_test.go
@@ -53,7 +53,7 @@ func TestPumpFunSell_0(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
-	if sellAction, ok := action.(*types.PumpFunSellAction); ok {
+	if sellAction, ok := action.(*pumpfun.SellAction); ok {
 		assert.Equal(t, sellAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, sellAction.ProgramName, "PumpFun")
 		assert.Equal(t, sellAction.InstructionName, "Sell")
@@ -75,7 +75,7 @@ func TestPumpFunBuy_0(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[2]
-	if buyAction, ok := action.(*types.PumpFunBuyAction); ok {
+	if buyAction, ok := action.(*pumpfun.BuyAction); ok {
 		assert.Equal(t, buyAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, buyAction.ProgramName, "PumpFun")
 		assert.Equal(t, buyAction.InstructionName, "Buy")
@@ -98,7 +98,7 @@ func TestPumpFunBuy_1(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[4]
-	if buyAction, ok := action.(*types.PumpFunBuyAction); ok {
+	if buyAction, ok := action.(*pumpfun.BuyAction); ok {
 		assert.Equal(t, buyAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, buyAction.ProgramName, "PumpFun")
 		assert.Equal(t, buyAction.InstructionName, "Buy")
@@ -121,7 +121,7 @@ func TestPumpFunBuyBundle(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[1]
-	if buyAction, ok := action.(*types.PumpFunBuyAction); ok {
+	if buyAction, ok := action.(*pumpfun.BuyAction); ok {
 		assert.Equal(t, buyAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, buyAction.ProgramName, "PumpFun")
 		assert.Equal(t, buyAction.InstructionName, "Buy")
@@ -136,7 +136,7 @@ func TestPumpFunBuyBundle(t *testing.T) {
 	}
 
 	action = results[0].Actions[3]
-	if buyAction, ok := action.(*types.PumpFunBuyAction); ok {
+	if buyAction, ok := action.(*pumpfun.BuyAction); ok {
 		assert.Equal(t, buyAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, buyAction.ProgramName, "PumpFun")
 		assert.Equal(t, buyAction.InstructionName, "Buy")
@@ -151,7 +151,7 @@ func TestPumpFunBuyBundle(t *testing.T) {
 	}
 
 	action = results[0].Actions[5]
-	if buyAction, ok := action.(*types.PumpFunBuyAction); ok {
+	if buyAction, ok := action.(*pumpfun.BuyAction); ok {
 		assert.Equal(t, buyAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, buyAction.ProgramName, "PumpFun")
 		assert.Equal(t, buyAction.InstructionName, "Buy")
@@ -173,7 +173,7 @@ func TestPumpFunCreate_0(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[3]
-	if createAction, ok := action.(*types.PumpFunCreateAction); ok {
+	if createAction, ok := action.(*pumpfun.CreateAction); ok {
 		assert.Equal(t, createAction.ProgramID, pumpfun.Program)
 		assert.Equal(t, createAction.ProgramName, "PumpFun")
 		assert.Equal(t, createAction.InstructionName, "Create")
diff --git a/solana/programs/pumpfun/parsers/anchorSelfCPILogSwap.go b/solana/programs/pumpfun/parsers/anchorSelfCPILogSwap.go
@@ -19,14 +19,14 @@ type AnchorSelfCPILogSwapData struct {
 	VirtualTokenReserves uint64
 }
 
-func AnchorSelfCPILogSwapParser(decodedData []byte) (*types.PumpFunAnchorSelfCPILogSwapAction, error) {
+func AnchorSelfCPILogSwapParser(decodedData []byte) (*pumpfun.AnchorSelfCPILogSwapAction, error) {
 	var data AnchorSelfCPILogSwapData
 	err := borsh.Deserialize(&data, decodedData)
 	if err != nil {
 		return nil, err
 	}
 
-	action := types.PumpFunAnchorSelfCPILogSwapAction{
+	action := pumpfun.AnchorSelfCPILogSwapAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       pumpfun.Program,
 			ProgramName:     "pumpfun",
diff --git a/solana/programs/pumpfun/parsers/buy.go b/solana/programs/pumpfun/parsers/buy.go
@@ -17,7 +17,7 @@ type BuyData struct {
 	MaxSolCost    uint64
 }
 
-func BuyParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.PumpFunBuyAction, error) {
+func BuyParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*pumpfun.BuyAction, error) {
 	var buyData BuyData
 	err := borsh.Deserialize(&buyData, decodedData)
 	if err != nil {
@@ -79,7 +79,7 @@ func BuyParser(result *types.ParsedResult, instruction types.Instruction, decode
 		}
 	}
 
-	action := types.PumpFunBuyAction{
+	action := pumpfun.BuyAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       pumpfun.Program,
 			ProgramName:     pumpfun.ProgramName,
diff --git a/solana/programs/pumpfun/parsers/create.go b/solana/programs/pumpfun/parsers/create.go
@@ -13,14 +13,14 @@ type CreateData struct {
 	Uri           string
 }
 
-func CreateParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.PumpFunCreateAction, error) {
+func CreateParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*pumpfun.CreateAction, error) {
 	var createData CreateData
 	err := borsh.Deserialize(&createData, decodedData)
 	if err != nil {
 		return nil, err
 	}
 
-	action := types.PumpFunCreateAction{
+	action := pumpfun.CreateAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       pumpfun.Program,
 			ProgramName:     pumpfun.ProgramName,
diff --git a/solana/programs/pumpfun/parsers/sell.go b/solana/programs/pumpfun/parsers/sell.go
@@ -14,7 +14,7 @@ type SellData struct {
 	MinSolOutput  uint64
 }
 
-func SellParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.PumpFunSellAction, error) {
+func SellParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*pumpfun.SellAction, error) {
 	var sellData SellData
 	err := borsh.Deserialize(&sellData, decodedData)
 	if err != nil {
@@ -62,7 +62,7 @@ func SellParser(result *types.ParsedResult, instruction types.Instruction, decod
 		}
 	}
 
-	action := types.PumpFunSellAction{
+	action := pumpfun.SellAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       pumpfun.Program,
 			ProgramName:     pumpfun.ProgramName,
diff --git a/solana/programs/pumpfun/types.go b/solana/programs/pumpfun/types.go
@@ -1,7 +1,9 @@
-package types
+package pumpfun
 
-type PumpFunBuyAction struct {
-	BaseAction
+import "github.com/0xjeffro/tx-parser/solana/types"
+
+type BuyAction struct {
+	types.BaseAction
 	Who             string `json:"who"`
 	FromToken       string `json:"fromToken"`
 	FromTokenAmount uint64 `json:"fromTokenAmount"`
@@ -11,8 +13,8 @@ type PumpFunBuyAction struct {
 	FeeAmount       uint64 `json:"feeAmount"`
 }
 
-type PumpFunSellAction struct {
-	BaseAction
+type SellAction struct {
+	types.BaseAction
 	Who             string `json:"who"`
 	FromToken       string `json:"fromToken"`
 	FromTokenAmount uint64 `json:"fromTokenAmount"`
@@ -21,8 +23,8 @@ type PumpFunSellAction struct {
 	MinSolOutput    uint64 `json:"minSolOutput"`
 }
 
-type PumpFunCreateAction struct {
-	BaseAction
+type CreateAction struct {
+	types.BaseAction
 	Who                    string `json:"who"`
 	Mint                   string `json:"mint"`
 	MintAuthority          string `json:"mintAuthority"`
@@ -36,8 +38,8 @@ type PumpFunCreateAction struct {
 	Uri    string `json:"uri"`
 }
 
-type PumpFunAnchorSelfCPILogSwapAction struct {
-	BaseAction
+type AnchorSelfCPILogSwapAction struct {
+	types.BaseAction
 	Mint                 string `json:"mint"`
 	SolAmount            uint64 `json:"solAmount"`
 	TokenAmount          uint64 `json:"tokenAmount"`

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type BuyData struct {`
`17`	`17`	`MaxSolCost uint64`
`18`	`18`	`}`
`19`	`19`
`20`		`-func BuyParser(result types.ParsedResult, instruction types.Instruction, decodedData []byte) (types.PumpFunBuyAction, error) {`
	`20`	`+func BuyParser(result types.ParsedResult, instruction types.Instruction, decodedData []byte) (pumpfun.BuyAction, error) {`
`21`	`21`	`var buyData BuyData`
`22`	`22`	`err := borsh.Deserialize(&buyData, decodedData)`
`23`	`23`	`if err != nil {`
`@@ -79,7 +79,7 @@ func BuyParser(result *types.ParsedResult, instruction types.Instruction, decode`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- action := types.PumpFunBuyAction{`
	`82`	`+ action := pumpfun.BuyAction{`
`83`	`83`	`BaseAction: types.BaseAction{`
`84`	`84`	`ProgramID: pumpfun.Program,`
`85`	`85`	`ProgramName: pumpfun.ProgramName,`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type SellData struct {`
`14`	`14`	`MinSolOutput uint64`
`15`	`15`	`}`
`16`	`16`
`17`		`-func SellParser(result types.ParsedResult, instruction types.Instruction, decodedData []byte) (types.PumpFunSellAction, error) {`
	`17`	`+func SellParser(result types.ParsedResult, instruction types.Instruction, decodedData []byte) (pumpfun.SellAction, error) {`
`18`	`18`	`var sellData SellData`
`19`	`19`	`err := borsh.Deserialize(&sellData, decodedData)`
`20`	`20`	`if err != nil {`
`@@ -62,7 +62,7 @@ func SellParser(result *types.ParsedResult, instruction types.Instruction, decod`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- action := types.PumpFunSellAction{`
	`65`	`+ action := pumpfun.SellAction{`
`66`	`66`	`BaseAction: types.BaseAction{`
`67`	`67`	`ProgramID: pumpfun.Program,`
`68`	`68`	`ProgramName: pumpfun.ProgramName,`