update protobuf definition

config/pb.proto

@@ -189,7 +189,7 @@ message OfferAvailabilityResponse {
     repeated int32 supported_capabilities = 3;
     string uid = 4;
     string maker_signature = 5;
-    NodeAddress arbitrator_node_address = 6;
+    NodeAddress backup_arbitrator = 6;
 }
 
 message RefreshOfferMessage {
@@ -853,7 +853,7 @@ message OfferPayload {
     map<string, string> extra_data = 34;
     int32 protocol_version = 35;
 
-    NodeAddress arbitrator_node_address = 1001;
+    NodeAddress arbitrator_signer = 1001;
     string arbitrator_signature = 1002;
     repeated string reserve_tx_key_images = 1003;
 }
@@ -964,7 +964,7 @@ message DisputeResult {
     bool screen_cast = 7;
     string summary_notes = 8;
     ChatMessage chat_message = 9;
-    reserved 10; // was bytes arbitrator_signature = 10;
+    bytes arbitrator_signature = 10;
     int64 buyer_payout_amount = 11;
     int64 seller_payout_amount = 12;
     bytes arbitrator_pub_key = 13;
@@ -1472,9 +1472,11 @@ message OpenOffer {
 
     Offer offer = 1;
     State state = 2;
-    NodeAddress arbitrator_node_address = 3;
+    NodeAddress backup_arbitrator = 3;
     int64 trigger_price = 4;
-    repeated string frozen_key_images = 5;
+    string reserve_tx_hash = 5;
+    string reserve_tx_hex = 6;
+    string reserve_tx_key = 7;
 }
 
 message Tradable {
@@ -1644,18 +1646,16 @@ message ProcessModel {
     int64 seller_payout_amount_from_mediation = 20;
 
     string maker_signature = 1001;
-    NodeAddress arbitrator_node_address = 1002;
+    NodeAddress backup_arbitrator = 1002;
     TradingPeer maker = 1003;
     TradingPeer taker = 1004;
     TradingPeer arbitrator = 1005;
     NodeAddress temp_trading_peer_node_address = 1006;
-    string reserve_tx_hash = 1007;
-    repeated string frozen_key_images = 1008;
-    string prepared_multisig_hex = 1009;
-    string made_multisig_hex = 1010;
-    bool multisig_setup_complete = 1011;
-    bool maker_ready_to_fund_multisig = 1012;
-    bool multisig_deposit_initiated = 1013;
+    string prepared_multisig_hex = 1007;
+    string made_multisig_hex = 1008;
+    bool multisig_setup_complete = 1009;
+    bool maker_ready_to_fund_multisig = 1010;
+    bool multisig_deposit_initiated = 1011;
 }
 
 message TradingPeer {
@@ -1681,12 +1681,13 @@ message TradingPeer {
     string reserve_tx_hash = 1001;
     string reserve_tx_hex = 1002;
     string reserve_tx_key = 1003;
-    string prepared_multisig_hex = 1004;
-    string made_multisig_hex = 1005;
-    string signed_payout_tx_hex = 1006;
-    string deposit_tx_hash = 1007;
-    string deposit_tx_hex = 1008;
-    string deposit_tx_key = 1009;
+    repeated string reserve_tx_key_images = 1004;
+    string prepared_multisig_hex = 1005;
+    string made_multisig_hex = 1006;
+    string signed_payout_tx_hex = 1007;
+    string deposit_tx_hash = 1008;
+    string deposit_tx_hex = 1009;
+    string deposit_tx_key = 1010;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////

src/HavenoDaemon.test.ts

@@ -66,16 +66,15 @@ beforeAll(async () => {
   // initialize client of monerod
   monerod = await monerojs.connectToDaemonRpc(moneroDaemonUrl, moneroDaemonUsername, moneroDaemonPassword);
   
-  // initialize funding wallet
-  await initFundingWallet();
-  
   // create client connected to alice's internal wallet
   aliceWallet = await monerojs.connectToWalletRpc(aliceWalletUrl, aliceWalletUsername, aliceWalletPassword);
   
+  // initialize funding wallet
+  await initFundingWallet();
+  
   // debug tools
   //for (let offer of await alice.getMyOffers("BUY")) await alice.removeOffer(offer.getId());
   //for (let offer of await alice.getMyOffers("SELL")) await alice.removeOffer(offer.getId());
-  //for (let frozenOutput of await aliceWallet.getOutputs({isFrozen: true})) await aliceWallet.thawOutput(frozenOutput.getKeyImage().getHex());
   //console.log((await alice.getBalances()).getUnlockedBalance() + ", " + (await alice.getBalances()).getLockedBalance());
   //console.log((await bob.getBalances()).getUnlockedBalance() + ", " + (await bob.getBalances()).getLockedBalance());
 });

src/protobuf/pb_pb.d.ts

@@ -824,10 +824,10 @@ export class OfferAvailabilityResponse extends jspb.Message {
   getMakerSignature(): string;
   setMakerSignature(value: string): OfferAvailabilityResponse;
 
-  getArbitratorNodeAddress(): NodeAddress | undefined;
-  setArbitratorNodeAddress(value?: NodeAddress): OfferAvailabilityResponse;
-  hasArbitratorNodeAddress(): boolean;
-  clearArbitratorNodeAddress(): OfferAvailabilityResponse;
+  getBackupArbitrator(): NodeAddress | undefined;
+  setBackupArbitrator(value?: NodeAddress): OfferAvailabilityResponse;
+  hasBackupArbitrator(): boolean;
+  clearBackupArbitrator(): OfferAvailabilityResponse;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OfferAvailabilityResponse.AsObject;
@@ -844,7 +844,7 @@ export namespace OfferAvailabilityResponse {
     supportedCapabilitiesList: Array<number>,
     uid: string,
     makerSignature: string,
-    arbitratorNodeAddress?: NodeAddress.AsObject,
+    backupArbitrator?: NodeAddress.AsObject,
   }
 }
 
@@ -3719,10 +3719,10 @@ export class OfferPayload extends jspb.Message {
   getProtocolVersion(): number;
   setProtocolVersion(value: number): OfferPayload;
 
-  getArbitratorNodeAddress(): NodeAddress | undefined;
-  setArbitratorNodeAddress(value?: NodeAddress): OfferPayload;
-  hasArbitratorNodeAddress(): boolean;
-  clearArbitratorNodeAddress(): OfferPayload;
+  getArbitratorSigner(): NodeAddress | undefined;
+  setArbitratorSigner(value?: NodeAddress): OfferPayload;
+  hasArbitratorSigner(): boolean;
+  clearArbitratorSigner(): OfferPayload;
 
   getArbitratorSignature(): string;
   setArbitratorSignature(value: string): OfferPayload;
@@ -3777,7 +3777,7 @@ export namespace OfferPayload {
     hashOfChallenge: string,
     extraDataMap: Array<[string, string]>,
     protocolVersion: number,
-    arbitratorNodeAddress?: NodeAddress.AsObject,
+    arbitratorSigner?: NodeAddress.AsObject,
     arbitratorSignature: string,
     reserveTxKeyImagesList: Array<string>,
   }
@@ -4097,6 +4097,11 @@ export class DisputeResult extends jspb.Message {
   hasChatMessage(): boolean;
   clearChatMessage(): DisputeResult;
 
+  getArbitratorSignature(): Uint8Array | string;
+  getArbitratorSignature_asU8(): Uint8Array;
+  getArbitratorSignature_asB64(): string;
+  setArbitratorSignature(value: Uint8Array | string): DisputeResult;
+
   getBuyerPayoutAmount(): number;
   setBuyerPayoutAmount(value: number): DisputeResult;
 
@@ -4139,6 +4144,7 @@ export namespace DisputeResult {
     screenCast: boolean,
     summaryNotes: string,
     chatMessage?: ChatMessage.AsObject,
+    arbitratorSignature: Uint8Array | string,
     buyerPayoutAmount: number,
     sellerPayoutAmount: number,
     arbitratorPubKey: Uint8Array | string,
@@ -6154,18 +6160,22 @@ export class OpenOffer extends jspb.Message {
   getState(): OpenOffer.State;
   setState(value: OpenOffer.State): OpenOffer;
 
-  getArbitratorNodeAddress(): NodeAddress | undefined;
-  setArbitratorNodeAddress(value?: NodeAddress): OpenOffer;
-  hasArbitratorNodeAddress(): boolean;
-  clearArbitratorNodeAddress(): OpenOffer;
+  getBackupArbitrator(): NodeAddress | undefined;
+  setBackupArbitrator(value?: NodeAddress): OpenOffer;
+  hasBackupArbitrator(): boolean;
+  clearBackupArbitrator(): OpenOffer;
 
   getTriggerPrice(): number;
   setTriggerPrice(value: number): OpenOffer;
 
-  getFrozenKeyImagesList(): Array<string>;
-  setFrozenKeyImagesList(value: Array<string>): OpenOffer;
-  clearFrozenKeyImagesList(): OpenOffer;
-  addFrozenKeyImages(value: string, index?: number): OpenOffer;
+  getReserveTxHash(): string;
+  setReserveTxHash(value: string): OpenOffer;
+
+  getReserveTxHex(): string;
+  setReserveTxHex(value: string): OpenOffer;
+
+  getReserveTxKey(): string;
+  setReserveTxKey(value: string): OpenOffer;
 
   serializeBinary(): Uint8Array;
   toObject(includeInstance?: boolean): OpenOffer.AsObject;
@@ -6179,9 +6189,11 @@ export namespace OpenOffer {
   export type AsObject = {
     offer?: Offer.AsObject,
     state: OpenOffer.State,
-    arbitratorNodeAddress?: NodeAddress.AsObject,
+    backupArbitrator?: NodeAddress.AsObject,
     triggerPrice: number,
-    frozenKeyImagesList: Array<string>,
+    reserveTxHash: string,
+    reserveTxHex: string,
+    reserveTxKey: string,
   }
 
   export enum State { 
@@ -6690,10 +6702,10 @@ export class ProcessModel extends jspb.Message {
   getMakerSignature(): string;
   setMakerSignature(value: string): ProcessModel;
 
-  getArbitratorNodeAddress(): NodeAddress | undefined;
-  setArbitratorNodeAddress(value?: NodeAddress): ProcessModel;
-  hasArbitratorNodeAddress(): boolean;
-  clearArbitratorNodeAddress(): ProcessModel;
+  getBackupArbitrator(): NodeAddress | undefined;
+  setBackupArbitrator(value?: NodeAddress): ProcessModel;
+  hasBackupArbitrator(): boolean;
+  clearBackupArbitrator(): ProcessModel;
 
   getMaker(): TradingPeer | undefined;
   setMaker(value?: TradingPeer): ProcessModel;
@@ -6715,14 +6727,6 @@ export class ProcessModel extends jspb.Message {
   hasTempTradingPeerNodeAddress(): boolean;
   clearTempTradingPeerNodeAddress(): ProcessModel;
 
-  getReserveTxHash(): string;
-  setReserveTxHash(value: string): ProcessModel;
-
-  getFrozenKeyImagesList(): Array<string>;
-  setFrozenKeyImagesList(value: Array<string>): ProcessModel;
-  clearFrozenKeyImagesList(): ProcessModel;
-  addFrozenKeyImages(value: string, index?: number): ProcessModel;
-
   getPreparedMultisigHex(): string;
   setPreparedMultisigHex(value: string): ProcessModel;
 
@@ -6764,13 +6768,11 @@ export namespace ProcessModel {
     buyerPayoutAmountFromMediation: number,
     sellerPayoutAmountFromMediation: number,
     makerSignature: string,
-    arbitratorNodeAddress?: NodeAddress.AsObject,
+    backupArbitrator?: NodeAddress.AsObject,
     maker?: TradingPeer.AsObject,
     taker?: TradingPeer.AsObject,
     arbitrator?: TradingPeer.AsObject,
     tempTradingPeerNodeAddress?: NodeAddress.AsObject,
-    reserveTxHash: string,
-    frozenKeyImagesList: Array<string>,
     preparedMultisigHex: string,
     madeMultisigHex: string,
     multisigSetupComplete: boolean,
@@ -6861,6 +6863,11 @@ export class TradingPeer extends jspb.Message {
   getReserveTxKey(): string;
   setReserveTxKey(value: string): TradingPeer;
 
+  getReserveTxKeyImagesList(): Array<string>;
+  setReserveTxKeyImagesList(value: Array<string>): TradingPeer;
+  clearReserveTxKeyImagesList(): TradingPeer;
+  addReserveTxKeyImages(value: string, index?: number): TradingPeer;
+
   getPreparedMultisigHex(): string;
   setPreparedMultisigHex(value: string): TradingPeer;
 
@@ -6910,6 +6917,7 @@ export namespace TradingPeer {
     reserveTxHash: string,
     reserveTxHex: string,
     reserveTxKey: string,
+    reserveTxKeyImagesList: Array<string>,
     preparedMultisigHex: string,
     madeMultisigHex: string,
     signedPayoutTxHex: string,