fix: enum hashed outcomes

Author: matthewjablack

packages/bitcoin-dlc-provider/lib/BitcoinDlcProvider.ts

@@ -599,7 +599,7 @@ export default class BitcoinDlcProvider
             dlcAccept.acceptCollateralSatoshis -
             outcome.localPayout,
         });
-        messagesList.push({ messages: [outcome.outcome.toString()] });
+        messagesList.push({ messages: [outcome.outcome.toString('hex')] });
       }
     } else {
       const payoutResponses = this.GetPayouts(dlcOffer);
@@ -1731,8 +1731,8 @@ Payout Group not found',
       const outcomeIndex = ((dlcOffer.contractInfo as ContractInfoV0)
         .contractDescriptor as ContractDescriptorV0).outcomes.findIndex(
         (outcome) =>
-          outcome.outcome.toString() ===
-          oracleAttestation.outcomes[0].toString(),
+          outcome.outcome.toString('hex') ===
+          sha256(Buffer.from(oracleAttestation.outcomes[0])).toString('hex'),
       );
 
       signCetRequest = {
@@ -2877,7 +2877,7 @@ Payout Group not found',
     ) {
       for (const outcome of ((dlcOffer.contractInfo as ContractInfoV0)
         .contractDescriptor as ContractDescriptorV0).outcomes) {
-        messagesList.push({ messages: [outcome.outcome.toString()] });
+        messagesList.push({ messages: [outcome.outcome.toString('hex')] });
       }
     } else {
       const payoutResponses = this.GetPayouts(dlcOffer);

tests/integration/dlc/dlc.test.ts

@@ -31,7 +31,7 @@ import {
   OracleInfoV0,
   RoundingIntervalsV0,
 } from '@node-dlc/messaging';
-import { xor } from '@node-lightning/crypto';
+import { sha256, xor } from '@node-lightning/crypto';
 import BN from 'bignumber.js';
 import { math } from 'bip-schnorr';
 import { BitcoinNetworks, chainHashFromNetwork } from 'bitcoin-networks';
@@ -185,15 +185,15 @@ describe('dlc provider', () => {
 
       contractDescriptor.outcomes = [
         {
-          outcome: Buffer.from('trump', 'utf8'),
+          outcome: sha256(Buffer.from('trump')),
           localPayout: BigInt(1e6),
         },
         {
-          outcome: Buffer.from('kamala', 'utf8'),
+          outcome: sha256(Buffer.from('kamala')),
           localPayout: BigInt(0),
         },
         {
-          outcome: Buffer.from('neither', 'utf8'),
+          outcome: sha256(Buffer.from('neither')),
           localPayout: BigInt(500000),
         },
       ];
@@ -218,6 +218,9 @@ describe('dlc provider', () => {
         [aliceInput],
       );
 
+      const dlcOfferV0 = DlcOfferV0.deserialize(dlcOffer.serialize());
+      dlcOfferV0.validate();
+
       const acceptDlcOfferResponse: AcceptDlcOfferResponse = await bob.dlc.acceptDlcOffer(
         dlcOffer,
         [bobInput],

tests/integration/utils/contract.ts

@@ -20,6 +20,7 @@ import {
   PayoutFunctionV0,
   RoundingIntervalsV0,
 } from '@node-dlc/messaging';
+import { sha256 } from '@node-lightning/crypto';
 import BN from 'bignumber.js';
 import { math } from 'bip-schnorr';
 
@@ -307,7 +308,10 @@ export function generateEnumOracleAttestation(
   const sigs: Buffer[] = [];
 
   const m = math
-    .taggedHash('DLC/oracle/attestation/v0', outcome)
+    .taggedHash(
+      'DLC/oracle/attestation/v0',
+      sha256(Buffer.from(outcome)).toString('hex'),
+    )
     .toString('hex');
   sigs.push(Buffer.from(oracle.GetSignature(m), 'hex'));