feat: verify signatures for both testnet and mainnet

Author: errfrom

compiled/auction_escrow_validator.plutus

@@ -1,16 +1,26 @@
 module HydraAuctionOnchain.Lib.Cose
   ( pmkSigStructure
+  , pverifyCoseSignature
   ) where
 
 import HydraAuctionOnchain.Lib.Serialization (pserializeAddress)
 import Plutarch.Api.V2 (PAddress)
+import Plutarch.Crypto (pverifyEd25519Signature)
 import Plutarch.Extra.Maybe (pjust, pnothing)
 import Plutarch.Monadic qualified as P
 
-pmkSigStructure :: Term s (PAddress :--> PByteString :--> PByteString :--> PMaybe PByteString)
+pmkSigStructure
+  :: Term
+      s
+      ( PBool
+          :--> PAddress
+          :--> PByteString
+          :--> PByteString
+          :--> PMaybe PByteString
+      )
 pmkSigStructure = phoistAcyclic $
-  plam $ \addr payload payloadLength -> P.do
-    pmatch (pserializeAddress # addr) $ \case
+  plam $ \isMainnet addr payload payloadLength ->
+    pmatch (pserializeAddress # isMainnet # addr) $ \case
       PNothing -> pnothing
       PJust addrSerialized -> P.do
         addrSerializedFields <- pletFields @["addrCbor", "addrMapEntrySize"] addrSerialized
@@ -24,3 +34,23 @@ pmkSigStructure = phoistAcyclic $
             , payloadLength
             , payload
             ]
+
+pverifyCoseSignature
+  :: Term
+      s
+      ( PByteString
+          :--> PByteString
+          :--> PAddress
+          :--> PByteString
+          :--> PByteString
+          :--> PBool
+      )
+pverifyCoseSignature = phoistAcyclic $
+  plam $ \signature vk addr payload payloadLength -> P.do
+    verifyForNetwork <- plet $ plam $ \isMainnet ->
+      pmatch (pmkSigStructure # isMainnet # addr # payload # payloadLength) $ \case
+        PNothing -> pcon PFalse
+        PJust sigStruct ->
+          pverifyEd25519Signature # vk # sigStruct # signature
+    (verifyForNetwork # pcon PFalse) -- verify for testnet
+      #|| (verifyForNetwork # pcon PTrue) -- if verification fails, verify for mainnet

compiled/standing_bid_validator.plutus

@@ -40,9 +40,9 @@ data PSerializedAddress (s :: S)
 instance DerivePlutusType PSerializedAddress where
   type DPTStrat _ = PlutusTypeData
 
-pserializeAddress :: Term s (PAddress :--> PMaybe PSerializedAddress)
+pserializeAddress :: Term s (PBool :--> PAddress :--> PMaybe PSerializedAddress)
 pserializeAddress = phoistAcyclic $
-  plam $ \addr ->
+  plam $ \isMainnet addr ->
     pmatch (pmkAddrConfig # addr) $ \case
       PNothing -> pnothing
       PJust addrConfig -> P.do
@@ -52,7 +52,7 @@ pserializeAddress = phoistAcyclic $
             mconcat
               [ phexByteStr "58" -- byte string (one-byte uint8_t for n, and then n bytes follow)
               , addrSize
-              , paddrConfigAddrHeaderForTestnet # addrConfig
+              , paddrConfigAddrHeaderForTestnet # isMainnet # addrConfig
               , paddrConfigAddrBody # addrConfig
               ]
         pjust #$ pcon $
@@ -103,19 +103,22 @@ paddrConfigAddrSize = phoistAcyclic $
 -- Get hex-encoded network tag + header type for given address
 -- configuration.
 -- https://github.com/cardano-foundation/CIPs/blob/d66f7d0a0bcd06c425a6b7a41c6d18c922deff7e/CIP-0019/README.md?plain=1#L70-L93
-paddrConfigAddrHeaderForTestnet :: Term s (PAddressConfiguration :--> PByteString)
+paddrConfigAddrHeaderForTestnet :: Term s (PBool :--> PAddressConfiguration :--> PByteString)
 paddrConfigAddrHeaderForTestnet = phoistAcyclic $
-  plam $ \addrConfig ->
+  plam $ \isMainnet addrConfig ->
     pmatch addrConfig $ \case
       PAddressConfig'PaymentKeyHash'StakeKeyHash _ _ ->
-        -- 0x00 = 0b0000_0000
-        phexByteStr "00"
+        -- 0x01 = 0b0000_0001 for mainnet
+        -- 0x00 = 0b0000_0000 for testnet
+        pif isMainnet (phexByteStr "01") $ phexByteStr "00"
       PAddressConfig'PaymentKeyHash'ScriptHash _ _ ->
-        -- 0x20 = 0b0010_0000
-        phexByteStr "20"
+        -- 0x21 = 0b0010_0001 for mainnet
+        -- 0x20 = 0b0010_0000 for testnet
+        pif isMainnet (phexByteStr "21") $ phexByteStr "20"
       PAddressConfig'PaymentKeyHash _ ->
-        -- 0x60 = 0b0110_0000
-        phexByteStr "60"
+        -- 0x61 = 0b0110_0001 for mainnet
+        -- 0x60 = 0b0110_0000 for testnet
+        pif isMainnet (phexByteStr "61") $ phexByteStr "60"
 
 paddrConfigAddrBody :: Term s (PAddressConfiguration :--> PByteString)
 paddrConfigAddrBody = phoistAcyclic $

src/HydraAuctionOnchain/Lib/Cose.hs

@@ -8,13 +8,11 @@ module HydraAuctionOnchain.Types.BidTerms
 
 import HydraAuctionOnchain.Helpers (pserialise)
 import HydraAuctionOnchain.Lib.Address (paddrPaymentKeyHashUnsafe)
-import HydraAuctionOnchain.Lib.Cose (pmkSigStructure)
+import HydraAuctionOnchain.Lib.Cose (pverifyCoseSignature)
 import HydraAuctionOnchain.Types.AuctionTerms (PAuctionTerms, ptotalAuctionFees)
 import HydraAuctionOnchain.Types.BidderInfo (PBidderInfo)
 import Plutarch.Api.V2 (PCurrencySymbol, PPubKeyHash)
-import Plutarch.Crypto (pverifyEd25519Signature)
 import Plutarch.DataRepr (PDataFields)
-import Plutarch.Maybe (pfromJust)
 import Plutarch.Monadic qualified as P
 import "liqwid-plutarch-extra" Plutarch.Extra.List (preplicate)
 
@@ -61,41 +59,47 @@ pvalidateBidTerms = phoistAcyclic $
 
     let sellerSignature = bidTermsFields.btSellerSignature
     sellerVk <- plet $ pfield @"sellerVk" # auctionTerms
-    sellerSigMsg <-
+    sellerSigMessage <-
       plet $
         sellerSignatureMessage
           # auctionCs
           # bidderInfo.biBidderVk
 
-    sellerSigStruct <-
-      plet $ pfromJust #$ pmkSigStructure # sellerAddr # sellerSigMsg # sellerSigMsgLengthHex
-
     let
       bidderSignature = bidTermsFields.btBidderSignature
       bidderVk = bidderInfo.biBidderVk
       bidderAddr = bidderInfo.biBidderAddress
-    bidderSigMsg <-
+    bidderSigMessage <-
       plet $
         bidderSignatureMessage
           # auctionCs
           # bidTermsFields.btPrice
           # (paddrPaymentKeyHashUnsafe # bidderAddr)
 
-    bidderSigStruct <-
-      plet $ pfromJust #$ pmkSigStructure # bidderAddr # bidderSigMsg # bidderSigMsgLengthHex
-
     -- The seller authorized the bidder to participate in the auction.
-    (pverifyEd25519Signature # sellerVk # sellerSigStruct # sellerSignature)
+    ( pverifyCoseSignature
+        # sellerSignature
+        # sellerVk
+        # sellerAddr
+        # sellerSigMessage
+        # sellerSigMessageLengthHex
+      )
       -- The bidder authorized the bid to be submitted in the auction.
-      #&& (pverifyEd25519Signature # bidderVk # bidderSigStruct # bidderSignature)
+      #&& ( pverifyCoseSignature
+              # bidderSignature
+              # bidderVk
+              # bidderAddr
+              # bidderSigMessage
+              # bidderSigMessageLengthHex
+          )
 
-bidderSigMsgLengthHex :: Term s PByteString
-bidderSigMsgLengthHex =
+bidderSigMessageLengthHex :: Term s PByteString
+bidderSigMessageLengthHex =
   -- 69 = 2 (cbor) + 28 (cs) + 2 (cbor) + 28 (pkh) + 9 (lovelace)
   phoistAcyclic $ phexByteStr "45"
 
-sellerSigMsgLengthHex :: Term s PByteString
-sellerSigMsgLengthHex =
+sellerSigMessageLengthHex :: Term s PByteString
+sellerSigMessageLengthHex =
   -- 64 = 2 (cbor) + 28 (cs) + 2 (cbor) + 32 (vk)
   phoistAcyclic $ phexByteStr "40"