merge

cmd/shreder/main.go

@@ -84,8 +84,13 @@ func main() {
 		case txBatch := <-txCh:
 			//jsonData, _ := json.MarshalIndent(txBatch, "", "  ")
 			for _, tx := range txBatch {
-				if tx.Label == "jupiterV6" {
+				if tx.Label == "flas" {
-					fmt.Println("===============", tx.TxHash, tx.Token0Address, tx.Token0Amount)
+					if tx.Event == "buy" {
+						fmt.Println("===============", tx.TxHash, tx.Program, tx.Event, tx.Token0Address, "token:", tx.Token0Amount, "sol:", tx.Token1Amount)
+					} else if tx.Event == "sell" {
+						fmt.Println("===============", tx.TxHash, tx.Program, tx.Event, tx.Token0Address, "token:", tx.Token0Amount)
+
+					}
 				}
 			}
 			//fmt.Println(txBatch[0].TxHash)

pkg/shreder/tx.go

@@ -45,6 +45,7 @@ type TxSignal struct {
 	IsToken2022   bool            `json:"is_token2022"`
 	IsMayhemMode  bool            `json:"is_mayhem_mode"`
 	TxFee         decimal.Decimal `json:"tx_fee"`
+	EntryContract string          `json:"entry_contract"`
 
 	ExactSOL bool `json:"exact_in"`
 

pkg/shreder/txparser.go

@@ -148,9 +148,9 @@ type f5tfBuyArgs struct {
 	TokenAmount uint64
 }
 
-type flasBuyArgs struct {
+type flasArgs struct {
-	SolAmount   uint64
+	Amount1     uint64
-	TokenAmount uint64
+	Amount2     uint64
 	Placeholder [3]uint8
 }
 
@@ -171,16 +171,6 @@ type pumpAmmBuyArgs struct {
 	MaxSolCost uint64
 }
 
-type _6hb1BuyArgs struct {
-	SolAmount   uint64
-	TokenNumber uint64
-}
-
-type _8rsrBuyArgs struct {
-	SolIn    uint64
-	TokenOut uint64
-}
-
 type boboBuyArgs struct {
 	Placeholder1 uint64
 	Placeholder2 uint64
@@ -254,44 +244,44 @@ func ParseTransaction(update *SubscribeUpdateTransaction, loader *AddressTables)
 		switch programID {
 		case pumpProgramID:
 			txRes, err := parsePumpInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "pump")
+			parsed = appendParsed(parsed, txRes, err, txHash, "pump", pumpProgramID.String())
 		case azczProgramID:
 			txRes, err := parseAzczInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "azcz")
+			parsed = appendParsed(parsed, txRes, err, txHash, "azcz", azczProgramID.String())
 		case f5tfProgramID:
 			txRes, err := parseF5tfInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "f5tf")
+			parsed = appendParsed(parsed, txRes, err, txHash, "f5tf", f5tfProgramID.String())
 		case flasProgramID:
 			txRes, err := parseFlasInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "flas")
+			parsed = appendParsed(parsed, txRes, err, txHash, "flas", flasProgramID.String())
 		case photonProgramID:
 			txRes, err := parsePhotonInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "photon")
+			parsed = appendParsed(parsed, txRes, err, txHash, "photon", photonProgramID.String())
 		case pumpAmmProgramID:
 			txRes, err := parsePumpAmmInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "pumpamm")
+			parsed = appendParsed(parsed, txRes, err, txHash, "pumpamm", pumpAmmProgramID.String())
 		case boboProgramID:
 			txRes, err := parseBoboInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "bobo")
+			parsed = appendParsed(parsed, txRes, err, txHash, "bobo", boboProgramID.String())
 		case qtkvProgramID:
 			txRes, err := parseQtkvInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "qtkv")
+			parsed = appendParsed(parsed, txRes, err, txHash, "qtkv", qtkvProgramID.String())
 		case fjszProgramID:
 			txRes, err := parseFjszInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "fjsz")
+			parsed = appendParsed(parsed, txRes, err, txHash, "fjsz", fjszProgramID.String())
 		case terminalProgramID:
 			txRes, err := parseTermInstruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "terminal")
+			parsed = appendParsed(parsed, txRes, err, txHash, "terminal", terminalProgramID.String())
 		case jupiterV6ProgramID:
 			txRes, err := parseJupiterV6Instruction(versioned, i)
