@atomicfinance/bitcoin-dlc-provider 3.6.1 → 4.0.0

package/dist/BitcoinDlcProvider.js

@@ -38,6 +38,7 @@ const assert_1 = __importDefault(require("assert"));
 const bignumber_js_1 = __importDefault(require("bignumber.js"));
 const bitcoin_networks_1 = require("bitcoin-networks");
 const bitcoinjs_lib_1 = require("bitcoinjs-lib");
+const crypto_2 = __importDefault(require("crypto"));
 const ecc = __importStar(require("tiny-secp256k1"));
 const Utils_1 = require("./utils/Utils");
 class BitcoinDlcProvider extends provider_1.default {
@@ -155,27 +156,23 @@ class BitcoinDlcProvider extends provider_1.default {
      *   totalCollateral: bigint,
      * ): PayoutRequest[] {}
      */
-    GetPayoutsFromPayoutFunction(_dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
-        if (_dlcOffer.type !== messaging_1.MessageType.DlcOfferV0)
-            throw Error('DlcOffer must be V0');
-        const dlcOffer = _dlcOffer;
-        if (contractDescriptor.payoutFunction.type !== messaging_1.MessageType.PayoutFunctionV0)
-            throw Error('PayoutFunction must be V0');
+    GetPayoutsFromPayoutFunction(dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
         const payoutFunction = contractDescriptor.payoutFunction;
-        if (payoutFunction.pieces.length === 0)
+        if (payoutFunction.payoutFunctionPieces.length === 0)
             throw Error('PayoutFunction must have at least once PayoutCurvePiece');
-        if (payoutFunction.pieces.length > 1)
+        if (payoutFunction.payoutFunctionPieces.length > 1)
             throw Error('More than one PayoutCurvePiece not supported');
-        const payoutCurvePiece = payoutFunction.pieces[0]
+        const payoutCurvePiece = payoutFunction.payoutFunctionPieces[0]
             .payoutCurvePiece;
-        if (payoutCurvePiece.type !== messaging_1.MessageType.HyperbolaPayoutCurvePiece &&
-            payoutCurvePiece.type !== messaging_1.MessageType.OldHyperbolaPayoutCurvePiece)
+        if (payoutCurvePiece.payoutCurvePieceType !== messaging_1.PayoutCurvePieceType.Hyperbola)
             throw Error('Must be HyperbolaPayoutCurvePiece');
-        if (payoutCurvePiece.b !== BigInt(0) || payoutCurvePiece.c !== BigInt(0))
+        if (!payoutCurvePiece.b.eq(messaging_1.F64.ZERO) || !payoutCurvePiece.c.eq(messaging_1.F64.ZERO))
             throw Error('b and c HyperbolaPayoutCurvePiece values must be 0');
-        const eventDescriptor = oracleInfo.announcement.oracleEvent
+        // Cast to SingleOracleInfo to access announcement property
+        const singleOracleInfo = oracleInfo;
+        const eventDescriptor = singleOracleInfo.announcement.oracleEvent
             .eventDescriptor;
-        if (eventDescriptor.type !== messaging_1.MessageType.DigitDecompositionEventDescriptorV0)
+        if (eventDescriptor.type !== messaging_1.MessageType.DigitDecompositionEventDescriptor)
             throw Error('Only DigitDecomposition Oracle Events supported');
         const roundingIntervals = contractDescriptor.roundingIntervals;
         const cetPayouts = core_1.HyperbolaPayoutCurve.computePayouts(payoutFunction, totalCollateral, roundingIntervals);
@@ -186,26 +183,21 @@ class BitcoinDlcProvider extends provider_1.default {
                 groups: (0, core_1.groupByIgnoringDigits)(p.indexFrom, p.indexTo, eventDescriptor.base, contractDescriptor.numDigits),
             });
         });
-        const rValuesMessagesList = this.GenerateMessages(oracleInfo);
-        const { payouts, messagesList } = (0, Utils_1.outputsToPayouts)(payoutGroups, rValuesMessagesList, dlcOffer.offerCollateralSatoshis, dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateralSatoshis, true);
+        const rValuesMessagesList = this.GenerateMessages(singleOracleInfo);
+        const { payouts, messagesList } = (0, Utils_1.outputsToPayouts)(payoutGroups, rValuesMessagesList, dlcOffer.offerCollateral, dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateral, true);
         return { payouts, payoutGroups, messagesList };
     }
-    GetPayoutsFromPolynomialPayoutFunction(_dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
-        if (_dlcOffer.type !== messaging_1.MessageType.DlcOfferV0)
-            throw Error('DlcOffer must be V0');
-        const dlcOffer = _dlcOffer;
-        if (contractDescriptor.payoutFunction.type !== messaging_1.MessageType.PayoutFunctionV0)
-            throw Error('PayoutFunction must be V0');
+    GetPayoutsFromPolynomialPayoutFunction(dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
         const payoutFunction = contractDescriptor.payoutFunction;
-        if (payoutFunction.pieces.length === 0)
+        if (payoutFunction.payoutFunctionPieces.length === 0)
             throw Error('PayoutFunction must have at least once PayoutCurvePiece');
-        for (const piece of payoutFunction.pieces) {
+        for (const piece of payoutFunction.payoutFunctionPieces) {
             if (piece.payoutCurvePiece.type !== messaging_1.MessageType.PolynomialPayoutCurvePiece)
                 throw Error('Must be PolynomialPayoutCurvePiece');
         }
         const eventDescriptor = oracleInfo.announcement.oracleEvent
             .eventDescriptor;
-        if (eventDescriptor.type !== messaging_1.MessageType.DigitDecompositionEventDescriptorV0)
+        if (eventDescriptor.type !== messaging_1.MessageType.DigitDecompositionEventDescriptor)
             throw Error('Only DigitDecomposition Oracle Events supported');
         const roundingIntervals = contractDescriptor.roundingIntervals;
         const cetPayouts = core_1.PolynomialPayoutCurve.computePayouts(payoutFunction, totalCollateral, roundingIntervals);
@@ -217,11 +209,10 @@ class BitcoinDlcProvider extends provider_1.default {
             });
         });
         const rValuesMessagesList = this.GenerateMessages(oracleInfo);
-        const { payouts, messagesList } = (0, Utils_1.outputsToPayouts)(payoutGroups, rValuesMessagesList, dlcOffer.offerCollateralSatoshis, dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateralSatoshis, true);
+        const { payouts, messagesList } = (0, Utils_1.outputsToPayouts)(payoutGroups, rValuesMessagesList, dlcOffer.offerCollateral, dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateral, true);
         return { payouts, payoutGroups, messagesList };
     }
-    GetPayouts(_dlcOffer) {
-        const { dlcOffer } = (0, Utils_1.checkTypes)({ _dlcOffer });
+    GetPayouts(dlcOffer) {
         const contractInfo = dlcOffer.contractInfo;
         const totalCollateral = contractInfo.totalCollateral;
         const contractOraclePairs = this.GetContractOraclePairs(contractInfo);
@@ -247,43 +238,46 @@ class BitcoinDlcProvider extends provider_1.default {
             });
         }, [{ startingMessagesIndex: 0, startingPayoutGroupsIndex: 0 }]);
     }
