test buyer and seller payout tx fee and amount

dist/protobuf/grpc_pb.d.ts

@@ -2650,12 +2650,6 @@ export class TradeInfo extends jspb.Message {
   getTakerFee(): string;
   setTakerFee(value: string): TradeInfo;
 
-  getTakerFeeTxId(): string;
-  setTakerFeeTxId(value: string): TradeInfo;
-
-  getPayoutTxId(): string;
-  setPayoutTxId(value: string): TradeInfo;
-
   getAmount(): string;
   setAmount(value: string): TradeInfo;
 
@@ -2665,6 +2659,24 @@ export class TradeInfo extends jspb.Message {
   getSellerSecurityDeposit(): string;
   setSellerSecurityDeposit(value: string): TradeInfo;
 
+  getBuyerDepositTxFee(): string;
+  setBuyerDepositTxFee(value: string): TradeInfo;
+
+  getSellerDepositTxFee(): string;
+  setSellerDepositTxFee(value: string): TradeInfo;
+
+  getBuyerPayoutTxFee(): string;
+  setBuyerPayoutTxFee(value: string): TradeInfo;
+
+  getSellerPayoutTxFee(): string;
+  setSellerPayoutTxFee(value: string): TradeInfo;
+
+  getBuyerPayoutAmount(): string;
+  setBuyerPayoutAmount(value: string): TradeInfo;
+
+  getSellerPayoutAmount(): string;
+  setSellerPayoutAmount(value: string): TradeInfo;
+
   getPrice(): string;
   setPrice(value: string): TradeInfo;
 
@@ -2733,6 +2745,9 @@ export class TradeInfo extends jspb.Message {
   getTakerDepositTxId(): string;
   setTakerDepositTxId(value: string): TradeInfo;
 
+  getPayoutTxId(): string;
+  setPayoutTxId(value: string): TradeInfo;
+
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): TradeInfo.AsObject;
   static toObject(includeInstance: boolean, msg: TradeInfo): TradeInfo.AsObject;
@@ -2749,11 +2764,15 @@ export namespace TradeInfo {
     date: number,
     role: string,
     takerFee: string,
-    takerFeeTxId: string,
-    payoutTxId: string,
     amount: string,
     buyerSecurityDeposit: string,
     sellerSecurityDeposit: string,
+    buyerDepositTxFee: string,
+    sellerDepositTxFee: string,
+    buyerPayoutTxFee: string,
+    sellerPayoutTxFee: string,
+    buyerPayoutAmount: string,
+    sellerPayoutAmount: string,
     price: string,
     arbitratorNodeAddress: string,
     tradePeerNodeAddress: string,
@@ -2776,6 +2795,7 @@ export namespace TradeInfo {
     tradeVolume: string,
     makerDepositTxId: string,
     takerDepositTxId: string,
+    payoutTxId: string,
   }
 }
 

dist/protobuf/pb_pb.d.ts

@@ -3180,11 +3180,11 @@ export class DisputeResult extends jspb.Message {
   getArbitratorSignature_asB64(): string;
   setArbitratorSignature(value: Uint8Array | string): DisputeResult;
 
-  getBuyerPayoutAmount(): number;
-  setBuyerPayoutAmount(value: number): DisputeResult;
+  getBuyerPayoutAmountBeforeCost(): number;
+  setBuyerPayoutAmountBeforeCost(value: number): DisputeResult;
 
-  getSellerPayoutAmount(): number;
-  setSellerPayoutAmount(value: number): DisputeResult;
+  getSellerPayoutAmountBeforeCost(): number;
+  setSellerPayoutAmountBeforeCost(value: number): DisputeResult;
 
   getSubtractFeeFrom(): DisputeResult.SubtractFeeFrom;
   setSubtractFeeFrom(value: DisputeResult.SubtractFeeFrom): DisputeResult;
@@ -3220,8 +3220,8 @@ export namespace DisputeResult {
     summaryNotes: string,
     chatMessage?: ChatMessage.AsObject,
     arbitratorSignature: Uint8Array | string,
-    buyerPayoutAmount: number,
-    sellerPayoutAmount: number,
+    buyerPayoutAmountBeforeCost: number,
+    sellerPayoutAmountBeforeCost: number,
     subtractFeeFrom: DisputeResult.SubtractFeeFrom,
     arbitratorPubKey: Uint8Array | string,
     closeDate: number,
@@ -6030,9 +6030,6 @@ export class Trade extends jspb.Message {
   getTakerFee(): number;
   setTakerFee(value: number): Trade;
 
-  getTotalTxFee(): number;
-  setTotalTxFee(value: number): Trade;
-
   getTakeOfferDate(): number;
   setTakeOfferDate(value: number): Trade;
 
@@ -6125,7 +6122,6 @@ export namespace Trade {
     payoutTxKey: string,
     amount: number,
     takerFee: number,
-    totalTxFee: number,
     takeOfferDate: number,
     price: number,
     state: Trade.State,
@@ -6531,6 +6527,12 @@ export class TradePeer extends jspb.Message {
   getExchangedMultisigHex(): string;
   setExchangedMultisigHex(value: string): TradePeer;
 
+  getUpdatedMultisigHex(): string;
+  setUpdatedMultisigHex(value: string): TradePeer;
+
+  getDepositsConfirmedMessageAcked(): boolean;
+  setDepositsConfirmedMessageAcked(value: boolean): TradePeer;
+
   getDepositTxHash(): string;
   setDepositTxHash(value: string): TradePeer;
 
@@ -6546,11 +6548,14 @@ export class TradePeer extends jspb.Message {
   getSecurityDeposit(): number;
   setSecurityDeposit(value: number): TradePeer;
 
-  getUpdatedMultisigHex(): string;
-  setUpdatedMultisigHex(value: string): TradePeer;
+  getUnsignedPayoutTxHex(): string;
+  setUnsignedPayoutTxHex(value: string): TradePeer;
 
-  getDepositsConfirmedMessageAcked(): boolean;
-  setDepositsConfirmedMessageAcked(value: boolean): TradePeer;
+  getPayoutTxFee(): number;
+  setPayoutTxFee(value: number): TradePeer;
+
+  getPayoutAmount(): number;
+  setPayoutAmount(value: number): TradePeer;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): TradePeer.AsObject;
@@ -6589,13 +6594,16 @@ export namespace TradePeer {
     preparedMultisigHex: string,
     madeMultisigHex: string,
     exchangedMultisigHex: string,
+    updatedMultisigHex: string,
+    depositsConfirmedMessageAcked: boolean,
     depositTxHash: string,
     depositTxHex: string,
     depositTxKey: string,
     depositTxFee: number,
     securityDeposit: number,
-    updatedMultisigHex: string,
-    depositsConfirmedMessageAcked: boolean,
+    unsignedPayoutTxHex: string,
+    payoutTxFee: number,
+    payoutAmount: number,
   }
 }
 

src/HavenoClient.test.ts

@@ -89,7 +89,8 @@ class PeerContext {
   depositTx: moneroTs.MoneroTx;
   depositTxFee: bigint;
   securityDepositActual: bigint;
-  payoutAmount: bigint
+  payoutTxFee: bigint;
+  payoutAmount: bigint;
 
   constructor(ctx?: Partial<PeerContext>) {
     Object.assign(this, ctx);
@@ -259,6 +260,10 @@ class TradeContext {
     return this.disputeWinner === DisputeResult.Winner.BUYER ? this.getSeller() : this.getBuyer();
   }
 
+  isOfflineFlow() {
+    return this.buyerOfflineAfterDisputeOpened || this.sellerOfflineAfterDisputeOpened || this.buyerOfflineAfterPaymentSent || this.buyerOfflineAfterTake || this.sellerOfflineAfterTake;
+  }
+
   static init(ctxP: Partial<TradeContext> | undefined): TradeContext {
     let ctx = ctxP instanceof TradeContext ? ctxP : new TradeContext(ctxP);
     if (!ctx.offerAmount && ctx.tradeAmount) ctx.offerAmount = ctx.tradeAmount;
@@ -1755,7 +1760,7 @@ test("Can resolve disputes (CI)", async () => {
   await executeTrades(ctxs.slice(configIdx, configIdx === undefined ? undefined : configIdx + 1), {concurrentTrades: !testBalancesSequentially});
 });
 
-test("Can go offline while resolving disputes (CI)", async () => {
+test("Can go offline while resolving a dispute (CI)", async () => {
   let traders: HavenoClient[] = [];
   let ctx: Partial<TradeContext> = {};
   let err: any;
@@ -2455,10 +2460,7 @@ async function executeTrade(ctxP: Partial<TradeContext>): Promise<string> {
     }
 
     // test balances after payout tx unless other trades can interfere
-    if (!ctx.concurrentTrades) {
-      await testBalancesAfterComplete(ctx, ctx.getMaker());
-      await testBalancesAfterComplete(ctx, ctx.getTaker());
-    }
+    if (!ctx.concurrentTrades) await testAmountsAfterComplete(ctx);
 
     // test payout unlock
     await testTradePayoutUnlock(ctx);
@@ -2787,7 +2789,7 @@ async function testOpenDispute(ctxP: Partial<TradeContext>) {
   await arbitrator.addNotificationListener(notification => { HavenoUtils.log(3, "Arbitrator received notification " + notification.getType() + " " + (notification.getChatMessage() ? notification.getChatMessage()?.getMessage() : "")); arbitratorNotifications.push(notification); });
 
   // arbitrator sends chat messages to traders
-  HavenoUtils.log(1, "Testing chat messages");
+  HavenoUtils.log(1, "Arbitrator sending chat messages to traders. tradeId=" + ctx.offerId + ", disputeId=" + openerDispute.getId());
   await ctx.arbitrator.havenod!.sendDisputeChatMessage(arbDisputeOpener!.getId(), "Arbitrator chat message to dispute opener", []);
   await ctx.arbitrator.havenod!.sendDisputeChatMessage(arbDisputePeer!.getId(), "Arbitrator chat message to dispute peer", []);
 
@@ -2887,8 +2889,6 @@ async function resolveDispute(ctxP: Partial<TradeContext>) {
   }
 
   // resolve dispute according to configuration
-  const winnerd = ctx.disputeWinner === DisputeResult.Winner.BUYER ? ctx.getBuyer().havenod : ctx.getSeller().havenod;
-  const loserd = ctx.disputeWinner === DisputeResult.Winner.BUYER ? ctx.getSeller().havenod : ctx.getBuyer().havenod;
   HavenoUtils.log(1, "Resolving dispute for trade " + ctx.offerId);
   const startTime = Date.now();
   await arbitrator.resolveDispute(ctx.offerId!, ctx.disputeWinner!, ctx.disputeReason!, ctx.disputeSummary!, ctx.disputeWinnerAmount);
@@ -2926,7 +2926,10 @@ async function resolveDispute(ctxP: Partial<TradeContext>) {
   await testTradeState(await ctx.arbitrator.havenod!.getTrade(ctx.offerId!), {phase: "COMPLETED", payoutState: ["PAYOUT_PUBLISHED", "PAYOUT_CONFIRMED", "PAYOUT_UNLOCKED"], disputeState: "DISPUTE_CLOSED", isCompleted: true, isPayoutPublished: true});
 
   // signing peer has payout tx id on 0 conf (peers must wait for confirmation to see outgoing tx)
-  if (winnerd) ctx.payoutTxId = (await winnerd!.getTrade(ctx.offerId!)).getPayoutTxId()
+  const winnerd = ctx.disputeWinner === DisputeResult.Winner.BUYER ? ctx.getBuyer().havenod : ctx.getSeller().havenod;
+  const loserd = ctx.disputeWinner === DisputeResult.Winner.BUYER ? ctx.getSeller().havenod : ctx.getBuyer().havenod;
+  const signerd = winnerd ? winnerd : loserd;
+  ctx.payoutTxId = (await signerd!.getTrade(ctx.offerId!)).getPayoutTxId();
 
   // record balances on completion
   if (!ctx.maker.balancesAfterPayout) {
@@ -2935,45 +2938,68 @@ async function resolveDispute(ctxP: Partial<TradeContext>) {
   }
 
   // test balances after payout tx unless concurrent trades
-  if (!ctx.concurrentTrades) {
-    if (winnerd) await testBalancesAfterComplete(ctx, ctx.getDisputeWinner()!);
-    if (loserd) await testBalancesAfterComplete(ctx, ctx.getDisputeLoser()!);
- }
+  if (!ctx.concurrentTrades) await testAmountsAfterComplete(ctx);
 
   // test payout unlock
   await testTradePayoutUnlock(ctx);
 }
 
-async function testBalancesAfterComplete(tradeCtx: TradeContext, peerCtx: PeerContext) {
+async function testAmountsAfterComplete(tradeCtx: TradeContext) {
 
-  // update context
-  const trade = await peerCtx.havenod?.getTrade(tradeCtx.offerId!)!;
-  peerCtx.trade = trade;
+  // get payout tx
   if (!tradeCtx.payoutTxId) throw new Error("Missing payout tx id");
   const payoutTx = await monerod.getTx(tradeCtx.payoutTxId);
   const payoutTxFee = BigInt(payoutTx!.getFee());
 
-  // calculate expected payout amount for normal trade
-  if (tradeCtx.getDisputeOpener() === undefined) {
-    let receiveAmount: bigint = tradeCtx.getBuyer() == peerCtx ? BigInt(trade.getAmount()) : 0n;
-    peerCtx.payoutAmount = peerCtx.securityDepositActual + receiveAmount - (payoutTxFee / 2n);
-  }
+  // get expected payouts for normal trade
+  const isDisputedTrade = tradeCtx.getDisputeOpener() !== undefined;
+  if (!isDisputedTrade) {
+    tradeCtx.getBuyer().payoutTxFee = payoutTxFee / 2n;
+    tradeCtx.getBuyer().payoutAmount = tradeCtx.getBuyer().securityDepositActual + tradeCtx.tradeAmount! - tradeCtx.getBuyer().payoutTxFee;
+    tradeCtx.getSeller().payoutTxFee = payoutTxFee / 2n;
+    tradeCtx.getSeller().payoutAmount = tradeCtx.getSeller().securityDepositActual - tradeCtx.getSeller().payoutTxFee;
+  } else {
 
-  // calculate expected payout amount for dispute trade
-  else {
+    // get expected payouts for disputed trade
     const winnerGetsAll = tradeCtx.disputeWinnerAmount === tradeCtx.maker.securityDepositActual! + tradeCtx.taker.securityDepositActual! + tradeCtx.tradeAmount!;
-    if (tradeCtx.getDisputeWinner() === peerCtx) {
-      if (tradeCtx.disputeWinnerAmount) peerCtx.payoutAmount = tradeCtx.disputeWinnerAmount - (winnerGetsAll ? payoutTxFee : 0n);
-      else peerCtx.payoutAmount = tradeCtx.tradeAmount! + peerCtx.securityDepositActual - (payoutTxFee / 2n);
+    if (tradeCtx.disputeWinnerAmount) {
+      tradeCtx.getDisputeWinner()!.payoutTxFee = winnerGetsAll ? payoutTxFee : 0n;
+      tradeCtx.getDisputeWinner()!.payoutAmount = tradeCtx.disputeWinnerAmount - tradeCtx.getDisputeWinner()!.payoutTxFee;
+      tradeCtx.getDisputeLoser()!.payoutTxFee = winnerGetsAll ? 0n : payoutTxFee;
+      tradeCtx.getDisputeLoser()!.payoutAmount = tradeCtx.maker.securityDepositActual! + tradeCtx.taker.securityDepositActual! + tradeCtx.tradeAmount! - tradeCtx.disputeWinnerAmount - tradeCtx.getDisputeLoser()!.payoutTxFee;
     } else {
-      if (tradeCtx.disputeWinnerAmount) {
-        const multisigBalance = tradeCtx.maker.securityDepositActual! + tradeCtx.taker.securityDepositActual! + tradeCtx.tradeAmount!;
-        peerCtx.payoutAmount = multisigBalance - tradeCtx.disputeWinnerAmount - (winnerGetsAll ? 0n : payoutTxFee);
-      }
-      else peerCtx.payoutAmount = peerCtx.securityDepositActual - (payoutTxFee / 2n);
+      tradeCtx.getDisputeWinner()!.payoutTxFee = payoutTxFee / 2n;
+      tradeCtx.getDisputeWinner()!.payoutAmount = tradeCtx.tradeAmount! + tradeCtx.getDisputeWinner()!.securityDepositActual - tradeCtx.getDisputeWinner()!.payoutTxFee;
+      tradeCtx.getDisputeLoser()!.payoutTxFee = payoutTxFee / 2n;
+      tradeCtx.getDisputeLoser()!.payoutAmount = tradeCtx.getDisputeLoser()!.securityDepositActual - tradeCtx.getDisputeLoser()!.payoutTxFee;
     }
   }
 
+  // TODO: payout tx is unknown to offline non-signer until confirmed
+  if (isDisputedTrade || tradeCtx.isOfflineFlow()) {
+    await mineToHeight(await monerod.getHeight() + 1);
+    await wait(TestConfig.maxWalletStartupMs + tradeCtx.walletSyncPeriodMs * 2);
+  }
+
+  // test trade payouts
+  if (tradeCtx.maker.havenod) await testPeerAmountsAfterComplete(tradeCtx, tradeCtx.getMaker());
+  if (tradeCtx.taker.havenod) await testPeerAmountsAfterComplete(tradeCtx, tradeCtx.getTaker());
+}
+
+async function testPeerAmountsAfterComplete(tradeCtx: TradeContext, peerCtx: PeerContext) {
+
+  // get trade
+  const trade = await peerCtx.havenod.getTrade(tradeCtx.offerId!);
+
+  // test trade amounts
+  const isBuyer = tradeCtx.getBuyer() === peerCtx;
+  if (isBuyer) expect(BigInt(trade.getBuyerDepositTxFee())).toEqual(tradeCtx.getBuyer().depositTxFee); // TODO: get and test peer's security deposit tx fee?
+  else expect(BigInt(trade.getSellerDepositTxFee())).toEqual(tradeCtx.getSeller().depositTxFee);
+  expect(BigInt(trade.getBuyerPayoutTxFee())).toEqual(tradeCtx.getBuyer().payoutTxFee);
+  expect(BigInt(trade.getSellerPayoutTxFee())).toEqual(tradeCtx.getSeller().payoutTxFee);
+  expect(BigInt(trade.getBuyerPayoutAmount())).toEqual(tradeCtx.getBuyer().payoutAmount);
+  expect(BigInt(trade.getSellerPayoutAmount())).toEqual(tradeCtx.getSeller().payoutAmount);
+
   // test balance change after payout tx
   const differenceAfterPayout = BigInt(peerCtx.balancesAfterPayout?.getBalance()!) - BigInt(peerCtx.balancesBeforePayout?.getBalance()!);
   expect(differenceAfterPayout).toEqual(peerCtx.payoutAmount);