-			parsed = appendParsed(parsed, txRes, err, txHash, "jupiterv6")
+			parsed = appendParsed(parsed, txRes, err, txHash, "jupiterv6", jupiterV6ProgramID.String())
 		}
 	}
 
 	return parsed
 }
 
-func appendParsed(list []*TxSignal, parsed *TxSignal, err error, txHash [64]byte, label string) []*TxSignal {
+func appendParsed(list []*TxSignal, parsed *TxSignal, err error, txHash [64]byte, label string, entryContract string) []*TxSignal {
 	if err != nil {
 		if !strings.HasPrefix(err.Error(), "account index") {
 			logger.Debug("txparser: failed to parse", "label", label, "instruction", err, "tx_hash", base58.Encode(txHash[:]))
@@ -299,6 +289,7 @@ func appendParsed(list []*TxSignal, parsed *TxSignal, err error, txHash [64]byte
 		return list
 	}
 	if parsed != nil {
+		parsed.EntryContract = entryContract
 		list = append(list, parsed)
 	}
 	return list
@@ -766,10 +757,10 @@ func parseFlasInstruction(tx *versionedTransaction, instructionIndex int) (*TxSi
 		return nil, fmt.Errorf("data too short for args flas instruction, len: %d", len(instruction.Data))
 	}
 	methodData := instruction.Data[17:20]
-	if !matchMethod(methodData, flasBuyTokensIX) {
+	//if !matchMethod(methodData, flasBuyTokensIX) {
-		return nil, nil
+	//	return nil, nil
-	}
+	//}
-	if matchMethod(methodData, f5tfBuyTokensIX) {
+	if matchMethod(methodData, flasBuyTokensIX) {
 		return parseFlasBuy(tx, instructionIndex)
 	} else if matchMethod(methodData, flasSellTokensIX) {
 		return parseFlasSell(tx, instructionIndex)
@@ -797,7 +788,7 @@ func parseFlasAmmSell(tx *versionedTransaction, instructionIndex int) (*TxSignal
 		return nil, err
 	}
 
-	var args flasBuyArgs
+	var args flasArgs
 	if err := borsh.Deserialize(&args, instruction.Data[1:]); err != nil {
 		return nil, fmt.Errorf("failed to parse buy tokens args: %w", err)
 	}
@@ -808,16 +799,16 @@ func parseFlasAmmSell(tx *versionedTransaction, instructionIndex int) (*TxSignal
 		Maker:              user.String(),
 		Token0Address:      mint.String(),
 		Token1Address:      wsolMint,
-		Token0Amount:       decimal.Zero,
+		Token0Amount:       formatSolAmount(args.Amount1),
-		Token1Amount:       formatSolAmount(args.TokenAmount),
+		Token1Amount:       formatSolAmount(args.Amount2),
-		Program:            "Pump",
+		Program:            "PumpAMM",
 		Event:              "sell",
 		IsToken2022:        false,
 		IsMayhemMode:       false,
-		ExactSOL:           true,
+		ExactSOL:           false,
 		Block:              tx.Block,
-		Token0AmountUint64: 0,
+		Token0AmountUint64: args.Amount1,
-		Token1AmountUint64: args.TokenAmount,
+		Token1AmountUint64: args.Amount2,
 	}, nil
 }
 
@@ -837,7 +828,7 @@ func parseFlasAmmBuy(tx *versionedTransaction, instructionIndex int) (*TxSignal,
 		return nil, err
 	}
 
-	var args flasBuyArgs
+	var args flasArgs
 	if err := borsh.Deserialize(&args, instruction.Data[1:]); err != nil {
 		return nil, fmt.Errorf("failed to parse buy tokens args: %w", err)
 	}
@@ -849,15 +840,15 @@ func parseFlasAmmBuy(tx *versionedTransaction, instructionIndex int) (*TxSignal,
 		Token0Address:      mint.String(),
 		Token1Address:      wsolMint,
 		Token0Amount:       decimal.Zero,
-		Token1Amount:       formatSolAmount(args.TokenAmount),
+		Token1Amount:       formatSolAmount(args.Amount1),
-		Program:            "Pump",
+		Program:            "PumpAMM",
-		Event:              "sell",
+		Event:              "buy",
 		IsToken2022:        false,
 		IsMayhemMode:       false,
 		ExactSOL:           true,
 		Block:              tx.Block,
 		Token0AmountUint64: 0,
-		Token1AmountUint64: args.TokenAmount,
+		Token1AmountUint64: args.Amount1,
 	}, nil
 }
 
@@ -877,7 +868,7 @@ func parseFlasSell(tx *versionedTransaction, instructionIndex int) (*TxSignal, e
 		return nil, err
 	}
 
-	var args flasBuyArgs
+	var args flasArgs
 	if err := borsh.Deserialize(&args, instruction.Data[1:]); err != nil {
 		return nil, fmt.Errorf("failed to parse buy tokens args: %w", err)
 	}
@@ -888,15 +879,15 @@ func parseFlasSell(tx *versionedTransaction, instructionIndex int) (*TxSignal, e
 		Maker:              user.String(),
 		Token0Address:      mint.String(),
 		Token1Address:      wsolMint,
-		Token0Amount:       formatTokenAmount(args.TokenAmount),
+		Token0Amount:       formatTokenAmount(args.Amount1),
-		Token1Amount:       formatSolAmount(args.SolAmount),
+		Token1Amount:       formatSolAmount(args.Amount2),
 		Program:            "Pump",
 		Event:              "sell",
 		IsToken2022:        false,
 		IsMayhemMode:       false,
 		Block:              tx.Block,
-		Token0AmountUint64: args.TokenAmount,
+		Token0AmountUint64: args.Amount1,
-		Token1AmountUint64: args.SolAmount,
+		Token1AmountUint64: args.Amount2,
 	}, nil
 }
 
@@ -915,8 +906,10 @@ func parseFlasBuy(tx *versionedTransaction, instructionIndex int) (*TxSignal, er
 	if err != nil {
 		return nil, err
 	}
-
+	if len(instruction.Data) > 20 {
-	var args flasBuyArgs
+		instruction.Data = instruction.Data[:20]
+	}
+	var args flasArgs
 	if err := borsh.Deserialize(&args, instruction.Data[1:]); err != nil {
 		return nil, fmt.Errorf("failed to parse buy tokens args: %w", err)
 	}
@@ -927,16 +920,16 @@ func parseFlasBuy(tx *versionedTransaction, instructionIndex int) (*TxSignal, er
 		Maker:              user.String(),
 		Token0Address:      mint.String(),
 		Token1Address:      wsolMint,
-		Token0Amount:       formatTokenAmount(args.TokenAmount),
+		Token0Amount:       formatTokenAmount(args.Amount2),
-		Token1Amount:       formatSolAmount(args.SolAmount),
+		Token1Amount:       formatSolAmount(args.Amount1),
 		Program:            "Pump",
 		Event:              "buy",
 		IsToken2022:        false,
 		IsMayhemMode:       false,
 		ExactSOL:           true,
 		Block:              tx.Block,
-		Token0AmountUint64: args.TokenAmount,
+		Token0AmountUint64: args.Amount2,
-		Token1AmountUint64: args.SolAmount,
+		Token1AmountUint64: args.Amount1,
 	}, nil
 }
 

pkg/shreder/txparser_test.go

@@ -0,0 +1,56 @@
+package shreder
+
+import (
+	"encoding/hex"
+	"testing"
+
+	"github.com/near/borsh-go"
+)
+
+func TestDecodeAxiomArgs(t *testing.T) {
+	tests := []struct {
+		name    string
+		hexData string
+	}{
+		{
+			name:    "pump amm sell Test 0",
+			hexData: "00686f08bb1b0000007eb4ac020000000001020200183c",
+		},
+		{
+			name:    "pump amm buy Test 1",
+			hexData: "00c09ee6050000000001c94d882600000000020200323c",
+		},
+		{
+			name:    "pump buy Test 2",
+			hexData: "00d8d3bc0000000000bb7c53f009000000000104185a",
+		},
+		{
+			name:    "pump sell Test 3",
+			hexData: "009bbf69ec08080000830bc61200000000010103a000",
+		},
+		{
+			name:    "pump swap sell Test 4",
+			hexData: "00c98ea7588b0000009adf3b010000000001020200283c",
+		},
+		{
+			name:    "pump swap sell Test 5",
+			hexData: "00d3727f9301000000f9a50b0100000000010202001e00",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			data, err := hex.DecodeString(tt.hexData)
+			if err != nil {
+				t.Fatalf("failed to decode hex string: %v", err)
+				return
+			}
+			var args flasArgs
+			if err := borsh.Deserialize(&args, data[1:]); err != nil {
+				t.Fatalf("failed to decode Axiom args: %v", err)
+				return
+			}
+			t.Logf("Decoded Axiom Args: %+v", args)
+		})
+	}
+}