+    GetPayoutsFromEnumeratedDescriptor(dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
+        const payoutGroups = [];
+        const rValuesMessagesList = this.GenerateMessages(oracleInfo);
+        // For enumerated descriptors, each outcome creates one payout
+        // Each outcome maps to one index in the oracle's possible outcomes
+        contractDescriptor.outcomes.forEach((outcome, index) => {
+            payoutGroups.push({
+                payout: outcome.localPayout,
+                groups: [[index]], // Simple index-based grouping for enum outcomes
+            });
+        });
+        const { payouts, messagesList } = (0, Utils_1.outputsToPayouts)(payoutGroups, rValuesMessagesList, dlcOffer.offerCollateral, totalCollateral - dlcOffer.offerCollateral, true);
+        return { payouts, payoutGroups, messagesList };
+    }
     GetPayoutsFromContractDescriptor(dlcOffer, contractDescriptor, oracleInfo, totalCollateral) {
-        switch (contractDescriptor.type) {
-            case messaging_1.MessageType.ContractDescriptorV0: {
-                throw Error('ContractDescriptorV0 not yet supported');
+        switch (contractDescriptor.contractDescriptorType) {
+            case messaging_1.ContractDescriptorType.Enumerated: {
+                return this.GetPayoutsFromEnumeratedDescriptor(dlcOffer, contractDescriptor, oracleInfo, totalCollateral);
             }
-            case messaging_1.MessageType.ContractDescriptorV1:
-                {
-                    const contractDescriptorV1 = contractDescriptor;
-                    const payoutFunction = contractDescriptorV1.payoutFunction;
-                    // TODO: add a better check for this
-                    const payoutCurvePiece = payoutFunction.pieces[0].payoutCurvePiece;
-                    switch (payoutCurvePiece.type) {
-                        case messaging_1.MessageType.HyperbolaPayoutCurvePiece:
-                            return this.GetPayoutsFromPayoutFunction(dlcOffer, contractDescriptor, oracleInfo, totalCollateral);
-                        case messaging_1.MessageType.OldHyperbolaPayoutCurvePiece:
-                            return this.GetPayoutsFromPayoutFunction(dlcOffer, contractDescriptor, oracleInfo, totalCollateral);
-                        case messaging_1.MessageType.PolynomialPayoutCurvePiece:
-                            return this.GetPayoutsFromPolynomialPayoutFunction(dlcOffer, contractDescriptor, oracleInfo, totalCollateral);
-                    }
+            case messaging_1.ContractDescriptorType.NumericOutcome: {
+                const numericalDescriptor = contractDescriptor;
+                const payoutFunction = numericalDescriptor.payoutFunction;
+                // TODO: add a better check for this
+                const payoutCurvePiece = payoutFunction.payoutFunctionPieces[0].payoutCurvePiece;
+                switch (payoutCurvePiece.payoutCurvePieceType) {
+                    case messaging_1.PayoutCurvePieceType.Hyperbola:
+                        return this.GetPayoutsFromPayoutFunction(dlcOffer, numericalDescriptor, oracleInfo, totalCollateral);
+                    case messaging_1.PayoutCurvePieceType.Polynomial:
+                        return this.GetPayoutsFromPolynomialPayoutFunction(dlcOffer, numericalDescriptor, oracleInfo, totalCollateral);
                 }
-                break;
-            default: {
-                throw Error('ContractDescriptor must be V0 or V1');
             }
         }
     }
-    async createDlcTxs(_dlcOffer, _dlcAccept) {
-        const { dlcOffer, dlcAccept } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-        });
-        const localFundPubkey = dlcOffer.fundingPubKey.toString('hex');
-        const remoteFundPubkey = dlcAccept.fundingPubKey.toString('hex');
-        const localFinalScriptPubkey = dlcOffer.payoutSPK.toString('hex');
-        const remoteFinalScriptPubkey = dlcAccept.payoutSPK.toString('hex');
-        const localChangeScriptPubkey = dlcOffer.changeSPK.toString('hex');
-        const remoteChangeScriptPubkey = dlcAccept.changeSPK.toString('hex');
+    async createDlcTxs(dlcOffer, dlcAccept) {
+        const localFundPubkey = dlcOffer.fundingPubkey.toString('hex');
+        const remoteFundPubkey = dlcAccept.fundingPubkey.toString('hex');
+        const localFinalScriptPubkey = dlcOffer.payoutSpk.toString('hex');
+        const remoteFinalScriptPubkey = dlcAccept.payoutSpk.toString('hex');
+        const localChangeScriptPubkey = dlcOffer.changeSpk.toString('hex');
+        const remoteChangeScriptPubkey = dlcAccept.changeSpk.toString('hex');
         const localInputs = await Promise.all(dlcOffer.fundingInputs.map(async (fundingInput) => {
             const input = await this.fundingInputToInput(fundingInput, false);
             return input.toUtxo();
@@ -296,23 +290,23 @@ class BitcoinDlcProvider extends provider_1.default {
         const remoteInputAmount = remoteInputs.reduce((prev, cur) => prev + cur.amount.GetSatoshiAmount(), 0);
         let payouts = [];
         let messagesList = [];
-        if (dlcOffer.contractInfo.type === messaging_1.MessageType.ContractInfoV0 &&
+        if (dlcOffer.contractInfo.type === messaging_1.MessageType.SingleContractInfo &&
             dlcOffer.contractInfo.contractDescriptor.type ===
-                messaging_1.MessageType.ContractDescriptorV0) {
+                messaging_1.ContractDescriptorType.Enumerated) {
             for (const outcome of dlcOffer.contractInfo
                 .contractDescriptor.outcomes) {
                 payouts.push({
                     local: outcome.localPayout,
-                    remote: dlcOffer.offerCollateralSatoshis +
-                        dlcAccept.acceptCollateralSatoshis -
+                    remote: dlcOffer.offerCollateral +
+                        dlcAccept.acceptCollateral -
                         outcome.localPayout,
                 });
-                messagesList.push({ messages: [outcome.outcome.toString('hex')] });
+                messagesList.push({ messages: [outcome.outcome] });
             }
         }
         else {
             const payoutResponses = this.GetPayouts(dlcOffer);
-            const { payouts: tempPayouts, messagesList: tempMessagesList, } = this.FlattenPayouts(payoutResponses);
+            const { payouts: tempPayouts, messagesList: tempMessagesList } = this.FlattenPayouts(payoutResponses);
             payouts = tempPayouts;
             messagesList = tempMessagesList;
         }
@@ -323,11 +317,11 @@ class BitcoinDlcProvider extends provider_1.default {
             remoteFundPubkey,
             remoteFinalScriptPubkey,
             localInputAmount,
-            localCollateralAmount: dlcOffer.offerCollateralSatoshis,
+            localCollateralAmount: dlcOffer.offerCollateral,
             localPayoutSerialId: dlcOffer.payoutSerialId,
             localChangeSerialId: dlcOffer.changeSerialId,
             remoteInputAmount,
-            remoteCollateralAmount: dlcAccept.acceptCollateralSatoshis,
+            remoteCollateralAmount: dlcAccept.acceptCollateral,
             remotePayoutSerialId: dlcAccept.payoutSerialId,
             remoteChangeSerialId: dlcAccept.changeSerialId,
             refundLocktime: dlcOffer.refundLocktime,
@@ -340,7 +334,7 @@ class BitcoinDlcProvider extends provider_1.default {
             fundOutputSerialId: dlcOffer.fundOutputSerialId,
         };
         const dlcTxs = await this.CreateDlcTransactions(dlcTxRequest);
-        const dlcTransactions = new messaging_1.DlcTransactionsV0();
+        const dlcTransactions = new messaging_1.DlcTransactions();
         dlcTransactions.fundTx = bitcoin_1.Tx.decode(bufio_1.StreamReader.fromHex(dlcTxs.fundTxHex));
         dlcTransactions.fundTxVout = [
             BigInt(dlcOffer.changeSerialId),
@@ -355,19 +349,13 @@ class BitcoinDlcProvider extends provider_1.default {
         });
         return { dlcTransactions, messagesList };
     }
-    async createBatchDlcTxs(_dlcOffers, _dlcAccepts) {
-        const dlcOffers = _dlcOffers.map((dlcOffer) => {
-            return (0, Utils_1.checkTypes)({ _dlcOffer: dlcOffer }).dlcOffer;
-        });
-        const dlcAccepts = _dlcAccepts.map((dlcAccept) => {
-            return (0, Utils_1.checkTypes)({ _dlcAccept: dlcAccept }).dlcAccept;
-        });
-        const localFundPubkeys = dlcOffers.map((dlcOffer) => dlcOffer.fundingPubKey.toString('hex'));
-        const remoteFundPubkeys = dlcAccepts.map((dlcAccept) => dlcAccept.fundingPubKey.toString('hex'));
-        const localFinalScriptPubkeys = dlcOffers.map((dlcOffer) => dlcOffer.payoutSPK.toString('hex'));
-        const remoteFinalScriptPubkeys = dlcAccepts.map((dlcAccept) => dlcAccept.payoutSPK.toString('hex'));
-        const localChangeScriptPubkey = dlcOffers[0].changeSPK.toString('hex');
-        const remoteChangeScriptPubkey = dlcAccepts[0].changeSPK.toString('hex');
+    async createBatchDlcTxs(dlcOffers, dlcAccepts) {
+        const localFundPubkeys = dlcOffers.map((dlcOffer) => dlcOffer.fundingPubkey.toString('hex'));
+        const remoteFundPubkeys = dlcAccepts.map((dlcAccept) => dlcAccept.fundingPubkey.toString('hex'));
+        const localFinalScriptPubkeys = dlcOffers.map((dlcOffer) => dlcOffer.payoutSpk.toString('hex'));
+        const remoteFinalScriptPubkeys = dlcAccepts.map((dlcAccept) => dlcAccept.payoutSpk.toString('hex'));
+        const localChangeScriptPubkey = dlcOffers[0].changeSpk.toString('hex');
+        const remoteChangeScriptPubkey = dlcAccepts[0].changeSpk.toString('hex');
         const localInputs = await Promise.all(dlcOffers[0].fundingInputs.map(async (fundingInput) => {
             const input = await this.fundingInputToInput(fundingInput, false);
             return input.toUtxo();
@@ -402,11 +390,11 @@ class BitcoinDlcProvider extends provider_1.default {
             remoteFundPubkeys,
             remoteFinalScriptPubkeys,
             localInputAmount,
-            localCollateralAmounts: dlcOffers.map((dlcOffer) => dlcOffer.offerCollateralSatoshis),
+            localCollateralAmounts: dlcOffers.map((dlcOffer) => dlcOffer.offerCollateral),
             localPayoutSerialIds: dlcOffers.map((dlcOffer) => dlcOffer.payoutSerialId),
             localChangeSerialId: dlcOffers[0].changeSerialId,
             remoteInputAmount,
-            remoteCollateralAmounts: dlcAccepts.map((dlcAccept) => dlcAccept.acceptCollateralSatoshis),
+            remoteCollateralAmounts: dlcAccepts.map((dlcAccept) => dlcAccept.acceptCollateral),
             remotePayoutSerialIds: dlcAccepts.map((dlcAccept) => dlcAccept.payoutSerialId),
             remoteChangeSerialId: dlcAccepts[0].changeSerialId,
             refundLocktimes: dlcOffers.map((dlcOffer) => dlcOffer.refundLocktime),
@@ -422,7 +410,7 @@ class BitcoinDlcProvider extends provider_1.default {
         const dlcTransactionsList = [];
         let start = 0;
         for (let i = 0; i < dlcTxs.refundTxHexList.length; i++) {
-            const dlcTransactions = new messaging_1.DlcTransactionsV0();
+            const dlcTransactions = new messaging_1.DlcTransactions();
             dlcTransactions.fundTx = bitcoin_1.Tx.decode(bufio_1.StreamReader.fromHex(dlcTxs.fundTxHex));
             dlcTransactions.fundTxVout = [
                 BigInt(dlcOffers[i].changeSerialId),
@@ -444,7 +432,13 @@ class BitcoinDlcProvider extends provider_1.default {
         return { dlcTransactionsList, nestedMessagesList };
     }
     GenerateEnumMessages(oracleEvent) {
-        throw Error('Only DigitDecomposition Oracle Events supported');
+        const eventDescriptor = oracleEvent.eventDescriptor;
+        // For enum events, each oracle has one nonce and can attest to one of the possible outcomes
+        const messagesList = [];
+        // For enum events, hash the outcomes to match the contract descriptor format
+        const messages = eventDescriptor.outcomes.map((outcome) => (0, crypto_1.sha256)(Buffer.from(outcome)).toString('hex'));
+        messagesList.push({ messages });
+        return messagesList;
     }
     GenerateDigitDecompositionMessages(oracleEvent) {
         const oracleNonces = oracleEvent.oracleNonces;
@@ -461,32 +455,50 @@ class BitcoinDlcProvider extends provider_1.default {
         return messagesList;
     }
     GenerateMessages(oracleInfo) {
-        const oracleEvent = oracleInfo.announcement.oracleEvent;
+        // Handle both SingleOracleInfo and MultiOracleInfo using type property instead of instanceof
+        let oracleEvent;
+        if (oracleInfo.type === messaging_1.MessageType.SingleOracleInfo) {
+            const singleOracleInfo = oracleInfo;
+            oracleEvent = singleOracleInfo.announcement.oracleEvent;
+        }
+        else if (oracleInfo.type === messaging_1.MessageType.MultiOracleInfo) {
+            const multiOracleInfo = oracleInfo;
+            // For multi-oracle, use the first announcement for now
+            // TODO: This might need more sophisticated handling for multi-oracle scenarios
+            if (multiOracleInfo.announcements.length === 0) {
+                throw Error('MultiOracleInfo must have at least one announcement');
+            }
+            oracleEvent = multiOracleInfo.announcements[0].oracleEvent;
+        }
+        else {
+            throw Error(`OracleInfo must be SingleOracleInfo or MultiOracleInfo, got type: ${oracleInfo.type}`);
+        }
         switch (oracleEvent.eventDescriptor.type) {
-            case messaging_1.MessageType.EnumEventDescriptorV0:
+            case messaging_1.MessageType.EnumEventDescriptor:
                 return this.GenerateEnumMessages(oracleEvent);
-            case messaging_1.MessageType.DigitDecompositionEventDescriptorV0:
+            case messaging_1.MessageType.DigitDecompositionEventDescriptor:
                 return this.GenerateDigitDecompositionMessages(oracleEvent);
             default:
                 throw Error('EventDescriptor must be Enum or DigitDecomposition');
         }
     }
     GetContractOraclePairs(_contractInfo) {
-        switch (_contractInfo.type) {
-            case messaging_1.MessageType.ContractInfoV0: {
-                const contractInfo = _contractInfo;
-                return [
-                    {
-                        contractDescriptor: contractInfo.contractDescriptor,
-                        oracleInfo: contractInfo.oracleInfo,
-                    },
-                ];
-            }
-            case messaging_1.MessageType.ContractInfoV1: {
-                return _contractInfo.contractOraclePairs;
-            }
-            default:
-                throw Error('ContractInfo must be V0 or V1');
+        // Use contractInfoType property instead of instanceof for more reliable type checking
+        if (_contractInfo.contractInfoType === messaging_1.ContractInfoType.Single) {
+            const singleInfo = _contractInfo;
+            return [
+                {
+                    contractDescriptor: singleInfo.contractDescriptor,
+                    oracleInfo: singleInfo.oracleInfo,
+                },
+            ];
+        }
+        else if (_contractInfo.contractInfoType === messaging_1.ContractInfoType.Disjoint) {
+            const disjointInfo = _contractInfo;
+            return disjointInfo.contractOraclePairs;
+        }
+        else {
+            throw Error('ContractInfo must be Single or Disjoint');
         }
     }
     async CreateCetAdaptorAndRefundSigs(_dlcOffer, _dlcAccept, _dlcTxs, messagesList, isOfferer) {
@@ -497,7 +509,7 @@ class BitcoinDlcProvider extends provider_1.default {
         });
         const network = await this.getConnectedNetwork();
         const cetsHex = dlcTxs.cets.map((cet) => cet.serialize().toString('hex'));
-        const fundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(isOfferer ? dlcOffer.fundingPubKey : dlcAccept.fundingPubKey))
+        const fundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(isOfferer ? dlcOffer.fundingPubkey : dlcAccept.fundingPubkey))
             .serialize()
             .slice(1);
         const fundingAddress = bitcoinjs_lib_1.address.fromOutputScript(fundingSPK, network);
@@ -508,11 +520,15 @@ class BitcoinDlcProvider extends provider_1.default {
         const fundPrivateKey = Buffer.from(fundPrivateKeyPair.__D).toString('hex');
         const contractOraclePairs = this.GetContractOraclePairs(dlcOffer.contractInfo);
         const sigs = [];
-        if (dlcOffer.contractInfo.type === messaging_1.MessageType.ContractInfoV0 &&
+        if (dlcOffer.contractInfo.contractInfoType === messaging_1.ContractInfoType.Single &&
             dlcOffer.contractInfo.contractDescriptor.type ===
                 messaging_1.MessageType.ContractDescriptorV0) {
             for (const [_, { oracleInfo }] of contractOraclePairs.entries()) {
-                const oracleAnnouncement = oracleInfo.announcement;
+                if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                    throw new Error('Only SingleOracleInfo supported in this context');
+                }
+                const oracleAnnouncement = oracleInfo
+                    .announcement;
                 const adaptorSigRequestPromises = [];
                 const tempMessagesList = messagesList;
                 const tempCetsHex = cetsHex;
@@ -522,8 +538,8 @@ class BitcoinDlcProvider extends provider_1.default {
                     privkey: fundPrivateKey,
                     fundTxId: dlcTxs.fundTx.txId.toString(),
                     fundVout: dlcTxs.fundTxVout,
-                    localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                    remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                    localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                    remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                     fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
                     oraclePubkey: oracleAnnouncement.oraclePubkey.toString('hex'),
                     oracleRValues: oracleAnnouncement.oracleEvent.oracleNonces.map((nonce) => nonce.toString('hex')),
@@ -544,7 +560,11 @@ class BitcoinDlcProvider extends provider_1.default {
         else {
             const indices = this.GetIndicesFromPayouts(this.GetPayouts(_dlcOffer));
             for (const [index, { oracleInfo }] of contractOraclePairs.entries()) {
-                const oracleAnnouncement = oracleInfo.announcement;
+                if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                    throw new Error('Only SingleOracleInfo supported in this context');
+                }
+                const oracleAnnouncement = oracleInfo
+                    .announcement;
                 const startingIndex = indices[index].startingMessagesIndex, endingIndex = indices[index + 1].startingMessagesIndex;
                 const oracleEventMessagesList = messagesList.slice(startingIndex, endingIndex);
                 const oracleEventCetsHex = cetsHex.slice(startingIndex, endingIndex);
@@ -559,8 +579,8 @@ class BitcoinDlcProvider extends provider_1.default {
                         privkey: fundPrivateKey,
                         fundTxId: dlcTxs.fundTx.txId.toString(),
                         fundVout: dlcTxs.fundTxVout,
-                        localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                        remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                        localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                        remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                         fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
                         oraclePubkey: oracleAnnouncement.oraclePubkey.toString('hex'),
                         oracleRValues: oracleAnnouncement.oracleEvent.oracleNonces.map((nonce) => nonce.toString('hex')),
@@ -584,12 +604,12 @@ class BitcoinDlcProvider extends provider_1.default {
             privkey: fundPrivateKey,
             fundTxId: dlcTxs.fundTx.txId.toString(),
             fundVout: dlcTxs.fundTxVout,
-            localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-            remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+            localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+            remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
             fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
         };
         const refundSignature = Buffer.from((await this.GetRawRefundTxSignature(refundSignRequest)).hex, 'hex');
-        const cetSignatures = new messaging_1.CetAdaptorSignaturesV0();
+        const cetSignatures = new messaging_1.CetAdaptorSignatures();
         cetSignatures.sigs = sigs.flat();
         return { cetSignatures, refundSignature };
     }
@@ -602,15 +622,19 @@ class BitcoinDlcProvider extends provider_1.default {
         });
         const cetsHex = dlcTxs.cets.map((cet) => cet.serialize().toString('hex'));
         const contractOraclePairs = this.GetContractOraclePairs(dlcOffer.contractInfo);
-        if (dlcOffer.contractInfo.type === messaging_1.MessageType.ContractInfoV0 &&
+        if (dlcOffer.contractInfo.type === messaging_1.MessageType.SingleContractInfo &&
             dlcOffer.contractInfo.contractDescriptor.type ===
                 messaging_1.MessageType.ContractDescriptorV0) {
             for (const [_, { oracleInfo }] of contractOraclePairs.entries()) {
-                const oracleAnnouncement = oracleInfo.announcement;
+                if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                    throw new Error('Only SingleOracleInfo supported in this context');
+                }
+                const oracleAnnouncement = oracleInfo
+                    .announcement;
                 const oracleEventCetsHex = cetsHex;
                 const oracleEventSigs = isOfferer
-                    ? dlcAccept.cetSignatures.sigs
-                    : dlcSign.cetSignatures.sigs;
+                    ? dlcAccept.cetAdaptorSignatures.sigs
+                    : dlcSign.cetAdaptorSignatures.sigs;
                 const sigsValidity = [];
                 const tempMessagesList = messagesList;
                 const tempCetsHex = oracleEventCetsHex;
@@ -627,8 +651,8 @@ class BitcoinDlcProvider extends provider_1.default {
                     oraclePubkey: oracleAnnouncement.oraclePubkey.toString('hex'),
                     oracleRValues: oracleAnnouncement.oracleEvent.oracleNonces.map((nonce) => nonce.toString('hex')),
                     adaptorPairs: tempAdaptorPairs,
-                    localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                    remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                    localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                    remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                     fundTxId: dlcTxs.fundTx.txId.toString(),
                     fundVout: dlcTxs.fundTxVout,
                     fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
@@ -644,8 +668,8 @@ class BitcoinDlcProvider extends provider_1.default {
                     signature: isOfferer
                         ? dlcAccept.refundSignature.toString('hex')
                         : dlcSign.refundSignature.toString('hex'),
-                    localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                    remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                    localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                    remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                     fundTxId: dlcTxs.fundTx.txId.toString(),
                     fundVout: dlcTxs.fundTxVout,
                     fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
@@ -663,13 +687,17 @@ class BitcoinDlcProvider extends provider_1.default {
             const chunk = 100;
             const indices = this.GetIndicesFromPayouts(this.GetPayouts(_dlcOffer));
             for (const [index, { oracleInfo }] of contractOraclePairs.entries()) {
-                const oracleAnnouncement = oracleInfo.announcement;
+                if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                    throw new Error('Only SingleOracleInfo supported in this context');
+                }
+                const oracleAnnouncement = oracleInfo
+                    .announcement;
                 const startingIndex = indices[index].startingMessagesIndex, endingIndex = indices[index + 1].startingMessagesIndex;
                 const oracleEventMessagesList = messagesList.slice(startingIndex, endingIndex);
                 const oracleEventCetsHex = cetsHex.slice(startingIndex, endingIndex);
                 const oracleEventSigs = (isOfferer
-                    ? dlcAccept.cetSignatures.sigs
-                    : dlcSign.cetSignatures.sigs).slice(startingIndex, endingIndex);
+                    ? dlcAccept.cetAdaptorSignatures.sigs
+                    : dlcSign.cetAdaptorSignatures.sigs).slice(startingIndex, endingIndex);
                 const sigsValidity = [];
                 for (let i = 0, j = oracleEventMessagesList.length; i < j; i += chunk) {
                     const tempMessagesList = oracleEventMessagesList.slice(i, i + chunk);
@@ -687,8 +715,8 @@ class BitcoinDlcProvider extends provider_1.default {
                         oraclePubkey: oracleAnnouncement.oraclePubkey.toString('hex'),
                         oracleRValues: oracleAnnouncement.oracleEvent.oracleNonces.map((nonce) => nonce.toString('hex')),
                         adaptorPairs: tempAdaptorPairs,
-                        localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                        remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                        localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                        remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                         fundTxId: dlcTxs.fundTx.txId.toString(),
                         fundVout: dlcTxs.fundTxVout,
                         fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
@@ -705,8 +733,8 @@ class BitcoinDlcProvider extends provider_1.default {
                     signature: isOfferer
                         ? dlcAccept.refundSignature.toString('hex')
                         : dlcSign.refundSignature.toString('hex'),
-                    localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                    remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                    localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                    remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                     fundTxId: dlcTxs.fundTx.txId.toString(),
                     fundVout: dlcTxs.fundTxVout,
                     fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
@@ -760,17 +788,11 @@ class BitcoinDlcProvider extends provider_1.default {
             pubKeyWitness.witness = Buffer.from(inputPubKeys[i], 'hex');
             witnessElements.push([sigWitness, pubKeyWitness]);
         }
-        const fundingSignatures = new messaging_1.FundingSignaturesV0();
+        const fundingSignatures = new messaging_1.FundingSignatures();
         fundingSignatures.witnessElements = witnessElements;
         return fundingSignatures;
     }
-    async VerifyFundingSigs(_dlcOffer, _dlcAccept, _dlcSign, _dlcTxs, isOfferer) {
-        const { dlcOffer, dlcAccept, dlcSign, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcSign,
-            _dlcTxs,
-        });
+    async VerifyFundingSigs(dlcOffer, dlcAccept, dlcSign, dlcTxs, isOfferer) {
         const sigsValidity = [];
         for (let i = 0; i < dlcSign.fundingSignatures.witnessElements.length; i++) {
             const witnessElement = dlcSign.fundingSignatures.witnessElements[i];
@@ -797,13 +819,7 @@ class BitcoinDlcProvider extends provider_1.default {
             throw new Error('Invalid signatures received');
         }
     }
-    async CreateFundingTx(_dlcOffer, _dlcAccept, _dlcSign, _dlcTxs, fundingSignatures) {
-        const { dlcOffer, dlcAccept, dlcSign, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcSign,
-            _dlcTxs,
-        });
+    async CreateFundingTx(dlcOffer, dlcAccept, dlcSign, dlcTxs, fundingSignatures) {
         const witnessElements = [
             ...dlcSign.fundingSignatures.witnessElements,
             ...fundingSignatures.witnessElements,
@@ -830,8 +846,7 @@ class BitcoinDlcProvider extends provider_1.default {
         const fundTx = bitcoin_1.Tx.decode(bufio_1.StreamReader.fromHex(fundTxHex));
         return fundTx;
     }
-    async FindOutcomeIndexFromPolynomialPayoutCurvePiece(_dlcOffer, contractDescriptor, contractOraclePairIndex, polynomialPayoutCurvePiece, oracleAttestation, outcome) {
-        const { dlcOffer } = (0, Utils_1.checkTypes)({ _dlcOffer });
+    async FindOutcomeIndexFromPolynomialPayoutCurvePiece(dlcOffer, contractDescriptor, contractOraclePairIndex, polynomialPayoutCurvePiece, oracleAttestation, outcome) {
         const polynomialCurve = core_1.PolynomialPayoutCurve.fromPayoutCurvePiece(polynomialPayoutCurvePiece);
         const payouts = polynomialPayoutCurvePiece.points.map((point) => Number(point.outcomePayout));
         const minPayout = Math.min(...payouts);
@@ -839,7 +854,8 @@ class BitcoinDlcProvider extends provider_1.default {
         const clampBN = (val) => bignumber_js_1.default.max(minPayout, bignumber_js_1.default.min(val, maxPayout));
         const payout = clampBN(polynomialCurve.getPayout(outcome));
         const payoutResponses = this.GetPayouts(dlcOffer);
-        const payoutIndexOffset = this.GetIndicesFromPayouts(payoutResponses)[contractOraclePairIndex].startingMessagesIndex;
+        const payoutIndexOffset = this.GetIndicesFromPayouts(payoutResponses)[contractOraclePairIndex]
+            .startingMessagesIndex;
         const { payoutGroups } = payoutResponses[contractOraclePairIndex];
         const intervalsSorted = [
             ...contractDescriptor.roundingIntervals.intervals,
@@ -877,7 +893,8 @@ Payout Group not found');
         const clampBN = (val) => bignumber_js_1.default.max(0, bignumber_js_1.default.min(val, dlcOffer.contractInfo.totalCollateral.toString()));
         const payout = clampBN(hyperbolaCurve.getPayout(outcome));
         const payoutResponses = this.GetPayouts(dlcOffer);
-        const payoutIndexOffset = this.GetIndicesFromPayouts(payoutResponses)[contractOraclePairIndex].startingMessagesIndex;
+        const payoutIndexOffset = this.GetIndicesFromPayouts(payoutResponses)[contractOraclePairIndex]
+            .startingMessagesIndex;
         const { payoutGroups } = payoutResponses[contractOraclePairIndex];
         const intervalsSorted = [
             ...contractDescriptor.roundingIntervals.intervals,
@@ -921,32 +938,59 @@ Payout Group not found');
             }
         }
         if (groupIndex === -1) {
-            throw Error('Failed to Find OutcomeIndex From HyperbolaPayoutCurvePiece. \
-Payout Group not found');
+            // Fallback to brute force search if payout-based search fails
+            index = 0;
+            groupLength = 0;
+            for (const [i, payoutGroup] of payoutGroups.entries()) {
+                groupIndex = payoutGroup.groups.findIndex((group) => {
+                    return group.every((msg, j) => msg === outcomesFormatted[j]);
+                });
+                if (groupIndex !== -1) {
+                    index += groupIndex;
+                    groupLength = payoutGroup.groups[groupIndex].length;
+                    break;
+                }
+                else {
+                    index += payoutGroup.groups.length;
+                }
+            }
+            if (groupIndex === -1) {
+                throw Error('Failed to Find OutcomeIndex From HyperbolaPayoutCurvePiece. \
+Payout Group not found even with brute force search');
+            }
         }
         return { index: payoutIndexOffset + index, groupLength };
     }
-    async FindOutcomeIndex(_dlcOffer, oracleAttestation) {
-        const { dlcOffer } = (0, Utils_1.checkTypes)({ _dlcOffer });
+    async FindOutcomeIndex(dlcOffer, oracleAttestation) {
         const contractOraclePairs = this.GetContractOraclePairs(dlcOffer.contractInfo);
-        const contractOraclePairIndex = contractOraclePairs.findIndex(({ oracleInfo }) => oracleInfo.announcement.oracleEvent.eventId ===
-            oracleAttestation.eventId);
+        const contractOraclePairIndex = contractOraclePairs.findIndex(({ oracleInfo }) => {
+            if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo)
+                return false;
+            const singleOracleInfo = oracleInfo;
+            return (singleOracleInfo.announcement.oracleEvent.eventId ===
+                oracleAttestation.eventId);
+        });
         (0, assert_1.default)(contractOraclePairIndex !== -1, 'OracleAttestation must be for an existing OracleEvent');
         const contractOraclePair = contractOraclePairs[contractOraclePairIndex];
-        const { contractDescriptor: _contractDescriptor, oracleInfo, } = contractOraclePair;
-        (0, assert_1.default)(_contractDescriptor.type === messaging_1.MessageType.ContractDescriptorV1, 'ContractDescriptor must be V1');
+        const { contractDescriptor: _contractDescriptor, oracleInfo } = contractOraclePair;
+        (0, assert_1.default)(_contractDescriptor.contractDescriptorType ===
+            messaging_1.ContractDescriptorType.NumericOutcome, 'ContractDescriptor must be NumericOutcome');
         const contractDescriptor = _contractDescriptor;
         const _payoutFunction = contractDescriptor.payoutFunction;
-        (0, assert_1.default)(_payoutFunction.type === messaging_1.MessageType.PayoutFunctionV0, 'PayoutFunction must be V0');
-        const eventDescriptor = oracleInfo.announcement.oracleEvent
+        (0, assert_1.default)(_payoutFunction.type === messaging_1.MessageType.PayoutFunction, 'PayoutFunction must be V0');
+        if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+            throw new Error('Only SingleOracleInfo supported in this context');
+        }
+        const singleOracleInfo = oracleInfo;
+        const eventDescriptor = singleOracleInfo.announcement.oracleEvent
             .eventDescriptor;
         const payoutFunction = _payoutFunction;
         const base = eventDescriptor.base;
         const outcome = [...oracleAttestation.outcomes]
             .reverse()
             .reduce((acc, val, i) => acc + Number(val) * base ** i, 0);
-        const piecesSorted = payoutFunction.pieces.sort((a, b) => Number(a.endpoint) - Number(b.endpoint));
-        const piece = piecesSorted.find((piece) => outcome < piece.endpoint);
+        const piecesSorted = payoutFunction.payoutFunctionPieces.sort((a, b) => Number(a.endPoint.eventOutcome) - Number(b.endPoint.eventOutcome));
+        const piece = piecesSorted.find((piece) => outcome < piece.endPoint.eventOutcome);
         switch (piece.payoutCurvePiece.type) {
             case messaging_1.MessageType.PolynomialPayoutCurvePiece:
                 return this.FindOutcomeIndexFromPolynomialPayoutCurvePiece(dlcOffer, contractDescriptor, contractOraclePairIndex, piece.payoutCurvePiece, oracleAttestation, BigInt(outcome));
@@ -958,24 +1002,29 @@ Payout Group not found');
                 throw Error('Must be Hyperbola or Polynomial curve piece');
         }
     }
-    ValidateEvent(_dlcOffer, oracleAttestation) {
-        const { dlcOffer } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-        });
-        switch (dlcOffer.contractInfo.type) {
-            case messaging_1.MessageType.ContractInfoV0: {
+    ValidateEvent(dlcOffer, oracleAttestation) {
+        switch (dlcOffer.contractInfo.contractInfoType) {
+            case messaging_1.ContractInfoType.Single: {
                 const contractInfo = dlcOffer.contractInfo;
-                switch (contractInfo.contractDescriptor.type) {
-                    case messaging_1.MessageType.ContractDescriptorV0: {
+                switch (contractInfo.contractDescriptor.contractDescriptorType) {
+                    case messaging_1.ContractDescriptorType.Enumerated: {
                         const oracleInfo = contractInfo.oracleInfo;
-                        if (oracleInfo.announcement.oracleEvent.eventId !==
+                        if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                            throw Error('Only SingleOracleInfo supported in this context');
+                        }
+                        const singleOracleInfo = oracleInfo;
+                        if (singleOracleInfo.announcement.oracleEvent.eventId !==
                             oracleAttestation.eventId)
                             throw Error('Incorrect Oracle Attestation. Event Id must match.');
                         break;
                     }
-                    case messaging_1.MessageType.ContractDescriptorV1: {
+                    case messaging_1.ContractDescriptorType.NumericOutcome: {
                         const oracleInfo = contractInfo.oracleInfo;
-                        if (oracleInfo.announcement.oracleEvent.eventId !==
+                        if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo) {
+                            throw Error('Only SingleOracleInfo supported in this context');
+                        }
+                        const singleOracleInfo = oracleInfo;
+                        if (singleOracleInfo.announcement.oracleEvent.eventId !==
                             oracleAttestation.eventId)
                             throw Error('Incorrect Oracle Attestation. Event Id must match.');
                         break;
@@ -985,10 +1034,15 @@ Payout Group not found');
                 }
                 break;
             }
-            case messaging_1.MessageType.ContractInfoV1: {
+            case messaging_1.ContractInfoType.Disjoint: {
                 const contractInfo = dlcOffer.contractInfo;
-                const attestedOracleEvent = contractInfo.contractOraclePairs.find(({ oracleInfo }) => oracleInfo.announcement.oracleEvent.eventId ===
-                    oracleAttestation.eventId);
+                const attestedOracleEvent = contractInfo.contractOraclePairs.find(({ oracleInfo }) => {
+                    if (oracleInfo.type !== messaging_1.MessageType.SingleOracleInfo)
+                        return false;
+                    const singleOracleInfo = oracleInfo;
+                    return (singleOracleInfo.announcement.oracleEvent.eventId ===
+                        oracleAttestation.eventId);
+                });
                 if (!attestedOracleEvent)
                     throw Error('Oracle event of attestation not found.');
                 break;
@@ -997,35 +1051,29 @@ Payout Group not found');
                 throw Error('ContractInfo must be V0 or V1');
         }
     }
-    async FindAndSignCet(_dlcOffer, _dlcAccept, _dlcSign, _dlcTxs, oracleAttestation, isOfferer) {
-        const { dlcOffer, dlcAccept, dlcSign, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcSign,
-            _dlcTxs,
-        });
+    async FindAndSignCet(dlcOffer, dlcAccept, dlcSign, dlcTxs, oracleAttestation, isOfferer) {
         if (isOfferer === undefined)
             isOfferer = await this.isOfferer(dlcOffer, dlcAccept);
         const fundPrivateKey = await this.GetFundPrivateKey(dlcOffer, dlcAccept, isOfferer);
         let signCetRequest;
-        if (dlcOffer.contractInfo.type === messaging_1.MessageType.ContractInfoV0 &&
-            dlcOffer.contractInfo.contractDescriptor.type ===
-                messaging_1.MessageType.ContractDescriptorV0) {
+        if (dlcOffer.contractInfo.contractInfoType === messaging_1.ContractInfoType.Single &&
+            dlcOffer.contractInfo.contractDescriptor
+                .contractDescriptorType === messaging_1.ContractDescriptorType.Enumerated) {
             const outcomeIndex = dlcOffer.contractInfo
-                .contractDescriptor.outcomes.findIndex((outcome) => outcome.outcome.toString('hex') ===
+                .contractDescriptor.outcomes.findIndex((outcome) => outcome.outcome ===
                 (0, crypto_1.sha256)(Buffer.from(oracleAttestation.outcomes[0])).toString('hex'));
             signCetRequest = {
                 cetHex: dlcTxs.cets[outcomeIndex].serialize().toString('hex'),
                 fundPrivkey: fundPrivateKey,
                 fundTxId: dlcTxs.fundTx.txId.toString(),
                 fundVout: dlcTxs.fundTxVout,
-                localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                 oracleSignatures: oracleAttestation.signatures.map((sig) => sig.toString('hex')),
                 fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
                 adaptorSignature: isOfferer
-                    ? dlcAccept.cetSignatures.sigs[outcomeIndex].encryptedSig.toString('hex')
-                    : dlcSign.cetSignatures.sigs[outcomeIndex].encryptedSig.toString('hex'),
+                    ? dlcAccept.cetAdaptorSignatures.sigs[outcomeIndex].encryptedSig.toString('hex')
+                    : dlcSign.cetAdaptorSignatures.sigs[outcomeIndex].encryptedSig.toString('hex'),
             };
         }
         else {
@@ -1039,13 +1087,13 @@ Payout Group not found');
                 fundPrivkey: fundPrivateKey,
                 fundTxId: dlcTxs.fundTx.txId.toString(),
                 fundVout: dlcTxs.fundTxVout,
-                localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-                remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+                localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+                remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
                 oracleSignatures: oracleSignatures.map((sig) => sig.toString('hex')),
                 fundInputAmount: dlcTxs.fundTx.outputs[dlcTxs.fundTxVout].value.sats,
                 adaptorSignature: isOfferer
-                    ? dlcAccept.cetSignatures.sigs[outcomeIndex].encryptedSig.toString('hex')
-                    : dlcSign.cetSignatures.sigs[outcomeIndex].encryptedSig.toString('hex'),
+                    ? dlcAccept.cetAdaptorSignatures.sigs[outcomeIndex].encryptedSig.toString('hex')
+                    : dlcSign.cetAdaptorSignatures.sigs[outcomeIndex].encryptedSig.toString('hex'),
             };
         }
         const finalCet = (await this.SignCet(signCetRequest)).hex;
@@ -1053,7 +1101,7 @@ Payout Group not found');
     }
     async GetFundAddress(dlcOffer, dlcAccept, isOfferer) {
         const network = await this.getConnectedNetwork();
-        const fundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(isOfferer ? dlcOffer.fundingPubKey : dlcAccept.fundingPubKey))
+        const fundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(isOfferer ? dlcOffer.fundingPubkey : dlcAccept.fundingPubkey))
             .serialize()
             .slice(1);
         const fundingAddress = bitcoinjs_lib_1.address.fromOutputScript(fundingSPK, network);
@@ -1069,16 +1117,11 @@ Payout Group not found');
         const fundPrivateKeyPair = await this.GetFundKeyPair(dlcOffer, dlcAccept, isOfferer);
         return Buffer.from(fundPrivateKeyPair.privateKey).toString('hex');
     }
-    async CreateCloseRawTxs(_dlcOffer, _dlcAccept, _dlcTxs, closeInputAmount, isOfferer, _dlcCloses = [], fundingInputs, initiatorPayouts) {
-        const { dlcOffer, dlcAccept, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcTxs,
-        });
+    async CreateCloseRawTxs(dlcOffer, dlcAccept, dlcTxs, closeInputAmount, isOfferer, _dlcCloses = [], fundingInputs, initiatorPayouts) {
         const network = await this.getConnectedNetwork();
         let finalizer;
         if (_dlcCloses.length === 0) {
-            finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSPK, dlcAccept.payoutSPK, dlcOffer.feeRatePerVb);
+            finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSpk, dlcAccept.payoutSpk, dlcOffer.feeRatePerVb);
         }
         const rawTransactionRequestPromises = [];
         const rawCloseTxs = [];
@@ -1109,13 +1152,13 @@ Payout Group not found');
             const txOuts = [];
             if (Number(offerPayoutValue) > 0) {
                 txOuts.push({
-                    address: bitcoinjs_lib_1.address.fromOutputScript(dlcOffer.payoutSPK, network),
+                    address: bitcoinjs_lib_1.address.fromOutputScript(dlcOffer.payoutSpk, network),
                     amount: Number(offerPayoutValue),
                 });
             }
             if (Number(acceptPayoutValue) > 0) {
                 txOuts.push({
-                    address: bitcoinjs_lib_1.address.fromOutputScript(dlcAccept.payoutSPK, network),
+                    address: bitcoinjs_lib_1.address.fromOutputScript(dlcAccept.payoutSpk, network),
                     amount: Number(acceptPayoutValue),
                 });
             }
@@ -1149,9 +1192,9 @@ Payout Group not found');
             _dlcTxs,
         });
         const network = await this.getConnectedNetwork();
-        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) === -1
-            ? [dlcOffer.fundingPubKey, dlcAccept.fundingPubKey]
-            : [dlcAccept.fundingPubKey, dlcOffer.fundingPubKey];
+        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) === -1
+            ? [dlcOffer.fundingPubkey, dlcAccept.fundingPubkey]
+            : [dlcAccept.fundingPubkey, dlcOffer.fundingPubkey];
         const p2ms = bitcoinjs_lib_1.payments.p2ms({
             m: 2,
             pubkeys: fundingPubKeys,
@@ -1219,9 +1262,9 @@ Payout Group not found');
         });
         const dlcCloses = _dlcCloses.map((_dlcClose) => (0, Utils_1.checkTypes)({ _dlcClose }).dlcClose);
         const network = await this.getConnectedNetwork();
-        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) === -1
-            ? [dlcOffer.fundingPubKey, dlcAccept.fundingPubKey]
-            : [dlcAccept.fundingPubKey, dlcOffer.fundingPubKey];
+        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) === -1
+            ? [dlcOffer.fundingPubkey, dlcAccept.fundingPubkey]
+            : [dlcAccept.fundingPubkey, dlcOffer.fundingPubkey];
         const p2ms = bitcoinjs_lib_1.payments.p2ms({
             m: 2,
             pubkeys: fundingPubKeys,
@@ -1231,7 +1274,7 @@ Payout Group not found');
             redeem: p2ms,
             network,
         });
-        const pubkey = isOfferer ? dlcAccept.fundingPubKey : dlcOffer.fundingPubKey;
+        const pubkey = isOfferer ? dlcAccept.fundingPubkey : dlcOffer.fundingPubkey;
         const sigsValidity = [];
         for (let i = 0; i < rawCloseTxs.length; i++) {
             const rawTx = rawCloseTxs[i];
@@ -1270,10 +1313,10 @@ Payout Group not found');
             _dlcAccept,
         });
         const network = await this.getConnectedNetwork();
-        const offerFundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(dlcOffer.fundingPubKey))
+        const offerFundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(dlcOffer.fundingPubkey))
             .serialize()
             .slice(1);
-        const acceptFundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(dlcAccept.fundingPubKey))
+        const acceptFundingSPK = bitcoin_1.Script.p2wpkhLock((0, crypto_1.hash160)(dlcAccept.fundingPubkey))
             .serialize()
             .slice(1);
         const offerFundingAddress = bitcoinjs_lib_1.address.fromOutputScript(offerFundingSPK, network);
@@ -1302,9 +1345,11 @@ Payout Group not found');
     async createDlcOffer(contractInfo, offerCollateralSatoshis, feeRatePerVb, cetLocktime, refundLocktime, fixedInputs) {
         contractInfo.validate();
         const network = await this.getConnectedNetwork();
-        const dlcOffer = new messaging_1.DlcOfferV0();
+        const dlcOffer = new messaging_1.DlcOffer();
+        // Generate a random 32-byte temporary contract ID
+        dlcOffer.temporaryContractId = crypto_2.default.randomBytes(32);
         const { fundingPubKey, payoutSPK, payoutSerialId, fundingInputs: _fundingInputs, changeSPK, changeSerialId, } = await this.Initialize(offerCollateralSatoshis, feeRatePerVb, fixedInputs);
-        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInputV0, 'FundingInput must be V0'));
+        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInput, 'FundingInput must be V0'));
         const fundingInputs = _fundingInputs.map((input) => input);
         fundingInputs.sort((a, b) => Number(a.inputSerialId) - Number(b.inputSerialId));
         const fundOutputSerialId = (0, Utils_1.generateSerialId)();
@@ -1312,19 +1357,20 @@ Payout Group not found');
         dlcOffer.contractFlags = Buffer.from('00', 'hex');
         dlcOffer.chainHash = (0, bitcoin_networks_1.chainHashFromNetwork)(network);
         dlcOffer.contractInfo = contractInfo;
-        dlcOffer.fundingPubKey = fundingPubKey;
-        dlcOffer.payoutSPK = payoutSPK;
+        dlcOffer.fundingPubkey = fundingPubKey;
+        dlcOffer.payoutSpk = payoutSPK;
         dlcOffer.payoutSerialId = payoutSerialId;
-        dlcOffer.offerCollateralSatoshis = offerCollateralSatoshis;
+        dlcOffer.offerCollateral = offerCollateralSatoshis;
         dlcOffer.fundingInputs = fundingInputs;
-        dlcOffer.changeSPK = changeSPK;
+        dlcOffer.changeSpk = changeSPK;
         dlcOffer.changeSerialId = changeSerialId;
-        dlcOffer.fundOutputSerialId = dlcOffer.fundOutputSerialId = fundOutputSerialId;
+        dlcOffer.fundOutputSerialId = dlcOffer.fundOutputSerialId =
+            fundOutputSerialId;
         dlcOffer.feeRatePerVb = feeRatePerVb;
         dlcOffer.cetLocktime = cetLocktime;
         dlcOffer.refundLocktime = refundLocktime;
         (0, assert_1.default)((() => {
-            const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSPK, dlcOffer.changeSPK, null, null, null, dlcOffer.feeRatePerVb);
+            const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSpk, dlcOffer.changeSpk, null, null, null, dlcOffer.feeRatePerVb);
             const funding = fundingInputs.reduce((total, input) => {
                 return total + input.prevTx.outputs[input.prevTxVout].value.sats;
             }, BigInt(0));
@@ -1344,7 +1390,7 @@ Payout Group not found');
         }
         const network = await this.getConnectedNetwork();
         const { fundingInputs: _fundingInputs, changeSPK, changeSerialId, initializeResponses, } = await this.BatchInitialize(offerCollaterals, feeRatePerVb, fixedInputs);
-        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInputV0, 'FundingInput must be V0'));
+        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInput, 'FundingInput must be V0'));
         const fundingInputs = _fundingInputs.map((input) => input);
         fundingInputs.sort((a, b) => Number(a.inputSerialId) - Number(b.inputSerialId));
         const fundOutputsSerialIds = (0, Utils_1.generateSerialIds)(contractInfos.length);
@@ -1354,23 +1400,25 @@ Payout Group not found');
             const fundOutputSerialId = fundOutputsSerialIds[i];
             const { fundingPubKey, payoutSPK, payoutSerialId } = initializeResponses[i];
             const refundLocktime = refundLocktimes[i];
-            const dlcOffer = new messaging_1.DlcOfferV0();
+            const dlcOffer = new messaging_1.DlcOffer();
+            // Generate a random 32-byte temporary contract ID
+            dlcOffer.temporaryContractId = crypto_2.default.randomBytes(32);
             dlcOffer.contractFlags = Buffer.from('00', 'hex');
             dlcOffer.chainHash = (0, bitcoin_networks_1.chainHashFromNetwork)(network);
             dlcOffer.contractInfo = contractInfo;
-            dlcOffer.fundingPubKey = fundingPubKey;
-            dlcOffer.payoutSPK = payoutSPK;
+            dlcOffer.fundingPubkey = fundingPubKey;
+            dlcOffer.payoutSpk = payoutSPK;
             dlcOffer.payoutSerialId = payoutSerialId;
-            dlcOffer.offerCollateralSatoshis = offerCollateralSatoshis;
+            dlcOffer.offerCollateral = offerCollateralSatoshis;
             dlcOffer.fundingInputs = fundingInputs;
-            dlcOffer.changeSPK = changeSPK;
+            dlcOffer.changeSpk = changeSPK;
             dlcOffer.changeSerialId = changeSerialId;
             dlcOffer.fundOutputSerialId = fundOutputSerialId;
             dlcOffer.feeRatePerVb = feeRatePerVb;
             dlcOffer.cetLocktime = cetLocktime;
             dlcOffer.refundLocktime = refundLocktime;
             (0, assert_1.default)((() => {
-                const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSPK, dlcOffer.changeSPK, null, null, null, dlcOffer.feeRatePerVb);
+                const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSpk, dlcOffer.changeSpk, null, null, null, dlcOffer.feeRatePerVb);
                 const funding = fundingInputs.reduce((total, input) => {
                     return total + input.prevTx.outputs[input.prevTxVout].value.sats;
                 }, BigInt(0));
@@ -1390,23 +1438,22 @@ Payout Group not found');
     async acceptDlcOffer(_dlcOffer, fixedInputs) {
         const { dlcOffer } = (0, Utils_1.checkTypes)({ _dlcOffer });
         dlcOffer.validate();
-        const acceptCollateralSatoshis = dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateralSatoshis;
+        const acceptCollateralSatoshis = dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateral;
         (0, assert_1.default)(acceptCollateralSatoshis ===
-            dlcOffer.contractInfo.totalCollateral -
-                dlcOffer.offerCollateralSatoshis, 'acceptCollaterialSatoshis should equal totalCollateral - offerCollateralSatoshis');
+            dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateral, 'acceptCollaterialSatoshis should equal totalCollateral - offerCollateralSatoshis');
         const { fundingPubKey, payoutSPK, payoutSerialId, fundingInputs: _fundingInputs, changeSPK, changeSerialId, } = await this.Initialize(acceptCollateralSatoshis, dlcOffer.feeRatePerVb, fixedInputs);
-        (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubKey, fundingPubKey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
-        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInputV0, 'FundingInput must be V0'));
+        (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubkey, fundingPubKey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
+        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInput, 'FundingInput must be V0'));
         const fundingInputs = _fundingInputs.map((input) => input);
         fundingInputs.sort((a, b) => Number(a.inputSerialId) - Number(b.inputSerialId));
-        const dlcAccept = new messaging_1.DlcAcceptV0();
-        dlcAccept.tempContractId = (0, crypto_1.sha256)(dlcOffer.serialize());
-        dlcAccept.acceptCollateralSatoshis = acceptCollateralSatoshis;
-        dlcAccept.fundingPubKey = fundingPubKey;
-        dlcAccept.payoutSPK = payoutSPK;
+        const dlcAccept = new messaging_1.DlcAccept();
+        dlcAccept.temporaryContractId = (0, crypto_1.sha256)(dlcOffer.serialize());
+        dlcAccept.acceptCollateral = acceptCollateralSatoshis;
+        dlcAccept.fundingPubkey = fundingPubKey;
+        dlcAccept.payoutSpk = payoutSPK;
         dlcAccept.payoutSerialId = dlcAccept.payoutSerialId = payoutSerialId;
         dlcAccept.fundingInputs = fundingInputs;
-        dlcAccept.changeSPK = changeSPK;
+        dlcAccept.changeSpk = changeSPK;
         dlcAccept.changeSerialId = dlcAccept.changeSerialId = changeSerialId;
         (0, assert_1.default)(dlcAccept.changeSerialId !== dlcOffer.fundOutputSerialId, 'changeSerialId cannot equal the fundOutputSerialId');
         (0, assert_1.default)(dlcOffer.payoutSerialId !== dlcAccept.payoutSerialId, 'offer.payoutSerialId cannot equal accept.payoutSerialId');
@@ -1420,21 +1467,19 @@ Payout Group not found');
         })(), 'offer.changeSerialID, accept.changeSerialId and fundOutputSerialId must be unique');
         dlcAccept.validate();
         (0, assert_1.default)((() => {
-            const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSPK, dlcOffer.changeSPK, dlcAccept.fundingInputs, dlcAccept.payoutSPK, dlcAccept.changeSPK, dlcOffer.feeRatePerVb);
+            const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSpk, dlcOffer.changeSpk, dlcAccept.fundingInputs, dlcAccept.payoutSpk, dlcAccept.changeSpk, dlcOffer.feeRatePerVb);
             const funding = fundingInputs.reduce((total, input) => {
                 return total + input.prevTx.outputs[input.prevTxVout].value.sats;
             }, BigInt(0));
             return funding >= acceptCollateralSatoshis + finalizer.acceptFees;
         })(), 'fundingInputs for dlcAccept must be greater than acceptCollateralSatoshis plus acceptFees');
         const { dlcTransactions, messagesList } = await this.createDlcTxs(dlcOffer, dlcAccept);
-        const { cetSignatures, refundSignature, } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, false);
-        (0, assert_1.default)(dlcTransactions.type === messaging_1.MessageType.DlcTransactionsV0, 'DlcTransactions must be V0');
+        const { cetSignatures, refundSignature } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, false);
         const _dlcTransactions = dlcTransactions;
-        const contractId = (0, crypto_1.xor)(_dlcTransactions.fundTx.txId.serialize(), dlcAccept.tempContractId);
+        const contractId = (0, crypto_1.xor)(_dlcTransactions.fundTx.txId.serialize(), dlcAccept.temporaryContractId);
         _dlcTransactions.contractId = contractId;
-        dlcAccept.cetSignatures = cetSignatures;
+        dlcAccept.cetAdaptorSignatures = cetSignatures;
         dlcAccept.refundSignature = refundSignature;
-        dlcAccept.negotiationFields = new messaging_1.NegotiationFieldsV0();
         return { dlcAccept, dlcTransactions: _dlcTransactions };
     }
     async batchAcceptDlcOffer(_dlcOffers, fixedInputs) {
@@ -1443,31 +1488,30 @@ Payout Group not found');
             dlcOffer.validate();
             return dlcOffer;
         });
-        const acceptCollaterals = dlcOffers.map((dlcOffer) => dlcOffer.contractInfo.totalCollateral -
-            dlcOffer.offerCollateralSatoshis);
+        const acceptCollaterals = dlcOffers.map((dlcOffer) => dlcOffer.contractInfo.totalCollateral - dlcOffer.offerCollateral);
         const { fundingInputs: _fundingInputs, changeSPK, changeSerialId, initializeResponses, } = await this.BatchInitialize(acceptCollaterals, dlcOffers[0].feeRatePerVb, fixedInputs);
         // Check that none of the funding pubkeys are the same between the
         // dlcOffers and the dlcAccepts (from initializeResponses)
         dlcOffers.forEach((dlcOffer) => {
             initializeResponses.forEach((initializeResponse) => {
-                (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubKey, initializeResponse.fundingPubKey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
+                (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubkey, initializeResponse.fundingPubKey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
             });
         });
-        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInputV0, 'FundingInput must be V0'));
+        _fundingInputs.forEach((input) => (0, assert_1.default)(input.type === messaging_1.MessageType.FundingInput, 'FundingInput must be V0'));
         const fundingInputs = _fundingInputs.map((input) => input);
         fundingInputs.sort((a, b) => Number(a.inputSerialId) - Number(b.inputSerialId));
         const dlcAccepts = [];
         initializeResponses.forEach((initializeResponse, i) => {
             const dlcOffer = dlcOffers[i];
-            const dlcAccept = new messaging_1.DlcAcceptV0();
+            const dlcAccept = new messaging_1.DlcAccept();
             const { fundingPubKey, payoutSPK, payoutSerialId } = initializeResponse;
-            dlcAccept.tempContractId = (0, crypto_1.sha256)(dlcOffers[i].serialize());
-            dlcAccept.acceptCollateralSatoshis = acceptCollaterals[i];
-            dlcAccept.fundingPubKey = fundingPubKey;
-            dlcAccept.payoutSPK = payoutSPK;
+            dlcAccept.temporaryContractId = (0, crypto_1.sha256)(dlcOffers[i].serialize());
+            dlcAccept.acceptCollateral = acceptCollaterals[i];
+            dlcAccept.fundingPubkey = fundingPubKey;
+            dlcAccept.payoutSpk = payoutSPK;
             dlcAccept.payoutSerialId = payoutSerialId;
             dlcAccept.fundingInputs = fundingInputs;
-            dlcAccept.changeSPK = changeSPK;
+            dlcAccept.changeSpk = changeSPK;
             dlcAccept.changeSerialId = changeSerialId;
             (0, assert_1.default)(dlcAccept.changeSerialId !== dlcOffer.fundOutputSerialId, 'changeSerialId cannot equal the fundOutputSerialId');
             (0, assert_1.default)(dlcOffer.payoutSerialId !== dlcAccept.payoutSerialId, 'offer.payoutSerialId cannot equal accept.payoutSerialId');
@@ -1481,7 +1525,7 @@ Payout Group not found');
             })(), 'offer.changeSerialID, accept.changeSerialId and fundOutputSerialId must be unique');
             dlcAccept.validate();
             (0, assert_1.default)((() => {
-                const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSPK, dlcOffer.changeSPK, dlcAccept.fundingInputs, dlcAccept.payoutSPK, dlcAccept.changeSPK, dlcOffer.feeRatePerVb);
+                const finalizer = new core_1.DualFundingTxFinalizer(dlcOffer.fundingInputs, dlcOffer.payoutSpk, dlcOffer.changeSpk, dlcAccept.fundingInputs, dlcAccept.payoutSpk, dlcAccept.changeSpk, dlcOffer.feeRatePerVb);
                 const funding = fundingInputs.reduce((total, input) => {
                     return total + input.prevTx.outputs[input.prevTxVout].value.sats;
                 }, BigInt(0));
@@ -1489,20 +1533,18 @@ Payout Group not found');
             })(), 'fundingInputs for dlcAccept must be greater than acceptCollateralSatoshis plus acceptFees');
             dlcAccepts.push(dlcAccept);
         });
-        const { dlcTransactionsList, nestedMessagesList, } = await this.createBatchDlcTxs(dlcOffers, dlcAccepts);
+        const { dlcTransactionsList, nestedMessagesList } = await this.createBatchDlcTxs(dlcOffers, dlcAccepts);
         for (let i = 0; i < dlcAccepts.length; i++) {
             const dlcOffer = dlcOffers[i];
             const dlcAccept = dlcAccepts[i];
             const dlcTransactions = dlcTransactionsList[i];
             const messagesList = nestedMessagesList[i];
-            const { cetSignatures, refundSignature, } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, false);
-            (0, assert_1.default)(dlcTransactions.type === messaging_1.MessageType.DlcTransactionsV0, 'DlcTransactions must be V0');
+            const { cetSignatures, refundSignature } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, false);
             const _dlcTransactions = dlcTransactions;
-            const contractId = (0, crypto_1.xor)(_dlcTransactions.fundTx.txId.serialize(), dlcAccept.tempContractId);
+            const contractId = (0, crypto_1.xor)(_dlcTransactions.fundTx.txId.serialize(), dlcAccept.temporaryContractId);
             _dlcTransactions.contractId = contractId;
-            dlcAccepts[i].cetSignatures = cetSignatures;
+            dlcAccepts[i].cetAdaptorSignatures = cetSignatures;
             dlcAccepts[i].refundSignature = refundSignature;
-            dlcAccepts[i].negotiationFields = new messaging_1.NegotiationFieldsV0();
         }
         return { dlcAccepts, dlcTransactionsList };
     }
@@ -1519,18 +1561,18 @@ Payout Group not found');
         });
         dlcOffer.validate();
         dlcAccept.validate();
-        (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
-        const dlcSign = new messaging_1.DlcSignV0();
+        (0, assert_1.default)(Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) !== 0, 'DlcOffer and DlcAccept FundingPubKey cannot be the same');
+        const dlcSign = new messaging_1.DlcSign();
         const { dlcTransactions, messagesList } = await this.createDlcTxs(dlcOffer, dlcAccept);
         await this.VerifyCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcSign, dlcTransactions, messagesList, true);
-        const { cetSignatures, refundSignature, } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, true);
+        const { cetSignatures, refundSignature } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, true);
         const fundingSignatures = await this.CreateFundingSigs(dlcOffer, dlcAccept, dlcTransactions, true);
         const dlcTxs = dlcTransactions;
