Add dlmm open and close

meta.go

@@ -76,6 +76,13 @@ var (
 	meteoraDlmmSwapExactOut2Discriminator                = calculateDiscriminator("global:swap_exact_out2")
 	meteoraDlmmSwapWithPriceImpactDiscriminator          = calculateDiscriminator("global:swap_with_price_impact")
 	meteoraDlmmSwapWithPriceImpact2Discriminator         = calculateDiscriminator("global:swap_with_price_impact2")
+	meteoraDlmmInitializePositionDiscriminator           = calculateDiscriminator("global:initialize_position")
+	meteoraDlmmInitializePosition2Discriminator          = calculateDiscriminator("global:initialize_position2")
+	meteoraDlmmInitializePositionByOperatorDiscriminator = calculateDiscriminator("global:initialize_position_by_operator")
+	meteoraDlmmInitializePositionPdaDiscriminator        = calculateDiscriminator("global:initialize_position_pda")
+	meteoraDlmmClosePositionDiscriminator                = calculateDiscriminator("global:close_position")
+	meteoraDlmmClosePosition2Discriminator               = calculateDiscriminator("global:close_position2")
+	meteoraDlmmClosePositionIfEmptyDiscriminator         = calculateDiscriminator("global:close_position_if_empty")
 	meteoraDlmmSwapEventDiscriminator                    = calculateDiscriminator("event:Swap")
 	meteoraDlmmAddLiquidityDiscriminator                 = calculateDiscriminator("global:add_liquidity")
 	meteoraDlmmAddLiquidity2Discriminator                = calculateDiscriminator("global:add_liquidity2")
@@ -91,6 +98,8 @@ var (
 	meteoraDlmmAddLiquidityEventDiscriminator            = calculateDiscriminator("event:AddLiquidity")
 	meteoraDlmmClaimFeeEventDiscriminator                = calculateDiscriminator("event:ClaimFee")
 	meteoraDlmmClaimFee2EventDiscriminator               = calculateDiscriminator("event:ClaimFee2")
+	meteoraDlmmPositionCloseEventDiscriminator           = calculateDiscriminator("event:PositionClose")
+	meteoraDlmmPositionCreateEventDiscriminator          = calculateDiscriminator("event:PositionCreate")
 	meteoraDlmmRebalancingEventDiscriminator             = calculateDiscriminator("event:Rebalancing")
 	meteoraDlmmRemoveLiquidityEventDiscriminator         = calculateDiscriminator("event:RemoveLiquidity")
 )

metaoradlmm.go

@@ -55,6 +55,17 @@ type dlmmRemoveLiquidityEvent struct {
 	ActiveBinId int32
 }
 
+type dlmmPositionCreateEvent struct {
+	LbPair   solana.PublicKey
+	Position solana.PublicKey
+	Owner    solana.PublicKey
+}
+
+type dlmmPositionCloseEvent struct {
+	Position solana.PublicKey
+	Owner    solana.PublicKey
+}
+
 type dlmmClaimFeeInnerEvent struct {
 	LbPair       solana.PublicKey
 	Position     solana.PublicKey
@@ -172,6 +183,18 @@ type dlmmRemoveLiquidityByRange2Args struct {
 	RemainingAccountsInfo dlmmRemainingAccountsInfo
 }
 
+type dlmmInitializePositionArgs struct {
+	LowerBinId int32
+	Width      int32
+}
+
+type dlmmInitializePositionByOperatorArgs struct {
+	LowerBinId       int32
+	Width            int32
+	FeeOwner         solana.PublicKey
+	LockReleasePoint uint64
+}
+
 type dlmmRemainingAccountsInfo struct{}
 
 func (dlmmRemainingAccountsInfo) UnmarshalWithDecoder(decoder *agbinary.Decoder) error {
@@ -245,6 +268,9 @@ func metaoradlmmParser(tx *Tx, instruction Instruction, innerInstructions InnerI
 	switch discriminator {
 	case meteoraInitializeLbPairDiscriminator:
 		return metaoradlmmInitializeParser(tx, instruction, innerInstructions, offset)
+	case meteoraDlmmInitializePositionDiscriminator, meteoraDlmmInitializePosition2Discriminator,
+		meteoraDlmmInitializePositionByOperatorDiscriminator, meteoraDlmmInitializePositionPdaDiscriminator:
+		return metaoradlmmPositionCreateParser(tx, instruction, innerInstructions, offset)
 	case meteoraDlmmSwapDiscriminator, meteoraDlmmSwapExactOutDiscriminator, meteoraDlmmSwapWithPriceImpactDiscriminator:
 		return metaoradlmmSwapParser(tx, instruction, innerInstructions, offset)
 	case meteoraDlmmSwap2Discriminator, meteoraDlmmSwapExactOut2Discriminator, meteoraDlmmSwapWithPriceImpact2Discriminator:
@@ -259,6 +285,8 @@ func metaoradlmmParser(tx *Tx, instruction Instruction, innerInstructions InnerI
 	case meteoraDlmmRemoveLiquidityDiscriminator, meteoraDlmmRemoveLiquidity2Discriminator,
 		meteoraDlmmRemoveLiquidityByRangeDiscriminator, meteoraDlmmRemoveLiquidityByRange2Discriminator:
 		return metaoradlmmRemoveLiquidityParser(tx, instruction, innerInstructions, offset)
+	case meteoraDlmmClosePositionDiscriminator, meteoraDlmmClosePosition2Discriminator, meteoraDlmmClosePositionIfEmptyDiscriminator:
+		return metaoradlmmPositionCloseParser(tx, instruction, innerInstructions, offset)
 	default:
 		return nil, increaseOffset(offset), InstructionIgnoredError
 	}
@@ -315,6 +343,141 @@ func metaoradlmmInitializeParser(tx *Tx, instruction Instruction, innerInstructi
 	return []Swap{swap}, offset, nil
 }
 
+func metaoradlmmPositionCreateParser(tx *Tx, instruction Instruction, innerInstructions InnerInstructions, offset [2]uint) ([]Swap, [2]uint, error) {
+	result := tx.rawTx
+
+	entryContract := result.accountList[result.Transaction.Message.Instructions[offset[0]].ProgramIDIndex]
+	if instruction.StackHeight != nil && *instruction.StackHeight > 2 {
+		for _, innerInstr := range innerInstructions.Instructions {
+			if innerInstr.StackHeight != nil && *innerInstr.StackHeight == *instruction.StackHeight-1 {
+				entryContract = result.accountList[innerInstr.ProgramIDIndex]
+				break
+			}
+		}
+	}
+
+	decode := instruction.Data
+	if len(decode) < 8 {
+		offset[1] += 1
+		return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm create position instruction data too short, offset, %d, %d", offset[0], offset[1])
+	}
+
+	discriminator := *(*[8]byte)(decode[:8])
+	var (
+		lowerBinId int32
+		width      int32
+	)
+
+	switch discriminator {
+	case meteoraDlmmInitializePositionDiscriminator, meteoraDlmmInitializePosition2Discriminator, meteoraDlmmInitializePositionPdaDiscriminator:
+		var args dlmmInitializePositionArgs
+		if err := agbinary.NewBorshDecoder(decode[8:]).Decode(&args); err != nil {
+			return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm create position decode error: %v, offset, %d, %d", err, offset[0], offset[1])
+		}
+		lowerBinId = args.LowerBinId
+		width = args.Width
+	case meteoraDlmmInitializePositionByOperatorDiscriminator:
+		var args dlmmInitializePositionByOperatorArgs
+		if err := agbinary.NewBorshDecoder(decode[8:]).Decode(&args); err != nil {
+			return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm create position by operator decode error: %v, offset, %d, %d", err, offset[0], offset[1])
+		}
+		lowerBinId = args.LowerBinId
+		width = args.Width
+	default:
+		return nil, increaseOffset(offset), InstructionIgnoredError
+	}
+
+	pool, positionAccount, eventUser, err := dlmmPositionCreateInstructionAccounts(result, discriminator, instruction.Accounts)
+	if err != nil {
+		return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm create position accounts parse error: %v, offset, %d, %d", err, offset[0], offset[1])
+	}
+
+	createEvent, nextOffset, err := dlmmPositionCreateEventFromInnerInstructions(innerInstructions, instruction, offset)
+	if err != nil {
+		return nil, nextOffset, err
+	}
+	offset = nextOffset
+
+	if !createEvent.LbPair.IsZero() {
+		pool = createEvent.LbPair
+	}
+	if !createEvent.Position.IsZero() {
+		positionAccount = createEvent.Position
+	}
+	if !createEvent.Owner.IsZero() {
+		eventUser = createEvent.Owner
+	}
+
+	swap := Swap{
+		Program:         SolProgramMeteoraDLMM,
+		Event:           "open",
+		Pool:            pool,
+		User:            eventUser,
+		EntryContract:   entryContract,
+		StartBinId:      lowerBinId,
+		EndBinId:        dlmmPositionUpperBinId(lowerBinId, width),
+		PositionAccount: positionAccount,
+	}
+
+	return []Swap{swap}, offset, nil
+}
+
+func metaoradlmmPositionCloseParser(tx *Tx, instruction Instruction, innerInstructions InnerInstructions, offset [2]uint) ([]Swap, [2]uint, error) {
+	result := tx.rawTx
+
+	entryContract := result.accountList[result.Transaction.Message.Instructions[offset[0]].ProgramIDIndex]
+	if instruction.StackHeight != nil && *instruction.StackHeight > 2 {
+		for _, innerInstr := range innerInstructions.Instructions {
+			if innerInstr.StackHeight != nil && *innerInstr.StackHeight == *instruction.StackHeight-1 {
+				entryContract = result.accountList[innerInstr.ProgramIDIndex]
+				break
+			}
+		}
+	}
+
+	decode := instruction.Data
+	if len(decode) < 8 {
+		offset[1] += 1
+		return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm close position instruction data too short, offset, %d, %d", offset[0], offset[1])
+	}
+
+	discriminator := *(*[8]byte)(decode[:8])
+	pool, positionAccount, eventUser, err := dlmmPositionCloseInstructionAccounts(result, discriminator, instruction.Accounts)
+	if err != nil {
+		return nil, increaseOffset(offset), fmt.Errorf("meteora dlmm close position accounts parse error: %v, offset, %d, %d", err, offset[0], offset[1])
+	}
+
+	closeEvent, nextOffset, found, err := dlmmPositionCloseEventFromInnerInstructions(innerInstructions, instruction, offset)
+	if err != nil {
+		return nil, nextOffset, err
+	}
+	if !found {
+		if discriminator == meteoraDlmmClosePositionIfEmptyDiscriminator {
+			return nil, nextOffset, InstructionIgnoredError
+		}
+		return nil, nextOffset, fmt.Errorf("meteora dlmm close position event not found, offset, %d, %d", nextOffset[0], nextOffset[1])
+	}
+	offset = nextOffset
+
+	if !closeEvent.Position.IsZero() {
+		positionAccount = closeEvent.Position
+	}
+	if !closeEvent.Owner.IsZero() {
+		eventUser = closeEvent.Owner
+	}
+
+	swap := Swap{
+		Program:         SolProgramMeteoraDLMM,
+		Event:           "close",
+		Pool:            pool,
+		User:            eventUser,
+		EntryContract:   entryContract,
+		PositionAccount: positionAccount,
+	}
+
+	return []Swap{swap}, offset, nil
+}
+
 func metaoradlmmSwapParser(tx *Tx, instruction Instruction, innerInstructions InnerInstructions, offset [2]uint) ([]Swap, [2]uint, error) {
 	result := tx.rawTx
 
@@ -506,6 +669,7 @@ func metaoradlmmSwapParser(tx *Tx, instruction Instruction, innerInstructions In
 		UserBaseBalance:   userBase,
 		UserQuoteBalance:  userQuote,
 		EntryContract:     entryContract,
+		ActiveBinId:       swapEvent.EndBinId,
 		StartBinId:        swapEvent.StartBinId,
 		EndBinId:          swapEvent.EndBinId,
 	}
@@ -699,9 +863,11 @@ func metaoradlmmAddLiquidityParser(tx *Tx, instruction Instruction, innerInstruc
 		UserBaseBalance:   userBase,
 		UserQuoteBalance:  userQuote,
 		EntryContract:     entryContract,
+		ActiveBinId:       addEvent.ActiveBinId,
 		StartBinId:        startBinId,
 		EndBinId:          endBinId,
 		BinChanges:        binChanges,
+		PositionAccount:   result.accountList[accounts.positionIdx],
 	}
 
 	return []Swap{swap}, offset, nil
@@ -731,6 +897,7 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		binChanges []DlmmBinLiquidityChange
 		startBinId int32
 		endBinId   int32
+		removeBp   int32
 	)
 
 	switch discriminator {
@@ -741,6 +908,7 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		}
 		binChanges = dlmmBinChangesFromReduction(args.BinLiquidityRemoval)
 		startBinId, endBinId = dlmmMinMaxBinIdFromReduction(args.BinLiquidityRemoval)
+		removeBp = dlmmCommonRemoveBp(args.BinLiquidityRemoval)
 	case meteoraDlmmRemoveLiquidity2Discriminator:
 		var args dlmmRemoveLiquidity2Args
 		if err := agbinary.NewBorshDecoder(decode[8:]).Decode(&args); err != nil {
@@ -748,6 +916,7 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		}
 		binChanges = dlmmBinChangesFromReduction(args.BinLiquidityRemoval)
 		startBinId, endBinId = dlmmMinMaxBinIdFromReduction(args.BinLiquidityRemoval)
+		removeBp = dlmmCommonRemoveBp(args.BinLiquidityRemoval)
 	case meteoraDlmmRemoveLiquidityByRangeDiscriminator:
 		var args dlmmRemoveLiquidityByRangeArgs
 		if err := agbinary.NewBorshDecoder(decode[8:]).Decode(&args); err != nil {
@@ -755,6 +924,7 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		}
 		startBinId = args.FromBinId
 		endBinId = args.ToBinId
+		removeBp = int32(args.BpsToRemove)
 		binChanges = dlmmBinChangesFromRange(startBinId, endBinId, args.BpsToRemove)
 	case meteoraDlmmRemoveLiquidityByRange2Discriminator:
 		var args dlmmRemoveLiquidityByRange2Args
@@ -763,6 +933,7 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		}
 		startBinId = args.FromBinId
 		endBinId = args.ToBinId
+		removeBp = int32(args.BpsToRemove)
 		binChanges = dlmmBinChangesFromRange(startBinId, endBinId, args.BpsToRemove)
 	default:
 		return nil, increaseOffset(offset), InstructionIgnoredError
@@ -867,9 +1038,12 @@ func metaoradlmmRemoveLiquidityParser(tx *Tx, instruction Instruction, innerInst
 		UserBaseBalance:   userBase,
 		UserQuoteBalance:  userQuote,
 		EntryContract:     entryContract,
+		ActiveBinId:       removeEvent.ActiveBinId,
 		StartBinId:        startBinId,
 		EndBinId:          endBinId,
+		RemoveBp:          removeBp,
 		BinChanges:        binChanges,
+		PositionAccount:   result.accountList[accounts.positionIdx],
 	}
 
 	return []Swap{swap}, offset, nil
@@ -985,8 +1159,10 @@ func metaoradlmmClaimFeeParser(tx *Tx, instruction Instruction, innerInstruction
 		UserBaseBalance:   userBase,
 		UserQuoteBalance:  userQuote,
 		EntryContract:     entryContract,
+		PositionAccount:   result.accountList[accounts.positionIdx],
 	}
 	if claimEvent.HasActiveBin {
+		swap.ActiveBinId = claimEvent.ActiveBinId
 		swap.StartBinId = claimEvent.ActiveBinId
 		swap.EndBinId = claimEvent.ActiveBinId
 	}
@@ -1107,9 +1283,11 @@ func metaoradlmmRebalanceLiquidityParser(tx *Tx, instruction Instruction, innerI
 			UserBaseBalance:   userBase,
 			UserQuoteBalance:  userQuote,
 			EntryContract:     entryContract,
+			ActiveBinId:       event.ActiveBinId,
 			StartBinId:        event.OldMinBinId,
 			EndBinId:          event.OldMaxBinId,
 			BinChanges:        dlmmBinChangesFromRange(event.OldMinBinId, event.OldMaxBinId, 0),
+			PositionAccount:   result.accountList[accounts.positionIdx],
 		})
 	}
 	if addBase > 0 || addQuote > 0 {
@@ -1131,9 +1309,11 @@ func metaoradlmmRebalanceLiquidityParser(tx *Tx, instruction Instruction, innerI
 			UserBaseBalance:   userBase,
 			UserQuoteBalance:  userQuote,
 			EntryContract:     entryContract,
+			ActiveBinId:       event.ActiveBinId,
 			StartBinId:        event.NewMinBinId,
 			EndBinId:          event.NewMaxBinId,
 			BinChanges:        dlmmBinChangesFromRange(event.NewMinBinId, event.NewMaxBinId, 0),
+			PositionAccount:   result.accountList[accounts.positionIdx],
 		})
 	}
 	if len(swaps) == 0 {
@@ -1266,6 +1446,54 @@ func dlmmRebalancingEventFromInnerInstructions(innerInstructions InnerInstructio
 	return dlmmRebalancingEvent{}, increaseOffset(offset), fmt.Errorf("meteora dlmm rebalance liquidity event not found, offset, %d, %d", offset[0], prefixLen)
 }
 
+func dlmmPositionCreateEventFromInnerInstructions(innerInstructions InnerInstructions, instruction Instruction, offset [2]uint) (dlmmPositionCreateEvent, [2]uint, error) {
+	var prefixLen = offset[1]
+	inners, err := getInnerInstructions(innerInstructions, prefixLen)
+	if err != nil {
+		return dlmmPositionCreateEvent{}, increaseOffset(offset), fmt.Errorf("meteora dlmm create position get inner instructions error: %v, offset, %d, %d", err, offset[0], prefixLen)
+	}
+	for innerIndex, innerInstr := range inners {
+		if innerInstr.ProgramIDIndex != instruction.ProgramIDIndex {
+			continue
+		}
+		event, ok := dlmmDecodePositionCreateEvent(innerInstr.Data)
+		if !ok {
+			continue
+		}
+		if offset[1] == 0 {
+			offset[0] += 1
+		} else {
+			offset[1] = uint(innerIndex) + 1 + prefixLen
+		}
+		return event, offset, nil
+	}
+	return dlmmPositionCreateEvent{}, increaseOffset(offset), fmt.Errorf("meteora dlmm create position event not found, offset, %d, %d", offset[0], prefixLen)
+}
+
+func dlmmPositionCloseEventFromInnerInstructions(innerInstructions InnerInstructions, instruction Instruction, offset [2]uint) (dlmmPositionCloseEvent, [2]uint, bool, error) {
+	var prefixLen = offset[1]
+	inners, err := getInnerInstructions(innerInstructions, prefixLen)
+	if err != nil {
+		return dlmmPositionCloseEvent{}, increaseOffset(offset), false, fmt.Errorf("meteora dlmm close position get inner instructions error: %v, offset, %d, %d", err, offset[0], prefixLen)
+	}
+	for innerIndex, innerInstr := range inners {
+		if innerInstr.ProgramIDIndex != instruction.ProgramIDIndex {
+			continue
+		}
+		event, ok := dlmmDecodePositionCloseEvent(innerInstr.Data)
+		if !ok {
+			continue
+		}
+		if offset[1] == 0 {
+			offset[0] += 1
+		} else {
+			offset[1] = uint(innerIndex) + 1 + prefixLen
+		}
+		return event, offset, true, nil
+	}
+	return dlmmPositionCloseEvent{}, increaseOffset(offset), false, nil
+}
+
 func dlmmDecodeAddLiquidityEvent(data []byte) (dlmmAddLiquidityEvent, bool) {
 	switch {
 	case len(data) >= 8 && bytes.Equal(data[:8], meteoraDlmmAddLiquidityEventDiscriminator[:]):
@@ -1308,6 +1536,48 @@ func dlmmDecodeRemoveLiquidityEvent(data []byte) (dlmmRemoveLiquidityEvent, bool
 	}
 }
 
+func dlmmDecodePositionCreateEvent(data []byte) (dlmmPositionCreateEvent, bool) {
+	switch {
+	case len(data) >= 8 && bytes.Equal(data[:8], meteoraDlmmPositionCreateEventDiscriminator[:]):
+		var event dlmmPositionCreateEvent
+		if err := agbinary.NewBorshDecoder(data[8:]).Decode(&event); err != nil {
+			return dlmmPositionCreateEvent{}, false
+		}
+		return event, true
+	case len(data) >= 16 &&
+		bytes.Equal(data[:8], eventDiscriminator[:]) &&
+		bytes.Equal(data[8:16], meteoraDlmmPositionCreateEventDiscriminator[:]):
+		var event dlmmPositionCreateEvent
+		if err := agbinary.NewBorshDecoder(data[16:]).Decode(&event); err != nil {
+			return dlmmPositionCreateEvent{}, false
+		}
+		return event, true
+	default:
+		return dlmmPositionCreateEvent{}, false
+	}
+}
+
+func dlmmDecodePositionCloseEvent(data []byte) (dlmmPositionCloseEvent, bool) {
+	switch {
+	case len(data) >= 8 && bytes.Equal(data[:8], meteoraDlmmPositionCloseEventDiscriminator[:]):
+		var event dlmmPositionCloseEvent
+		if err := agbinary.NewBorshDecoder(data[8:]).Decode(&event); err != nil {
+			return dlmmPositionCloseEvent{}, false
+		}
+		return event, true
+	case len(data) >= 16 &&
+		bytes.Equal(data[:8], eventDiscriminator[:]) &&
+		bytes.Equal(data[8:16], meteoraDlmmPositionCloseEventDiscriminator[:]):
+		var event dlmmPositionCloseEvent
+		if err := agbinary.NewBorshDecoder(data[16:]).Decode(&event); err != nil {
+			return dlmmPositionCloseEvent{}, false
+		}
+		return event, true
+	default:
+		return dlmmPositionCloseEvent{}, false
+	}
+}
+
 func dlmmDecodeClaimFeeEvent(data []byte) (dlmmClaimFeeInnerEvent, bool) {
 	switch {
 	case len(data) >= 16 &&
@@ -1366,6 +1636,40 @@ func dlmmDecodeRebalancingEvent(data []byte) (dlmmRebalancingEvent, bool) {
 	}
 }
 
+func dlmmPositionCreateInstructionAccounts(result *RawTx, discriminator [8]byte, accounts []int) (pool, position, owner solana.PublicKey, err error) {
+	switch discriminator {
+	case meteoraDlmmInitializePositionDiscriminator, meteoraDlmmInitializePosition2Discriminator:
+		if len(accounts) < 4 {
+			return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("accounts too short, expected at least 4")
+		}
+		return result.accountList[accounts[2]], result.accountList[accounts[1]], result.accountList[accounts[3]], nil
+	case meteoraDlmmInitializePositionByOperatorDiscriminator, meteoraDlmmInitializePositionPdaDiscriminator:
+		if len(accounts) < 5 {
+			return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("accounts too short, expected at least 5")
+		}
+		return result.accountList[accounts[3]], result.accountList[accounts[2]], result.accountList[accounts[4]], nil
+	default:
+		return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("unsupported create position discriminator")
+	}
+}
+
+func dlmmPositionCloseInstructionAccounts(result *RawTx, discriminator [8]byte, accounts []int) (pool, position, owner solana.PublicKey, err error) {
+	switch discriminator {
+	case meteoraDlmmClosePositionDiscriminator:
+		if len(accounts) < 5 {
+			return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("accounts too short, expected at least 5")
+		}
+		return result.accountList[accounts[1]], result.accountList[accounts[0]], result.accountList[accounts[4]], nil
+	case meteoraDlmmClosePosition2Discriminator, meteoraDlmmClosePositionIfEmptyDiscriminator:
+		if len(accounts) < 2 {
+			return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("accounts too short, expected at least 2")
+		}
+		return solana.PublicKey{}, result.accountList[accounts[0]], result.accountList[accounts[1]], nil
+	default:
+		return solana.PublicKey{}, solana.PublicKey{}, solana.PublicKey{}, fmt.Errorf("unsupported close position discriminator")
+	}
+}
+
 func resolveDlmmSwapAccounts(result *RawTx, accounts []int) (dlmmSwapAccounts, error) {
 	if len(accounts) < 13 {
 		return dlmmSwapAccounts{}, fmt.Errorf("accounts too short, expected at least 13")
@@ -1706,6 +2010,26 @@ func dlmmBinChangesFromRange(startBinId, endBinId int32, bpsToRemove uint16) []D
 	return changes
 }
 
+func dlmmCommonRemoveBp(reduction []dlmmBinLiquidityReduction) int32 {
+	if len(reduction) == 0 {
+		return 0
+	}
+	bpsToRemove := reduction[0].BpsToRemove
+	for _, item := range reduction[1:] {
+		if item.BpsToRemove != bpsToRemove {
+			return 0
+		}
+	}
+	return int32(bpsToRemove)
+}
+
+func dlmmPositionUpperBinId(lowerBinId, width int32) int32 {
+	if width <= 0 {
+		return lowerBinId
+	}
+	return lowerBinId + width - 1
+}
+
 func dlmmMinMaxBinIdFromDistribution(dist []dlmmBinLiquidityDistribution) (int32, int32) {
 	if len(dist) == 0 {
 		return 0, 0

tx.go

@@ -48,9 +48,12 @@ type Swap struct {
 	AfterSOLBalance decimal.Decimal
 
 	//For meteora dlmm
+	ActiveBinId int32
 	StartBinId  int32
 	EndBinId    int32
+	RemoveBp    int32
 	BinChanges  []DlmmBinLiquidityChange
+	PositionAccount solana.PublicKey
 
 	ConsumeUnit uint64
 }