fix: partial liq

Author: harsh-98

ds/execute_parser.go

@@ -42,6 +42,9 @@ func NewFacadeCallNameWithMulticall(facade, name string, multicalls []multicall.
 		facade:     common.HexToAddress(facade).Hex(),
 	}
 }
+func (obj *FacadeCallNameWithMulticall) AddMulticall(calls []multicall.Multicall2Call) {
+	obj.multiCalls = append(obj.multiCalls, calls...)
+}
 
 func (obj FacadeCallNameWithMulticall) String() string {
 	str := ""

ds/multicall_processor/index.go

@@ -4,6 +4,7 @@ import (
 	"github.com/Gearbox-protocol/sdk-go/core/schemas"
 	"github.com/Gearbox-protocol/third-eye/ds"
 	"github.com/Gearbox-protocol/third-eye/models/pool/pool_v3"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 const (
@@ -50,6 +51,7 @@ type MulticallProcessorI interface {
 	AddCloseEvent(event *schemas.AccountOperation)
 	AddLiquidateEvent(event *schemas.AccountOperation)
 	PopNonMulticallEvents() []*schemas.AccountOperation
-	PopMainActions(txHash string, mgr *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction)
+	PopMainActions(txHash string, mgr *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction, _ common.Address)
 	End(logId uint, debts []pool_v3.ManageDebt, _, _ string)
+	SetPartialLiq(account common.Address)
 }

ds/multicall_processor/multicall_processor_v2.go

@@ -6,6 +6,7 @@ import (
 	"github.com/Gearbox-protocol/sdk-go/utils"
 	"github.com/Gearbox-protocol/third-eye/ds"
 	"github.com/Gearbox-protocol/third-eye/models/pool/pool_v3"
+	"github.com/ethereum/go-ethereum/common"
 )
 
 type MultiCallProcessorv2 struct {
@@ -102,7 +103,7 @@ func (p *MultiCallProcessorv2) End(logId uint, _ []pool_v3.ManageDebt, _ string,
 // - open call without multicalls
 // - open call have the multicalls in them
 // liquidated, closed and directly multicalls are separated entries
-func (p *MultiCallProcessorv2) PopMainActions(_ string, _ *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction) {
+func (p *MultiCallProcessorv2) PopMainActions(_ string, _ *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction, _ common.Address) {
 	defer func() { p.facadeActions = nil }()
 	p.noOfOpens = 0
 	for _, entry := range p.facadeActions {
@@ -121,3 +122,5 @@ func (p *MultiCallProcessorv2) PopNonMulticallEvents() []*schemas.AccountOperati
 	p.nonMultiCallEvents = nil
 	return calls
 }
+func (p *MultiCallProcessorv2) SetPartialLiq(account common.Address) {
+}

ds/multicall_processor/multicall_processor_v3.go

@@ -194,6 +194,7 @@ func addQuotasToFacade(action *FacadeAccountAction, quotaEvents []*ds.UpdateQuot
 type MultiCallProcessorv3 struct {
 	units               map[string]*MultiCallProcessorv3Unit
 	facadeAddrToSession map[string]string
+	PartialLiqAccount   common.Address
 }
 
 func NewMultiCallProcessorv3() *MultiCallProcessorv3 {
@@ -265,7 +266,7 @@ func (p *MultiCallProcessorv3) PopNonMulticallEvents() []*schemas.AccountOperati
 	}
 	return calls
 }
-func (p *MultiCallProcessorv3) PopMainActions(txHash string, mgr *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction) {
+func (p *MultiCallProcessorv3) PopMainActions(txHash string, mgr *ds.AccountQuotaMgr) (facadeActions, openEventWithoutMulticall []*FacadeAccountAction, partialLiqAccount common.Address) {
 	quotas := mgr.GetUpdateQuotaEventForAccount(common.HexToHash(txHash))
 	for sessionId, unit := range p.units {
 		facade, openWithoutMC := unit.popMainActions(txHash, quotas[common.HexToAddress(strings.Split(sessionId, "_")[0])], mgr)
@@ -276,6 +277,8 @@ func (p *MultiCallProcessorv3) PopMainActions(txHash string, mgr *ds.AccountQuot
 	if len(p.facadeAddrToSession) != 0 {
 		log.Fatal("facadeAddrToSession not empty after popping main actions", utils.ToJson(p.facadeAddrToSession))
 	}
+	partialLiqAccount = p.PartialLiqAccount
+	p.PartialLiqAccount = core.NULL_ADDR
 	return
 
 }
@@ -292,3 +295,7 @@ func (p *MultiCallProcessorv3) End(logId uint, debts []pool_v3.ManageDebt, under
 	}
 	unit.End(logId, debts, underlyingtoken)
 }
+
+func (p *MultiCallProcessorv3) SetPartialLiq(account common.Address) {
+	p.PartialLiqAccount = account
+}

models/credit_manager/cm_common/facade_actions.go

@@ -19,15 +19,18 @@ import (
 // this function adds multicall to mainFacadeActions
 // if that is the correct structure of operation
 func (mdl *CommonCMAdapter) fixFacadeActionStructureViaTenderlyCalls(mainCalls []*ds.FacadeCallNameWithMulticall,
-	facadeActions []*mpi.FacadeAccountAction) (result []*mpi.FacadeAccountAction) { // facadeEvents from rpc, mainCalls from tenderly
+	facadeActions []*mpi.FacadeAccountAction, partialLiqAccount common.Address) (result []*mpi.FacadeAccountAction) { // facadeEvents from rpc, mainCalls from tenderly
 	if len(mainCalls) > len(facadeActions) {
-
-		log.Warn(utils.ToJson(mainCalls), utils.ToJson(facadeActions))
 		log.Warnf("Len of calls(%d) can't be more than separated close/liquidate and multicall(%d).",
 			len(mainCalls), len(facadeActions),
 		)
-		if "0x6355aa8c94e2db37e99bb6702dd66ef189d1d356cc3149081be247f72f526c8d" == facadeActions[0].Data.TxHash {
-			//mainCalls = []*ds.FacadeCallNameWithMulticall{mainCalls[1]}
+		if len(facadeActions) == 1 && len(mainCalls) == 2 && partialLiqAccount != core.NULL_ADDR { // in the partial declaration in the open call, there is no instruction done, and there is another separate multi-call where all the instructions are done.
+			if len(mainCalls[0].GetMulticalls()) != 0 || mainCalls[0].Name != ds.FacadeOpenMulticallCall {
+				log.Fatal("first main call should be open with multicall and no multicalls inside")
+			}
+			mainCalls[0].AddMulticall(mainCalls[1].GetMulticalls())
+			log.Warnf(" with partial liquidation for account %s, combining open with multicall", partialLiqAccount.Hex())
+			mainCalls = mainCalls[:1] // skip the first main call which is open with partial liquidation
 		}
 	}
 	//

models/credit_manager/cm_common/process_multicall.go

@@ -24,7 +24,7 @@ import (
 func (mdl CommonCMAdapter) ProcessRemainingMultiCalls(version core.VersionType, lastTxHash string, nonMultiCallExecuteEvents []ds.ExecuteParams) {
 
 	accountQuotaMgr := mdl.Repo.GetAccountQuotaMgr()
-	facadeActions, openEventWithoutMulticall := mdl.MulticallMgr.PopMainActions(lastTxHash, accountQuotaMgr)
+	facadeActions, openEventWithoutMulticall, partialLiqAccount := mdl.MulticallMgr.PopMainActions(lastTxHash, accountQuotaMgr)
 
 	// only for v2/v2.10
 	for _, entry := range openEventWithoutMulticall {
@@ -40,7 +40,7 @@ func (mdl CommonCMAdapter) ProcessRemainingMultiCalls(version core.VersionType,
 	}
 	if len(facadeActions) > 0 { // account operation will only exist if there are one or more facade actions
 		mainCalls := mdl.Repo.GetExecuteParser().GetMainCalls(lastTxHash, mdl.GetCreditFacadeAddr())
-		fixedFacadeActions := mdl.fixFacadeActionStructureViaTenderlyCalls(mainCalls, facadeActions)
+		fixedFacadeActions := mdl.fixFacadeActionStructureViaTenderlyCalls(mainCalls, facadeActions, partialLiqAccount)
 		mdl.validateAndSaveFacadeActions(version, lastTxHash, fixedFacadeActions, mainCalls, nonMultiCallExecuteEvents)
 	} else if len(nonMultiCallExecuteEvents) > 0 {
 		mdl.SaveExecuteEvents(lastTxHash, nonMultiCallExecuteEvents)

models/credit_manager/cm_v3/v3.go

@@ -128,6 +128,7 @@ func (mdl *CMv3) checkLogV3(txLog types.Log) {
 			},
 			Transfers: &core.Transfers{},
 		}
+		mdl.MulticallMgr.SetPartialLiq(creditAccount)
 		poolv3 := mdl.Repo.GetAdapter(mdl.State.PoolAddress).(*pool_v3.Poolv3)
 		debts := poolv3.GetDebt(txLog.TxHash, mdl.Address, txLog.Index)
 		multicall_processor.AddManageDebtsToMain(accountOp, debts, mdl.GetUnderlyingToken())

services/call_with_multicall.go

@@ -3,7 +3,8 @@ package services
 import (
 	"encoding/hex"
 	"reflect"
-"strings"
+	"strings"
+
 	"github.com/Gearbox-protocol/sdk-go/artifacts/multicall"
 	"github.com/Gearbox-protocol/sdk-go/core"
 	"github.com/Gearbox-protocol/sdk-go/log"
@@ -48,7 +49,7 @@ func (ep *ExecuteParser) getMainEvents(call *trace_service.Call, creditFacade co
 				"e3f46b26", // liquidateCreditAccount (v3) // v310, v3
 				"36b2ced3", // closeCreditAccount(creditAccount,to,skipTokenMask,convertToETH,calls)  // v310, v3
 				// "5d91a0e0", // liquidateCreditAccount
-//				"85589e10", //Partial
+				//				"85589e10", //Partial
 				"92beab1d": // openCreditAccount(onBehalfOf,calls,referralCode) // v310, v3
 				// log.Info("v3 main event", call.Input[2:10])
 				event, err := getCreditFacadeMainEvent(call.To, call.Input, creditFacadev3Parser)
@@ -79,8 +80,6 @@ func init() {
 	creditFacadev2Parser = core.GetAbi("CreditFacade")
 	creditFacadev3Parser = core.GetAbi("CreditFacadev3")
 
-
-
 }
 func getABI(data string) *abi.ABI {
 	abi, err := abi.JSON(strings.NewReader(data))
@@ -89,11 +88,8 @@ func getABI(data string) *abi.ABI {
 }
 
 var pp = "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"creditAccount\",\"type\":\"address\"},{\"internalType\":\"address\",\"name\":\"token\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"repaidAmount\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"minSeizedAmount\",\"type\":\"uint256\"},{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"components\":[{\"internalType\":\"address\",\"name\":\"priceFeed\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"internalType\":\"struct PriceUpdate[]\",\"name\":\"priceUpdates\",\"type\":\"tuple[]\"}],\"name\":\"partiallyLiquidateCreditAccount\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"seizedAmount\",\"type\":\"uint256\"}],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]"
+
 func getCreditFacadeMainEvent(contract string, input string, parser *abi.ABI) (*ds.FacadeCallNameWithMulticall, error) {
-	a :=input[2:10] == "85589e10"
-	if a { 
-parser = getABI(pp)
-	}
 	hexData, err := hex.DecodeString(input[2:])
 	if err != nil {
 		return nil, err
@@ -112,7 +108,7 @@ parser = getABI(pp)
 		Target   common.Address `json:"target"`
 		CallData []uint8        `json:"callData"`
 	})
-	if !ok && !a {
+	if !ok {
 		log.Fatal("calls type is different the creditFacade multicall: ", reflect.TypeOf(data["calls"]))
 	}
 	multicalls := []multicall.Multicall2Call{}