-        const contractId = (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.tempContractId);
-        (0, assert_1.default)(Buffer.compare(contractId, (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.tempContractId)) === 0, 'contractId must be the xor of funding txid, fundingOutputIndex and the tempContractId');
+        const contractId = (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.temporaryContractId);
+        (0, assert_1.default)(Buffer.compare(contractId, (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.temporaryContractId)) === 0, 'contractId must be the xor of funding txid, fundingOutputIndex and the tempContractId');
         dlcTxs.contractId = contractId;
         dlcSign.contractId = contractId;
-        dlcSign.cetSignatures = cetSignatures;
+        dlcSign.cetAdaptorSignatures = cetSignatures;
         dlcSign.refundSignature = refundSignature;
         dlcSign.fundingSignatures = fundingSignatures;
         return { dlcSign, dlcTransactions: dlcTxs };
@@ -1546,7 +1588,7 @@ Payout Group not found');
             dlcAccept.validate();
             return dlcAccept;
         });
-        const { dlcTransactionsList, nestedMessagesList, } = await this.createBatchDlcTxs(dlcOffers, dlcAccepts);
+        const { dlcTransactionsList, nestedMessagesList } = await this.createBatchDlcTxs(dlcOffers, dlcAccepts);
         const dlcSigns = [];
         const fundingSignatures = await this.CreateFundingSigs(dlcOffers[0], dlcAccepts[0], dlcTransactionsList[0], true);
         for (let i = 0; i < dlcAccepts.length; i++) {
@@ -1554,14 +1596,14 @@ Payout Group not found');
             const dlcAccept = dlcAccepts[i];
             const dlcTransactions = dlcTransactionsList[i];
             const messagesList = nestedMessagesList[i];
-            const dlcSign = new messaging_1.DlcSignV0();
+            const dlcSign = new messaging_1.DlcSign();
             await this.VerifyCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcSign, dlcTransactions, messagesList, true);
