remove loan hash lock

Author: keithsue

api/side/lending/lending.pulsar.go

@@ -78,59 +78,55 @@ enum LoanStatus {
     Unspecified = 0;
     // Loan Requested
     Requested = 1;
-    // Loan Approved
-    Approved = 2;
+    // Loan Open
+    Open = 2;
     // Loan Rejected
     Rejected = 3;
     // Loan Cancelled
     Cancelled = 4;
-    // Loan Open
-    Open = 5;
     // Loan Repaid
-    Repaid = 6;
+    Repaid = 5;
     // Loan Defaulted
-    Defaulted = 7;
+    Defaulted = 6;
     // Loan Liquidated
-    Liquidated = 8;
+    Liquidated = 7;
     // Loan Closed
-    Closed = 9;
+    Closed = 8;
 }
 
 message Loan {
     string vault_address = 1; // id
     string borrower = 2;
     string borrowerPubKey = 3;
     string agency = 4;
-    string hash_loan_secret = 5;
-    int64 maturity_time = 6;
-    int64 final_timeout = 7; 
+    int64 maturity_time = 5;
+    int64 final_timeout = 6;
 
-    cosmos.base.v1beta1.Coin borrow_amount = 8;
-    string fees = 9 [
+    cosmos.base.v1beta1.Coin borrow_amount = 7;
+    string fees = 8 [
         (gogoproto.customtype) = "cosmossdk.io/math.Int",
         (gogoproto.nullable) = false
       ];
-    string interests = 10 [
+    string interests = 9 [
         (gogoproto.customtype) = "cosmossdk.io/math.Int",
         (gogoproto.nullable) = false
       ];
 
-    string term = 11 [
+    string term = 10 [
         (gogoproto.customtype) = "cosmossdk.io/math.Int",
         (gogoproto.nullable) = false
       ];
-    uint64 event_id = 12;
-    uint64 attestation_id = 13;
-    repeated string deposit_txs = 14;
-    string collateral_amount = 15 [
+    uint64 event_id = 11;
+    uint64 attestation_id = 12;
+    repeated string deposit_txs = 13;
+    string collateral_amount = 14 [
         (gogoproto.customtype) = "cosmossdk.io/math.Int",
         (gogoproto.nullable) = false
       ];
-    string pool_id = 16;
-    uint64 auction_id = 17;
-    string loan_secret = 18;
-    google.protobuf.Timestamp create_at = 19 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
-    LoanStatus status = 20;
+    string pool_id = 15;
+    uint64 auction_id = 16;
+    google.protobuf.Timestamp create_at = 17 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true];
+    LoanStatus status = 18;
 }
 
 message DLCMeta {

api/side/lending/query.pulsar.go

@@ -112,8 +112,7 @@ message QueryLiquidationCetResponse {
 message QueryCollateralAddressRequest{
     string borrower_pubkey = 1;
     string agency_pubkey = 2;
-    string hash_of_loan_secret = 3;
-    uint64 maturity_time = 4;
+    uint64 maturity_time = 3;
 }
 
 message QueryCollateralAddressResponse{

api/side/lending/tx.pulsar.go

@@ -22,7 +22,6 @@ service Msg {
     rpc Approve(MsgApprove) returns (MsgApproveResponse);
     rpc Cancel(MsgCancel) returns (MsgCancelResponse);
     rpc SubmitCancellationSignatures(MsgSubmitCancellationSignatures) returns (MsgSubmitCancellationSignaturesResponse);
-    rpc Redeem(MsgRedeem) returns (MsgRedeemResponse);
     rpc Repay(MsgRepay) returns (MsgRepayResponse);
     rpc SubmitRepaymentAdaptorSignatures(MsgSubmitRepaymentAdaptorSignatures) returns (MsgSubmitRepaymentAdaptorSignaturesResponse);
     rpc SubmitLiquidationCetSignatures(MsgSubmitLiquidationCetSignatures) returns (MsgSubmitLiquidationCetSignaturesResponse);
@@ -76,15 +75,6 @@ message MsgRepay{
 
 message MsgRepayResponse{}
 
-message MsgRedeem {
-    option (cosmos.msg.v1.signer) = "borrower";
-    string borrower = 1;
-    string loan_id = 2;
-    string loan_secret = 3;
-}
-
-message MsgRedeemResponse{}
-
 message MsgAddLiquidity {
     option (cosmos.msg.v1.signer) = "lender";
 
@@ -113,11 +103,10 @@ message MsgApply {
 
     string borrower = 1;
     string borrower_pubkey = 2;
-    string loan_secret_hash = 3;
-    int64 maturity_time = 4;
-    string pool_id = 5;
-    cosmos.base.v1beta1.Coin borrow_amount = 6;
-    uint64 agency_id = 7;
+    int64 maturity_time = 3;
+    string pool_id = 4;
+    cosmos.base.v1beta1.Coin borrow_amount = 5;
+    uint64 agency_id = 6;
 }
 
 message MsgApplyResponse {

api/side/lending/tx_grpc.pb.go

@@ -130,7 +130,7 @@ func CmdQueryPools() *cobra.Command {
 
 func CmdQueryCollateralAddress() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "collateral-address [btc public key] [hash of loan secret] [maturity time]",
+		Use:   "collateral-address [borrower public key] [agency public key] [maturity time]",
 		Short: "Query the collateral address by the specified loan params",
 		Args:  cobra.ExactArgs(3),
 		RunE: func(cmd *cobra.Command, args []string) error {
@@ -147,9 +147,9 @@ func CmdQueryCollateralAddress() *cobra.Command {
 			}
 
 			res, err := queryClient.CollateralAddress(cmd.Context(), &types.QueryCollateralAddressRequest{
-				BorrowerPubkey:   args[0],
-				HashOfLoanSecret: args[1],
-				MaturityTime:     maturityTime,
+				BorrowerPubkey: args[0],
+				AgencyPubkey:   args[1],
+				MaturityTime:   maturityTime,
 			})
 			if err != nil {
 				return err

proto/side/lending/lending.proto

@@ -40,7 +40,6 @@ func GetTxCmd() *cobra.Command {
 	cmd.AddCommand(CmdApprove())
 	cmd.AddCommand(CmdCancel())
 	cmd.AddCommand(CmdSubmitCancellationSignatures())
-	cmd.AddCommand(CmdRedeem())
 	cmd.AddCommand(CmdRepay())
 	cmd.AddCommand(CmdSubmitRepaymentAdaptorSignatures())
 	cmd.AddCommand(CmdSubmitLiquidationCetSignatures())
@@ -121,36 +120,35 @@ func CmdRemoveLiquidity() *cobra.Command {
 
 func CmdApply() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "apply [btc public key] [secret hash] [maturity time] [pool id] [borrow amount] [agency id]",
+		Use:   "apply [btc public key] [maturity time] [pool id] [borrow amount] [agency id]",
 		Short: "Apply loan with the related params",
-		Args:  cobra.ExactArgs(6),
+		Args:  cobra.ExactArgs(5),
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 
-			maturityTime, err := strconv.ParseInt(args[2], 10, 64)
+			maturityTime, err := strconv.ParseInt(args[1], 10, 64)
 			if err != nil {
 				return err
 			}
 
-			borrowAmount, err := sdk.ParseCoinNormalized(args[4])
+			borrowAmount, err := sdk.ParseCoinNormalized(args[3])
 			if err != nil {
 				return err
 			}
 
-			agencyId, err := strconv.ParseUint(args[5], 10, 64)
+			agencyId, err := strconv.ParseUint(args[4], 10, 64)
 			if err != nil {
 				return err
 			}
 
 			msg := types.NewMsgApply(
 				clientCtx.GetFromAddress().String(),
 				args[0],
-				args[1],
 				maturityTime,
-				args[3],
+				args[2],
 				borrowAmount,
 				agencyId,
 			)
@@ -300,36 +298,6 @@ func CmdSubmitCancellationSignatures() *cobra.Command {
 	return cmd
 }
 
-func CmdRedeem() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "redeem [loan id] [loan secret]",
-		Short: "Redeem the borrowed coin with the loan secret",
-		Args:  cobra.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			clientCtx, err := client.GetClientTxContext(cmd)
-			if err != nil {
-				return err
-			}
-
-			msg := types.NewMsgRedeem(
-				clientCtx.GetFromAddress().String(),
-				args[0],
-				args[1],
-			)
-
-			if err := msg.ValidateBasic(); err != nil {
-				return err
-			}
-
-			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
-		},
-	}
-
-	flags.AddTxFlagsToCmd(cmd)
-
-	return cmd
-}
-
 func CmdRepay() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "repay [loan id] [adaptor point]",