refactor: move systemProgram-related typedefs to systemProgram pkg

0xjeffro · 0xjeffro · commit 78c2b4657373 · 2025-03-26T14:34:48.000-07:00
diff --git a/solana/parser_test.go b/solana/parser_test.go
@@ -233,7 +233,7 @@ func TestSystemProgramTransfer(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[1]
-	if transferAction, ok := action.(*types.SystemProgramTransferAction); ok {
+	if transferAction, ok := action.(*systemProgram.TransferAction); ok {
 		assert.Equal(t, transferAction.ProgramID, systemProgram.Program)
 		assert.Equal(t, transferAction.ProgramName, systemProgram.ProgramName)
 		assert.Equal(t, transferAction.InstructionName, "Transfer")
@@ -252,7 +252,7 @@ func TestSystemProgramCreateAccountWithSeed(t *testing.T) {
 	}
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[2]
-	if transferAction, ok := action.(*types.SystemProgramCreateAccountWithSeedAction); ok {
+	if transferAction, ok := action.(*systemProgram.CreateAccountWithSeedAction); ok {
 		assert.Equal(t, transferAction.ProgramID, systemProgram.Program)
 		assert.Equal(t, transferAction.ProgramName, systemProgram.ProgramName)
 		assert.Equal(t, transferAction.InstructionName, "CreateAccountWithSeed")
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSolSwapParser.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSolSwapParser.go
@@ -52,7 +52,7 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.SystemProgramTransferAction:
+			case *systemProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Lamports
 				}
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSplProxySwap.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/commissionSplProxySwap.go
@@ -52,7 +52,7 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.SystemProgramTransferAction:
+			case *systemProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Lamports
 				}
diff --git a/solana/programs/OKXDEXAggregationRouterV2/parsers/swap.go b/solana/programs/OKXDEXAggregationRouterV2/parsers/swap.go
@@ -46,7 +46,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.SystemProgramTransferAction:
+			case *systemProgram.TransferAction:
 				if p.To == toTokenAccount {
 					toTokenAmount += p.Lamports
 				}
diff --git a/solana/programs/jupiterAggregatorV6/parsers/route.go b/solana/programs/jupiterAggregatorV6/parsers/route.go
@@ -51,7 +51,7 @@ func RouteParser(result *types.ParsedResult, instruction types.Instruction) (*ty
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.SystemProgramTransferAction:
+			case *systemProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Lamports
 				}
diff --git a/solana/programs/jupiterAggregatorV6/parsers/sharedAccountsRoute.go b/solana/programs/jupiterAggregatorV6/parsers/sharedAccountsRoute.go
@@ -44,7 +44,7 @@ func SharedAccountsRouteParser(result *types.ParsedResult, instruction types.Ins
 				continue
 			}
 			switch p := parsedData.(type) {
-			case *types.SystemProgramTransferAction:
+			case *systemProgram.TransferAction:
 				if p.From == fromTokenAccount {
 					fromTokenAmount += p.Lamports
 				}
diff --git a/solana/programs/systemProgram/parsers/createAccountWithSeed.go b/solana/programs/systemProgram/parsers/createAccountWithSeed.go
@@ -7,15 +7,15 @@ import (
 	solanago "github.com/gagliardetto/solana-go"
 )
 
-func CreateAccountWithSeedParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.SystemProgramCreateAccountWithSeedAction, error) {
+func CreateAccountWithSeedParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*systemProgram.CreateAccountWithSeedAction, error) {
 	basePubKey := solanago.PublicKeyFromBytes(decodedData[4:36])
 	seedLength := binary.LittleEndian.Uint64(decodedData[36:44])
 	seed := string(decodedData[44 : 44+seedLength])
 	lamports := binary.LittleEndian.Uint64(decodedData[44+seedLength : 44+seedLength+8])
 	space := binary.LittleEndian.Uint64(decodedData[44+seedLength+8 : 44+seedLength+16])
 	ownerPubKey := solanago.PublicKeyFromBytes(decodedData[44+seedLength+16 : 44+seedLength+16+32])
 
-	action := types.SystemProgramCreateAccountWithSeedAction{
+	action := systemProgram.CreateAccountWithSeedAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       result.AccountList[instruction.ProgramIDIndex],
 			ProgramName:     systemProgram.ProgramName,
diff --git a/solana/programs/systemProgram/parsers/transfer.go b/solana/programs/systemProgram/parsers/transfer.go
@@ -11,14 +11,14 @@ type TransferData struct {
 	Lamports      uint64
 }
 
-func TransferParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*types.SystemProgramTransferAction, error) {
+func TransferParser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*systemProgram.TransferAction, error) {
 	var data TransferData
 	err := borsh.Deserialize(&data, decodedData)
 	if err != nil {
 		return nil, err
 	}
 
-	action := types.SystemProgramTransferAction{
+	action := systemProgram.TransferAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       result.AccountList[instruction.ProgramIDIndex],
 			ProgramName:     systemProgram.ProgramName,
diff --git a/solana/programs/systemProgram/types.go b/solana/programs/systemProgram/types.go
@@ -1,14 +1,16 @@
-package types
+package systemProgram
 
-type SystemProgramTransferAction struct {
-	BaseAction
+import "github.com/0xjeffro/tx-parser/solana/types"
+
+type TransferAction struct {
+	types.BaseAction
 	From     string `json:"from"`
 	To       string `json:"to"`
 	Lamports uint64 `json:"lamports"`
 }
 
-type SystemProgramCreateAccountWithSeedAction struct {
-	BaseAction
+type CreateAccountWithSeedAction struct {
+	types.BaseAction
 	Who        string `json:"who"`
 	NewAccount string `json:"newAccount"`
 	Base       string `json:"base"`

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func CommissionSolSwap2Parser(result *types.ParsedResult, instruction types.Inst`
`52`	`52`	`continue`
`53`	`53`	`}`
`54`	`54`	`switch p := parsedData.(type) {`
`55`		`- case *types.SystemProgramTransferAction:`
	`55`	`+ case *systemProgram.TransferAction:`
`56`	`56`	`if p.From == fromTokenAccount {`
`57`	`57`	`fromTokenAmount += p.Lamports`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ func CommissionSplProxySwapParser(result *types.ParsedResult, instruction types.`
`52`	`52`	`continue`
`53`	`53`	`}`
`54`	`54`	`switch p := parsedData.(type) {`
`55`		`- case *types.SystemProgramTransferAction:`
	`55`	`+ case *systemProgram.TransferAction:`
`56`	`56`	`if p.From == fromTokenAccount {`
`57`	`57`	`fromTokenAmount += p.Lamports`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func SwapParser(result *types.ParsedResult, instruction types.Instruction, decod`
`46`	`46`	`continue`
`47`	`47`	`}`
`48`	`48`	`switch p := parsedData.(type) {`
`49`		`- case *types.SystemProgramTransferAction:`
	`49`	`+ case *systemProgram.TransferAction:`
`50`	`50`	`if p.To == toTokenAccount {`
`51`	`51`	`toTokenAmount += p.Lamports`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ func RouteParser(result types.ParsedResult, instruction types.Instruction) (ty`
`51`	`51`	`continue`
`52`	`52`	`}`
`53`	`53`	`switch p := parsedData.(type) {`
`54`		`- case *types.SystemProgramTransferAction:`
	`54`	`+ case *systemProgram.TransferAction:`
`55`	`55`	`if p.From == fromTokenAccount {`
`56`	`56`	`fromTokenAmount += p.Lamports`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func SharedAccountsRouteParser(result *types.ParsedResult, instruction types.Ins`
`44`	`44`	`continue`
`45`	`45`	`}`
`46`	`46`	`switch p := parsedData.(type) {`
`47`		`- case *types.SystemProgramTransferAction:`
	`47`	`+ case *systemProgram.TransferAction:`
`48`	`48`	`if p.From == fromTokenAccount {`
`49`	`49`	`fromTokenAmount += p.Lamports`
`50`	`50`	`}`