-            const { cetSignatures, refundSignature, } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, true);
+            const { cetSignatures, refundSignature } = await this.CreateCetAdaptorAndRefundSigs(dlcOffer, dlcAccept, dlcTransactions, messagesList, true);
             const dlcTxs = dlcTransactions;
-            const contractId = (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.tempContractId);
+            const contractId = (0, crypto_1.xor)(dlcTxs.fundTx.txId.serialize(), dlcAccept.temporaryContractId);
             dlcTxs.contractId = contractId;
             dlcSign.contractId = contractId;
-            dlcSign.cetSignatures = cetSignatures;
+            dlcSign.cetAdaptorSignatures = cetSignatures;
             dlcSign.refundSignature = refundSignature;
             dlcSign.fundingSignatures = fundingSignatures;
             dlcSigns.push(dlcSign);
@@ -1570,26 +1612,20 @@ Payout Group not found');
     }
     /**
      * Finalize Dlc Sign
-     * @param _dlcOffer Dlc Offer Message
-     * @param _dlcAccept Dlc Accept Message
-     * @param _dlcSign Dlc Sign Message
-     * @param _dlcTxs Dlc Transactions Message
+     * @param dlcOffer Dlc Offer Message
+     * @param dlcAccept Dlc Accept Message
+     * @param dlcSign Dlc Sign Message
+     * @param dlcTxs Dlc Transactions Message
      * @returns {Promise<Tx>}
      */
