Merge branch 'master' of https://go.onsig.ai/onsig/libsam

pkg/shreder/program_dlmm.go

@@ -122,6 +122,10 @@ func parseDlmmInstruction(tx VersionedTransaction, instructionIndex int) (TxSign
 	if err != nil {
 		return nil, err
 	}
+	lbPair, err := tx.GetAccount(int(instruction.Accounts[0]))
+	if err != nil {
+		return nil, err
+	}
 	userTokenOut, err := tx.GetAccount(int(instruction.Accounts[5]))
 	if err != nil {
 		return nil, err
@@ -220,6 +224,7 @@ func parseDlmmInstruction(tx VersionedTransaction, instructionIndex int) (TxSign
 		ExactSOL:           exactSol,
 		ActiveBin:          args.ActiveBin,
 		MaxPriceImpactBps:  args.MaxPriceImpactBps,
+		LbPairAddress:      lbPair.String(),
 		Block:              tx.Block,
 		Token0AmountUint64: token0AmountUint64,
 		Token1AmountUint64: token1AmountUint64,

pkg/shreder/program_flas.go

@@ -10,8 +10,8 @@ import (
 
 var flasProgramID = solana.MustPublicKeyFromBase58("FLASHX8DrLbgeR8FcfNV1F5krxYcYMUdBkrP1EPBtxB9")
 var (
-	flasBuyTokensIX     = []byte{0x00, 0x1, 0x4}
-	flasSellTokensIX    = []byte{0x01, 0x1, 0x3}
+	flasBuyTokensIX     = []byte{0x00, 0x1, 0x1b}
+	flasSellTokensIX    = []byte{0x01, 0x1, 0x1a}
 	flasAmmBuyTokensIX  = []byte{0x00, 0x2, 0x2}
 	flasAmmSellTokensIX = []byte{0x01, 0x2, 0x2}
 )

pkg/shreder/program_juptierv6.go

@@ -1122,6 +1122,8 @@ func parseJupiterPumpAmmRoute(tx VersionedTransaction, instruction Instructions,
 		isBuy       bool
 		isSell      bool
 		count       int
+		sellPercent uint8
+		buyPercent  uint8
 	)
 	for _, step := range plan {
 		if !isInputIdx0(step.InputIdx) {
@@ -1130,9 +1132,11 @@ func parseJupiterPumpAmmRoute(tx VersionedTransaction, instruction Instructions,
 		if isPumpSwapSellKind(step.Swap.Kind) {
 			isSell = true
 			count++
+			sellPercent = step.Percent
 		} else if isPumpSwapBuyKind(step.Swap.Kind) {
 			isBuy = true
 			count++
+			buyPercent = step.Percent
 		}
 	}
 	if count == 0 {
@@ -1154,6 +1158,9 @@ func parseJupiterPumpAmmRoute(tx VersionedTransaction, instruction Instructions,
 		if in > 0 {
 			token0Amount = formatTokenAmount(in)
 		}
+		if sellPercent > 0 && sellPercent < 100 {
+			token0Amount = token0Amount.Mul(decimal.NewFromInt(int64(sellPercent))).Div(decimal.NewFromInt(100))
+		}
 		return &TxSignal{
 			TxHash:             tx.Signatures[0].String(),
 			Maker:              tx.StaticAccountKeys[0].String(),
@@ -1189,6 +1196,10 @@ func parseJupiterPumpAmmRoute(tx VersionedTransaction, instruction Instructions,
 	if in > 0 {
 		token1Amount = formatSolAmount(in)
 	}
+	if buyPercent > 0 && buyPercent < 100 {
+		token1Amount = token1Amount.Mul(decimal.NewFromInt(int64(buyPercent))).Div(decimal.NewFromInt(100))
+		token0Amount = token0Amount.Mul(decimal.NewFromInt(int64(buyPercent))).Div(decimal.NewFromInt(100))
+	}
 	return &TxSignal{
 		TxHash:             tx.Signatures[0].String(),
 		Maker:              tx.StaticAccountKeys[0].String(),

pkg/shreder/program_juptierv6_test.go

@@ -67,6 +67,10 @@ func TestDecodeRouteArg(t *testing.T) {
 			name:    "Jupiter V6 RouteArg Test 1",
 			hexData: "e517cb977ae3ad2a03000000646400017ab0b6c3d206f46577050000000c0000526401025f00640203bb628e2902000000338c430100000000320000",
 		},
+		{
+			name:    "Jupiter V6 RouteArg Test 2",
+			hexData: "e517cb977ae3ad2a04000000642300024b00000000410002761acfb15ea9fdcd0501200204769358e96343759bf8014402046196591e1e020000f5bf6fe101000000d00700",
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/shreder/tx.go

@@ -55,6 +55,8 @@ type TxSignal struct {
 	ActiveBin int32 `json:"active_bin"`
 	// MaxPriceImpactBps is the price impact guard for swap_with_price_impact(2).
 	MaxPriceImpactBps uint16 `json:"max_price_impact_bps"`
+	//
+	LbPairAddress string `json:"lb_pair_address"`
 
 	// parsed values
 	Token0AmountUint64 uint64 `json:"-"`