refactor

Author: 0xjeffro

solana/parser_test.go

@@ -10,7 +10,7 @@ import (
 
 	"github.com/0xjeffro/tx-parser/solana/globals"
 	"github.com/0xjeffro/tx-parser/solana/programs/compute_budget"
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
 	"github.com/0xjeffro/tx-parser/solana/programs/pumpfun"
 	"github.com/0xjeffro/tx-parser/solana/programs/raydiumLiquidityPoolV4"
 	"github.com/0xjeffro/tx-parser/solana/programs/systemProgram"
@@ -338,9 +338,9 @@ func TestJupiterDcaOpenDcaV2_0(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[0]
 
-	if DcaAction, ok := action.(*jupiterDCA.OpenV2Action); ok {
-		assert.Equal(t, DcaAction.ProgramID, jupiterDCA.Program)
-		assert.Equal(t, DcaAction.ProgramName, jupiterDCA.ProgramName)
+	if DcaAction, ok := action.(*jupiter_dca.OpenV2Action); ok {
+		assert.Equal(t, DcaAction.ProgramID, jupiter_dca.Program)
+		assert.Equal(t, DcaAction.ProgramName, jupiter_dca.ProgramName)
 		assert.Equal(t, DcaAction.Dca, "7F3Wg8gzekghzqPLGubCSSjZGj6ihVb14A6QmGKjNL92")
 		assert.Equal(t, DcaAction.User, "BxDjGoj9y33tmkKMK5dRHeUGkSGWEs4H51uHoQaBv9Wz")
 		assert.Equal(t, DcaAction.Payer, "BxDjGoj9y33tmkKMK5dRHeUGkSGWEs4H51uHoQaBv9Wz")
@@ -368,9 +368,9 @@ func TestJupiterDcaOpenDcaV2_1(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[0]
 
-	if DcaAction, ok := action.(*jupiterDCA.OpenV2Action); ok {
-		assert.Equal(t, DcaAction.ProgramID, jupiterDCA.Program)
-		assert.Equal(t, DcaAction.ProgramName, jupiterDCA.ProgramName)
+	if DcaAction, ok := action.(*jupiter_dca.OpenV2Action); ok {
+		assert.Equal(t, DcaAction.ProgramID, jupiter_dca.Program)
+		assert.Equal(t, DcaAction.ProgramName, jupiter_dca.ProgramName)
 		assert.Equal(t, DcaAction.Dca, "GxMofmfnZw6ia9DE2KoqjgEd1vp7VuSrhqYqLWLW6bXf")
 		assert.Equal(t, DcaAction.User, "4vYWDeg6NHUt1VoUZoV8RqZA51AUEd4VCCghA4arfuH7")
 		assert.Equal(t, DcaAction.Payer, "4vYWDeg6NHUt1VoUZoV8RqZA51AUEd4VCCghA4arfuH7")
@@ -398,9 +398,9 @@ func TestJupiterDcaEndAndClose_0(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[1]
 
-	if DcaAction, ok := action.(*jupiterDCA.EndAndCloseAction); ok {
-		assert.Equal(t, DcaAction.ProgramID, jupiterDCA.Program)
-		assert.Equal(t, DcaAction.ProgramName, jupiterDCA.ProgramName)
+	if DcaAction, ok := action.(*jupiter_dca.EndAndCloseAction); ok {
+		assert.Equal(t, DcaAction.ProgramID, jupiter_dca.Program)
+		assert.Equal(t, DcaAction.ProgramName, jupiter_dca.ProgramName)
 		assert.Equal(t, DcaAction.Keeper, "JD25qVdtd65FoiXNmR89JjmoJdYk9sjYQeSTZAALFiMy")
 		assert.Equal(t, DcaAction.Dca, "Cf8vzN89jMzfgg3XpNGMTkzwihzbm1AHnQy1bVyeLVcy")
 		assert.Equal(t, DcaAction.InputMint, "E1kvzJNxShvvWTrudokpzuc789vRiDXfXG3duCuY6ooE")
@@ -422,9 +422,9 @@ func TestJupiterDcaEndAndClose_1(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[1]
 
-	if DcaAction, ok := action.(*jupiterDCA.EndAndCloseAction); ok {
-		assert.Equal(t, DcaAction.ProgramID, jupiterDCA.Program)
-		assert.Equal(t, DcaAction.ProgramName, jupiterDCA.ProgramName)
+	if DcaAction, ok := action.(*jupiter_dca.EndAndCloseAction); ok {
+		assert.Equal(t, DcaAction.ProgramID, jupiter_dca.Program)
+		assert.Equal(t, DcaAction.ProgramName, jupiter_dca.ProgramName)
 		assert.Equal(t, DcaAction.Keeper, "JD38n7ynKYcgPpF7k1BhXEeREu1KqptU93fVGy3S624k")
 		assert.Equal(t, DcaAction.Dca, "DdtdfnA7mPfzbxDfU2hD7DWNe64fWL9eMk3Tb9jw9ncr")
 		assert.Equal(t, DcaAction.InputMint, "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v")
@@ -446,9 +446,9 @@ func TestJupiterDcaCloseDca_0(t *testing.T) {
 	results, _ := Parser(byteValue)
 	action := results[0].Actions[0]
 
-	if DcaAction, ok := action.(*jupiterDCA.CloseDcaAction); ok {
-		assert.Equal(t, DcaAction.ProgramID, jupiterDCA.Program)
-		assert.Equal(t, DcaAction.ProgramName, jupiterDCA.ProgramName)
+	if DcaAction, ok := action.(*jupiter_dca.CloseDcaAction); ok {
+		assert.Equal(t, DcaAction.ProgramID, jupiter_dca.Program)
+		assert.Equal(t, DcaAction.ProgramName, jupiter_dca.ProgramName)
 		assert.Equal(t, DcaAction.User, "3k2pJD3FtFT8zZLoYRgHEQgays1jYs6LYCKi5MWNPLKJ")
 		assert.Equal(t, DcaAction.Dca, "565uLdnjfP69rUpGuE7d5rB65V6BoqYknnWrFdt5ebFk")
 		assert.Equal(t, DcaAction.InputMint, "6T44rfi9BDUdZbEvVddZWVfsGrpC6N1sSSKYnCsLpump")

solana/programs/PhotonProgram/types.go

@@ -1,4 +1,4 @@
-package jupiterDCA
+package jupiter_dca
 
 const Program = "DCA265Vj8a9CEuX1eb1LWRnDT7uK6q1xMipnNyatn23M"
 const ProgramName = "Jupiter DCA Program"

solana/programs/jupiterDCA/meta.go renamed to solana/programs/jupiter_dca/meta.go

@@ -1,15 +1,15 @@
 package parsers
 
 import (
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
 	"github.com/0xjeffro/tx-parser/solana/types"
 )
 
-func CloseDcaParser(result *types.ParsedResult, instruction types.Instruction) (*jupiterDCA.CloseDcaAction, error) {
-	return &jupiterDCA.CloseDcaAction{
+func CloseDcaParser(result *types.ParsedResult, instruction types.Instruction) (*jupiter_dca.CloseDcaAction, error) {
+	return &jupiter_dca.CloseDcaAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       result.AccountList[instruction.ProgramIDIndex],
-			ProgramName:     jupiterDCA.ProgramName,
+			ProgramName:     jupiter_dca.ProgramName,
 			InstructionName: "CloseDca",
 		},
 		User:       result.AccountList[instruction.Accounts[0]],

solana/programs/jupiterDCA/parsers/close_dca.go renamed to solana/programs/jupiter_dca/parsers/close_dca.go

@@ -1,15 +1,15 @@
 package parsers
 
 import (
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
 	"github.com/0xjeffro/tx-parser/solana/types"
 )
 
-func EndAndCloseParser(result *types.ParsedResult, instruction types.Instruction) (*jupiterDCA.EndAndCloseAction, error) {
-	return &jupiterDCA.EndAndCloseAction{
+func EndAndCloseParser(result *types.ParsedResult, instruction types.Instruction) (*jupiter_dca.EndAndCloseAction, error) {
+	return &jupiter_dca.EndAndCloseAction{
 		BaseAction: types.BaseAction{
 			ProgramID:       result.AccountList[instruction.ProgramIDIndex],
-			ProgramName:     jupiterDCA.ProgramName,
+			ProgramName:     jupiter_dca.ProgramName,
 			InstructionName: "EndAndClose",
 		},
 		Keeper:     result.AccountList[instruction.Accounts[0]],

solana/programs/jupiterDCA/parsers/end_and_close.go renamed to solana/programs/jupiter_dca/parsers/end_and_close.go

@@ -1,7 +1,7 @@
 package parsers
 
 import (
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
 	"github.com/0xjeffro/tx-parser/solana/types"
 	"github.com/mr-tron/base58"
 )
@@ -15,17 +15,17 @@ func InstructionRouter(result *types.ParsedResult, instruction types.Instruction
 	discriminator := *(*[8]byte)(decode[:8])
 
 	switch discriminator {
-	case jupiterDCA.OpenDcaV2Discriminator:
+	case jupiter_dca.OpenDcaV2Discriminator:
 		return OpenDcaV2Parser(result, instruction, decode)
-	case jupiterDCA.EndAndCloseDiscriminator:
+	case jupiter_dca.EndAndCloseDiscriminator:
 		return EndAndCloseParser(result, instruction)
-	case jupiterDCA.CloseDcaDiscriminator:
+	case jupiter_dca.CloseDcaDiscriminator:
 		return CloseDcaParser(result, instruction)
 	default:
 		return types.UnknownAction{
 			BaseAction: types.BaseAction{
 				ProgramID:       result.AccountList[instruction.ProgramIDIndex],
-				ProgramName:     jupiterDCA.ProgramName,
+				ProgramName:     jupiter_dca.ProgramName,
 				InstructionName: "Unknown",
 			},
 		}, nil

solana/programs/jupiterDCA/parsers/index.go renamed to solana/programs/jupiter_dca/parsers/index.go

@@ -2,11 +2,11 @@ package parsers
 
 import (
 	"encoding/binary"
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
 	"github.com/0xjeffro/tx-parser/solana/types"
 )
 
-func OpenDcaV2Parser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*jupiterDCA.OpenV2Action, error) {
+func OpenDcaV2Parser(result *types.ParsedResult, instruction types.Instruction, decodedData []byte) (*jupiter_dca.OpenV2Action, error) {
 	var inAmount uint64
 	var inAmountPerCycle uint64
 	var cycleFrequency int64
@@ -39,10 +39,10 @@ func OpenDcaV2Parser(result *types.ParsedResult, instruction types.Instruction,
 		*startAt = int64(binary.LittleEndian.Uint64(decodedData[59:67]))
 	}
 
-	return &jupiterDCA.OpenV2Action{
+	return &jupiter_dca.OpenV2Action{
 		BaseAction: types.BaseAction{
 			ProgramID:       result.AccountList[instruction.ProgramIDIndex],
-			ProgramName:     jupiterDCA.ProgramName,
+			ProgramName:     jupiter_dca.ProgramName,
 			InstructionName: "OpenDcaV2",
 		},
 		InAmount:         inAmount,

solana/programs/jupiterDCA/parsers/open_dca_v2.go renamed to solana/programs/jupiter_dca/parsers/open_dca_v2.go

@@ -1,4 +1,4 @@
-package jupiterDCA
+package jupiter_dca
 
 import "github.com/0xjeffro/tx-parser/solana/types"
 

solana/programs/jupiterDCA/types.go renamed to solana/programs/jupiter_dca/types.go

@@ -0,0 +1,17 @@
+package photon_program
+
+import "github.com/0xjeffro/tx-parser/solana/types"
+
+type PhotonPumpfunBuyAction struct {
+	types.BaseAction
+	Who               string `json:"who"`
+	FromToken         string `json:"fromToken"`
+	FromTokenAmount   uint64 `json:"fromTokenAmount"`
+	FromTokenDecimals uint64 `json:"fromTokenDecimals"`
+	ToToken           string `json:"toToken"`
+	ToTokenAmount     uint64 `json:"toTokenAmount"`
+	ToTokenDecimals   uint64 `json:"toTokenDecimals"`
+
+	PumpfunFee uint64 `json:"pumpfunFee"`
+	PhotonFee  uint64 `json:"photonFee"`
+}

solana/programs/photon_program/types.go

@@ -5,10 +5,10 @@ import (
 	OKXDEXAggregationRouterV2Parsers "github.com/0xjeffro/tx-parser/solana/programs/OKXDEXAggregationRouterV2/parsers"
 	"github.com/0xjeffro/tx-parser/solana/programs/compute_budget"
 	ComputeBudgetParsers "github.com/0xjeffro/tx-parser/solana/programs/compute_budget/parsers"
-	"github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA"
-	JupiterDCA "github.com/0xjeffro/tx-parser/solana/programs/jupiterDCA/parsers"
 	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_aggregator_v6"
 	JupiterAggregatorV6 "github.com/0xjeffro/tx-parser/solana/programs/jupiter_aggregator_v6/parsers"
+	"github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca"
+	JupiterDCA "github.com/0xjeffro/tx-parser/solana/programs/jupiter_dca/parsers"
 	"github.com/0xjeffro/tx-parser/solana/programs/pumpfun"
 	PumpfunParsers "github.com/0xjeffro/tx-parser/solana/programs/pumpfun/parsers"
 	"github.com/0xjeffro/tx-parser/solana/programs/raydiumLiquidityPoolV4"
@@ -38,7 +38,7 @@ func router(result *types.ParsedResult, instructionIdx int) (action types.Action
 		return ComputeBudgetParsers.InstructionRouter(result, instruction)
 	case pumpfun.Program:
 		return PumpfunParsers.InstructionRouter(result, instruction)
-	case jupiterDCA.Program:
+	case jupiter_dca.Program:
 		return JupiterDCA.InstructionRouter(result, instruction)
 	case raydiumLiquidityPoolV4.Program:
 		return RaydiumLiquidityPoolV4.InstructionRouter(result, instruction, instructionIdx)