-    async finalizeDlcSign(_dlcOffer, _dlcAccept, _dlcSign, _dlcTxs) {
-        const { dlcOffer, dlcAccept, dlcSign, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcSign,
-            _dlcTxs,
-        });
+    async finalizeDlcSign(dlcOffer, dlcAccept, dlcSign, dlcTxs) {
         let messagesList = [];
-        if (dlcOffer.contractInfo.type === messaging_1.MessageType.ContractInfoV0 &&
+        if (dlcOffer.contractInfo.type === messaging_1.MessageType.SingleContractInfo &&
             dlcOffer.contractInfo.contractDescriptor.type ===
-                messaging_1.MessageType.ContractDescriptorV0) {
+                messaging_1.MessageType.SingleContractInfo) {
             for (const outcome of dlcOffer.contractInfo
                 .contractDescriptor.outcomes) {
-                messagesList.push({ messages: [outcome.outcome.toString('hex')] });
+                messagesList.push({ messages: [outcome.outcome] });
             }
         }
         else {
@@ -1646,13 +1682,7 @@ Payout Group not found');
      * @param isOfferer Whether party is Dlc Offerer
      * @returns {Promise<Tx>}
      */
-    async execute(_dlcOffer, _dlcAccept, _dlcSign, _dlcTxs, oracleAttestation, isOfferer) {
-        const { dlcOffer, dlcAccept, dlcSign, dlcTxs } = (0, Utils_1.checkTypes)({
-            _dlcOffer,
-            _dlcAccept,
-            _dlcSign,
-            _dlcTxs,
-        });
+    async execute(dlcOffer, dlcAccept, dlcSign, dlcTxs, oracleAttestation, isOfferer) {
         if (isOfferer === undefined)
             isOfferer = await this.isOfferer(dlcOffer, dlcAccept);
         this.ValidateEvent(dlcOffer, oracleAttestation);
@@ -1673,7 +1703,7 @@ Payout Group not found');
             _dlcSign,
             _dlcTxs,
         });
-        const signatures = Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) === -1
+        const signatures = Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) === -1
             ? [
                 dlcSign.refundSignature.toString('hex'),
                 dlcAccept.refundSignature.toString('hex'),
@@ -1687,8 +1717,8 @@ Payout Group not found');
             signatures,
             fundTxId: dlcTxs.fundTx.txId.toString(),
             fundVout: dlcTxs.fundTxVout,
-            localFundPubkey: dlcOffer.fundingPubKey.toString('hex'),
-            remoteFundPubkey: dlcAccept.fundingPubKey.toString('hex'),
+            localFundPubkey: dlcOffer.fundingPubkey.toString('hex'),
+            remoteFundPubkey: dlcAccept.fundingPubkey.toString('hex'),
         };
         const refundHex = (await this.AddSignaturesToRefundTx(addSigsToRefundTxRequest)).hex;
         return bitcoin_1.Tx.decode(bufio_1.StreamReader.fromHex(refundHex));
@@ -1719,9 +1749,9 @@ Payout Group not found');
             isOfferer = await this.isOfferer(dlcOffer, dlcAccept);
         const network = await this.getConnectedNetwork();
         const psbt = new bitcoinjs_lib_1.Psbt({ network });
-        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) === -1
-            ? [dlcOffer.fundingPubKey, dlcAccept.fundingPubKey]
-            : [dlcAccept.fundingPubKey, dlcOffer.fundingPubKey];
+        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) === -1
+            ? [dlcOffer.fundingPubkey, dlcAccept.fundingPubkey]
+            : [dlcAccept.fundingPubkey, dlcOffer.fundingPubkey];
         const p2ms = bitcoinjs_lib_1.payments.p2ms({
             m: 2,
             pubkeys: fundingPubKeys,
@@ -1791,7 +1821,7 @@ Payout Group not found');
         const fundingInputs = await Promise.all(inputs.map(async (input) => {
             return this.inputToFundingInput(input);
         }));
-        const finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSPK, dlcAccept.payoutSPK, dlcOffer.feeRatePerVb);
+        const finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSpk, dlcAccept.payoutSpk, dlcOffer.feeRatePerVb);
         const closeInputAmount = BigInt(inputs.reduce((acc, val) => acc + val.value, 0));
         const offerPayoutValue = isOfferer
             ? closeInputAmount +
