optimize attestation

Author: keithsue

x/dlc/keeper/attestation.go

@@ -22,6 +22,9 @@ func (k Keeper) HandleAttestation(ctx sdk.Context, sender string, eventId uint64
 	}
 
 	event := k.GetEvent(ctx, eventId)
+	if !event.HasTriggered {
+		return types.ErrEventNotTriggered
+	}
 
 	pubKeyBytes, _ := hex.DecodeString(event.Pubkey)
 	sigBytes, _ := hex.DecodeString(signature)
@@ -84,6 +87,20 @@ func (k Keeper) SetAttestation(ctx sdk.Context, attestation *types.DLCAttestatio
 
 	bz := k.cdc.MustMarshal(attestation)
 	store.Set(types.AttestationKey(attestation.Id), bz)
+
+	store.Set(types.AttestationByEventKey(attestation.EventId), sdk.Uint64ToBigEndian(attestation.Id))
+}
+
+// GetAttestationByEvent gets the attestation by the given event
+func (k Keeper) GetAttestationByEvent(ctx sdk.Context, eventId uint64) *types.DLCAttestation {
+	store := ctx.KVStore(k.storeKey)
+
+	bz := store.Get(types.AttestationByEventKey(eventId))
+	if bz == nil {
+		return nil
+	}
+
+	return k.GetAttestation(ctx, sdk.BigEndianToUint64(bz))
 }
 
 // GetAttestations gets attestations

x/dlc/types/errors.go

@@ -13,14 +13,15 @@ var (
 	ErrOracleDoesNotExist        = errorsmod.Register(ModuleName, 1104, "oracle does not exist")
 	ErrAgencyDoesNotExist        = errorsmod.Register(ModuleName, 1105, "agency does not exist")
 	ErrEventDoesNotExist         = errorsmod.Register(ModuleName, 1106, "event does not exist")
-	ErrInvalidParticipants       = errorsmod.Register(ModuleName, 1107, "invalid participants")
-	ErrUnauthorizedParticipant   = errorsmod.Register(ModuleName, 1108, "unauthorized participant")
-	ErrInvalidThreshold          = errorsmod.Register(ModuleName, 1109, "invalid threshold")
-	ErrPendingOraclePubKeyExists = errorsmod.Register(ModuleName, 1110, "pending oracle public key already exists")
-	ErrInvalidOracleStatus       = errorsmod.Register(ModuleName, 1111, "invalid oracle status")
-	ErrPendingAgencyPubKeyExists = errorsmod.Register(ModuleName, 1112, "pending agency public key already exists")
-	ErrInvalidAgencyStatus       = errorsmod.Register(ModuleName, 1113, "invalid agency status")
-	ErrDKGTimedOut               = errorsmod.Register(ModuleName, 1114, "dkg timed out")
+	ErrEventNotTriggered         = errorsmod.Register(ModuleName, 1107, "event not triggered")
+	ErrInvalidParticipants       = errorsmod.Register(ModuleName, 1108, "invalid participants")
+	ErrUnauthorizedParticipant   = errorsmod.Register(ModuleName, 1109, "unauthorized participant")
+	ErrInvalidThreshold          = errorsmod.Register(ModuleName, 1110, "invalid threshold")
+	ErrPendingOraclePubKeyExists = errorsmod.Register(ModuleName, 1111, "pending oracle public key already exists")
+	ErrInvalidOracleStatus       = errorsmod.Register(ModuleName, 1112, "invalid oracle status")
+	ErrPendingAgencyPubKeyExists = errorsmod.Register(ModuleName, 1113, "pending agency public key already exists")
+	ErrInvalidAgencyStatus       = errorsmod.Register(ModuleName, 1114, "invalid agency status")
+	ErrDKGTimedOut               = errorsmod.Register(ModuleName, 1115, "dkg timed out")
 
 	ErrInvalidParams = errorsmod.Register(ModuleName, 2100, "invalid params")
 )

x/dlc/types/keys.go

@@ -37,8 +37,9 @@ var (
 	EventByPriceKeyPrefix        = []byte{0x18} // prefix for each key to an event by triggering price
 	CurrentEventPriceKeyPrefix   = []byte{0x19} // key prefix for the current event price
 	AttestationKeyPrefix         = []byte{0x20} // prefix for each key to an attestation
+	AttestationByEventKeyPrefix  = []byte{0x21} // prefix for each key to an attestation by event
 
-	PriceKeyPrefix = []byte{0x20} // key prefix for the price
+	PriceKeyPrefix = []byte{0x30} // key prefix for the price
 )
 
 func OracleKey(id uint64) []byte {
@@ -91,6 +92,10 @@ func AttestationKey(id uint64) []byte {
 	return append(AttestationKeyPrefix, sdk.Uint64ToBigEndian(id)...)
 }
 
+func AttestationByEventKey(eventId uint64) []byte {
+	return append(AttestationByEventKeyPrefix, sdk.Uint64ToBigEndian(eventId)...)
+}
+
 func PriceKey(pair string) []byte {
 	return append(PriceKeyPrefix, []byte(pair)...)
 }

x/lending/module/abci.go

@@ -1,22 +1,25 @@
 package lending
 
 import (
+	"encoding/hex"
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	"github.com/sideprotocol/side/crypto/adaptor"
 	auctiontypes "github.com/sideprotocol/side/x/auction/types"
 	"github.com/sideprotocol/side/x/lending/keeper"
 	"github.com/sideprotocol/side/x/lending/types"
 )
 
 // EndBlocker called at every block
 func EndBlocker(ctx sdk.Context, k keeper.Keeper) {
-	handleLoans(ctx, k)
+	handleActiveLoans(ctx, k)
+	handleLiquidatedLoans(ctx, k)
 }
 
-// handleLoans handles loans
-func handleLoans(ctx sdk.Context, k keeper.Keeper) {
+// handleActiveLoans handles active loans
+func handleActiveLoans(ctx sdk.Context, k keeper.Keeper) {
 	// get all active loans
 	loans := k.GetLoans(ctx, types.LoanStatus_Disburse)
 
@@ -64,3 +67,28 @@ func handleLoans(ctx sdk.Context, k keeper.Keeper) {
 		}
 	}
 }
+
+// handleLiquidatedLoans handles liquidated loans
+func handleLiquidatedLoans(ctx sdk.Context, k keeper.Keeper) {
+	// get all liquidated loans
+	loans := k.GetLoans(ctx, types.LoanStatus_Liquidate)
+
+	for _, loan := range loans {
+		// check if the event attestation has been submitted
+		attestation := k.DLCKeeper().GetAttestationByEvent(ctx, loan.EventId)
+		if attestation == nil {
+			continue
+		}
+
+		adaptorSecret, _ := hex.DecodeString(attestation.Signature)
+
+		// TODO: get borrower adaptor signature from CET
+		adaptorSignature := []byte{}
+
+		// decrypt the adaptor signature
+		adaptedSig := adaptor.Adapt(adaptorSignature, adaptorSecret)
+
+		// TODO: set CET
+		_ = adaptedSig
+	}
+}

x/lending/types/expected_keepers.go

@@ -52,6 +52,8 @@ type AuctionKeeper interface {
 // DLCKeeper defines the expected DLC keeper interface
 type DLCKeeper interface {
 	GetEvent(ctx sdk.Context, id uint64) *dlctypes.DLCPriceEvent
+	GetAttestationByEvent(ctx sdk.Context, eventId uint64) *dlctypes.DLCAttestation
+
 	TriggerEvent(ctx sdk.Context, id uint64)
 }