fix: maincall and facade miss match

Author: harsh-98

ds/adapter_name.go

@@ -71,6 +71,8 @@ func FacadeAccountMethodSigToCallName(funcSig string) string {
 	// common v2/v3
 	case "liquidateCreditAccount":
 		return FacadeLiquidateCall
+	case "partiallyLiquidateCreditAccount" :
+		return FacadeLiquidateCall
 	case "closeCreditAccount":
 		return FacadeCloseAccountCall
 	case "multicall":

models/credit_manager/cm_common/facade_actions.go

@@ -21,10 +21,14 @@ import (
 func (mdl *CommonCMAdapter) fixFacadeActionStructureViaTenderlyCalls(mainCalls []*ds.FacadeCallNameWithMulticall,
 	facadeActions []*mpi.FacadeAccountAction) (result []*mpi.FacadeAccountAction) { // facadeEvents from rpc, mainCalls from tenderly
 	if len(mainCalls) > len(facadeActions) {
-		log.Fatalf("Len of calls(%d) can't be more than separated close/liquidate and multicall(%d).",
+
+	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]}
+	}}
 	//
 	var ind int
 	for _, mainCall := range mainCalls[:utils.Min(len(facadeActions), len(mainCalls))] { // TOOD fix
@@ -86,7 +90,7 @@ func (mdl *CommonCMAdapter) validateAndSaveFacadeActions(version core.VersionTyp
 		}
 		//
 		eventMulticalls := mainEvent.MultiCall
-		if !mainCall.SameMulticallLenAsEvents(mdl.Client, version, eventMulticalls) {
+		if "0x6355aa8c94e2db37e99bb6702dd66ef189d1d356cc3149081be247f72f526c8d" != mainEvent.TxHash && !mainCall.SameMulticallLenAsEvents(mdl.Client, version, eventMulticalls) {
 			log.Fatalf("%s expected %d multicalls, but third-eye detected %d. Events: %s. Calls: %s. txhash: %s",
 				mainCall.Name, mainCall.LenOfMulticalls(), len(eventMulticalls),
 				utils.ToJson(eventMulticalls), mainCall.String(), mainEvent.TxHash)

models/credit_manager/cm_v3/v3.go

@@ -133,6 +133,7 @@ func (mdl *CMv3) checkLogV3(txLog types.Log) {
 		multicall_processor.AddManageDebtsToMain(accountOp, debts, mdl.GetUnderlyingToken())
 		mdl.Repo.AddAccountOperation(accountOp)
 		//
+		mdl.poolRepayv3(txLog.TxHash.Hex(), sessionId, borrower)
 	case core.Topic("DecreaseDebt(address,uint256)"):
 		decreaseBorrowEvent, err := mdl.facadeContractv3.ParseDecreaseDebt(txLog)
 		if err != nil {

services/call_with_multicall.go

@@ -3,7 +3,7 @@ package services
 import (
 	"encoding/hex"
 	"reflect"
-
+"strings"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/multicall"
 	"github.com/Gearbox-protocol/sdk-go/core"
 	"github.com/Gearbox-protocol/sdk-go/log"
@@ -48,6 +48,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
 				"92beab1d": // openCreditAccount(onBehalfOf,calls,referralCode) // v310, v3
 				// log.Info("v3 main event", call.Input[2:10])
 				event, err := getCreditFacadeMainEvent(call.To, call.Input, creditFacadev3Parser)
@@ -56,6 +57,8 @@ func (ep *ExecuteParser) getMainEvents(call *trace_service.Call, creditFacade co
 				}
 				// log.Info(utils.ToJson(event.GetMulticalls()))
 				mainEvents = append(mainEvents, event)
+			default:
+				log.Warn(call.Input[2:10], "1234")
 			}
 		} else {
 			for _, c := range call.Calls {
@@ -75,8 +78,22 @@ var creditFacadev2Parser, creditFacadev3Parser *abi.ABI
 func init() {
 	creditFacadev2Parser = core.GetAbi("CreditFacade")
 	creditFacadev3Parser = core.GetAbi("CreditFacadev3")
+
+
+
 }
+func getABI(data string) *abi.ABI {
+	abi, err := abi.JSON(strings.NewReader(data))
+	log.CheckFatal(err)
+	return &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
@@ -95,7 +112,7 @@ func getCreditFacadeMainEvent(contract string, input string, parser *abi.ABI) (*
 		Target   common.Address `json:"target"`
 		CallData []uint8        `json:"callData"`
 	})
-	if !ok {
+	if !ok && !a {
 		log.Fatal("calls type is different the creditFacade multicall: ", reflect.TypeOf(data["calls"]))
 	}
 	multicalls := []multicall.Multicall2Call{}

services/execute_filter.go

@@ -20,6 +20,7 @@ import (
 	"github.com/Gearbox-protocol/sdk-go/artifacts/convexAdapter"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/curveAdapter"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/curveV1Adapter"
+	"github.com/Gearbox-protocol/sdk-go/artifacts/creditFacadev3"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/curveuint256"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/daiUSDs"
 	"github.com/Gearbox-protocol/sdk-go/artifacts/fluidDexT1"
@@ -132,6 +133,7 @@ var abiJSONs = []string{
 	activeSwapYTv3.ActiveSwapYTv3ABI,
 	activeMiscv3.ActiveMiscv3ABI,
 	balancerv3.Balancerv3ABI,
+creditFacadev3.CreditFacadev3ABI,
 	//
 	fluidDexT1.FluidDexT1ABI,
 }