@@ -1806,11 +1836,11 @@ Payout Group not found');
         const offerFirst = dlcOffer.payoutSerialId < dlcAccept.payoutSerialId;
         psbt.addOutput({
             value: Number(offerFirst ? offerPayoutValue : acceptPayoutValue),
-            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcOffer.payoutSPK : dlcAccept.payoutSPK, network),
+            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcOffer.payoutSpk : dlcAccept.payoutSpk, network),
         });
         psbt.addOutput({
             value: Number(offerFirst ? acceptPayoutValue : offerPayoutValue),
-            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcAccept.payoutSPK : dlcOffer.payoutSPK, network),
+            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcAccept.payoutSpk : dlcOffer.payoutSpk, network),
         });
         // Generate keypair to sign inputs
         const fundPrivateKeyPair = await this.GetFundKeyPair(dlcOffer, dlcAccept, isOfferer);
@@ -1843,10 +1873,10 @@ Payout Group not found');
             pubKeyWitness.witness = inputSigs[i].pubkey;
             witnessElements.push([sigWitness, pubKeyWitness]);
         }
-        const fundingSignatures = new messaging_1.FundingSignaturesV0();
+        const fundingSignatures = new messaging_1.FundingSignatures();
         fundingSignatures.witnessElements = witnessElements;
         // Create DlcClose
-        const dlcClose = new messaging_1.DlcCloseV0();
+        const dlcClose = new messaging_1.DlcClose();
         dlcClose.contractId = dlcTxs.contractId;
         dlcClose.offerPayoutSatoshis = BigInt(psbt.txOutputs[offerFirst ? 0 : 1].value); // You give collateral back to users
         dlcClose.acceptPayoutSatoshis = BigInt(psbt.txOutputs[offerFirst ? 1 : 0].value); // give collateral back to users
@@ -1879,7 +1909,7 @@ Payout Group not found');
             throw Error('funding inputs not supported on BatchDlcClose'); // TODO support multiple funding inputs
         const fundingInputSerialId = (0, Utils_1.generateSerialId)();
         const fundingInputs = []; // TODO: support multiple funding inputs
-        const finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSPK, dlcAccept.payoutSPK, dlcOffer.feeRatePerVb);
+        const finalizer = new core_1.DualClosingTxFinalizer(fundingInputs, dlcOffer.payoutSpk, dlcAccept.payoutSpk, dlcOffer.feeRatePerVb);
         // Generate keypair to sign inputs
         const fundPrivateKeyPair = await this.GetFundKeyPair(dlcOffer, dlcAccept, isOfferer);
         const closeInputAmount = BigInt(0); // TODO support multiple funding inputs
@@ -1902,8 +1932,8 @@ Payout Group not found');
             const acceptPayoutValue = isOfferer
                 ? collateralMinusPayout
                 : closeInputAmount + payoutMinusOfferFees;
-            const fundingSignatures = new messaging_1.FundingSignaturesV0();
-            const dlcClose = new messaging_1.DlcCloseV0();
+            const fundingSignatures = new messaging_1.FundingSignatures();
+            const dlcClose = new messaging_1.DlcClose();
             dlcClose.contractId = dlcTxs.contractId;
             dlcClose.offerPayoutSatoshis = offerPayoutValue;
             dlcClose.acceptPayoutSatoshis = acceptPayoutValue;
@@ -1970,9 +2000,9 @@ Payout Group not found');
         dlcClose.validate();
         const network = await this.getConnectedNetwork();
         const psbt = new bitcoinjs_lib_1.Psbt({ network });
-        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubKey, dlcAccept.fundingPubKey) === -1
-            ? [dlcOffer.fundingPubKey, dlcAccept.fundingPubKey]
-            : [dlcAccept.fundingPubKey, dlcOffer.fundingPubKey];
+        const fundingPubKeys = Buffer.compare(dlcOffer.fundingPubkey, dlcAccept.fundingPubkey) === -1
+            ? [dlcOffer.fundingPubkey, dlcAccept.fundingPubkey]
+            : [dlcAccept.fundingPubkey, dlcOffer.fundingPubkey];
         const p2ms = bitcoinjs_lib_1.payments.p2ms({
             m: 2,
             pubkeys: fundingPubKeys,
@@ -2023,13 +2053,13 @@ Payout Group not found');
             value: Number(offerFirst
                 ? dlcClose.offerPayoutSatoshis
                 : dlcClose.acceptPayoutSatoshis),
-            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcOffer.payoutSPK : dlcAccept.payoutSPK, network),
+            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcOffer.payoutSpk : dlcAccept.payoutSpk, network),
         });
         psbt.addOutput({
             value: Number(offerFirst
                 ? dlcClose.acceptPayoutSatoshis
                 : dlcClose.offerPayoutSatoshis),
-            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcAccept.payoutSPK : dlcOffer.payoutSPK, network),
+            address: bitcoinjs_lib_1.address.fromOutputScript(offerFirst ? dlcAccept.payoutSpk : dlcOffer.payoutSpk, network),
         });
         // add to psbt
         sortedPsbtInputs.forEach((input, i) => psbt.addInput(input));
@@ -2040,7 +2070,7 @@ Payout Group not found');
         psbt.signInput(fundingInputIndex, fundPrivateKeyPair);
         const partialSig = [
             {
-                pubkey: offerer ? dlcAccept.fundingPubKey : dlcOffer.fundingPubKey,
+                pubkey: offerer ? dlcAccept.fundingPubkey : dlcOffer.fundingPubkey,
                 signature: await bitcoinjs_lib_1.script.signature.encode(dlcClose.closeSignature, 1), // encode using SIGHASH_ALL
             },
         ];
@@ -2138,7 +2168,7 @@ Payout Group not found');
         return this._cfdDlcJs.VerifyRefundTxSignature(jsonObject);
     }
     async fundingInputToInput(_input, findDerivationPath = true) {
-        (0, assert_1.default)(_input.type === messaging_1.MessageType.FundingInputV0, 'FundingInput must be V0');
+        (0, assert_1.default)(_input.type === messaging_1.MessageType.FundingInput, 'FundingInput must be V0');
         const network = await this.getConnectedNetwork();
         const input = _input;
         const prevTx = input.prevTx;
@@ -2171,7 +2201,7 @@ Payout Group not found');
         };
     }
     async inputToFundingInput(input) {
-        const fundingInput = new messaging_1.FundingInputV0();
+        const fundingInput = new messaging_1.FundingInput();
         fundingInput.prevTxVout = input.vout;
         let txRaw = '';
         try {