pending operations (pay/proposals)

1 files changed, 52 insertions, 12 deletions

diff --git a/src/dbTypes.ts b/src/dbTypes.ts
index 731f0358b..4f374c260 100644
--- a/src/dbTypes.ts
+++ b/src/dbTypes.ts
@@ -586,22 +586,30 @@ export interface CoinRecord {
 }
 
 export enum ProposalStatus {
+  /**
+   * Not downloaded yet.
+   */
+  DOWNLOADING = "downloading",
+  /**
+   * Proposal downloaded, but the user needs to accept/reject it.
+   */
   PROPOSED = "proposed",
+  /**
+   * The user has accepted the proposal.
+   */
   ACCEPTED = "accepted",
+  /**
+   * The user has rejected the proposal.
+   */
   REJECTED = "rejected",
-}
-
-/**
- * Record for a downloaded order, stored in the wallet's database.
- */
-@Checkable.Class()
-export class ProposalRecord {
   /**
-   * URL where the proposal was downloaded.
+   * Downloaded proposal was detected as a re-purchase.
    */
-  @Checkable.String()
-  url: string;
+  REPURCHASE = "repurchase",
+}
 
+@Checkable.Class()
+export class ProposalDownload {
   /**
    * The contract that was offered by the merchant.
    */
@@ -615,10 +623,27 @@ export class ProposalRecord {
   merchantSig: string;
 
   /**
-   * Hash of the contract terms.
+   * Signature by the merchant over the contract details.
    */
   @Checkable.String()
   contractTermsHash: string;
+}
+
+/**
+ * Record for a downloaded order, stored in the wallet's database.
+ */
+@Checkable.Class()
+export class ProposalRecord {
+  /**
+   * URL where the proposal was downloaded.
+   */
+  @Checkable.String()
+  url: string;
+
+  /**
+   * Downloaded data from the merchant.
+   */
+  download: ProposalDownload | undefined;
 
   /**
    * Unique ID when the order is stored in the wallet DB.
@@ -639,9 +664,18 @@ export class ProposalRecord {
   @Checkable.String()
   noncePriv: string;
 
+  /**
+   * Public key for the nonce.
+   */
+  @Checkable.String()
+  noncePub: string;
+
   @Checkable.String()
   proposalStatus: ProposalStatus;
 
+  @Checkable.String()
+  repurchaseProposalId: string | undefined;
+
   /**
    * Session ID we got when downloading the contract.
    */
@@ -911,6 +945,12 @@ export interface PurchaseRecord {
    * The abort (with refund) was completed for this (incomplete!) purchase.
    */
   abortDone: boolean;
+
+  /**
+   * Proposal ID for this purchase.  Uniquely identifies the
+   * purchase and the proposal.
+   */
+  proposalId: string;
 }
 
 /**
@@ -1076,7 +1116,7 @@ export namespace Stores {
 
   class PurchasesStore extends Store<PurchaseRecord> {
     constructor() {
-      super("purchases", { keyPath: "contractTermsHash" });
+      super("purchases", { keyPath: "proposalId" });
     }
 
     fulfillmentUrlIndex = new Index<string, PurchaseRecord>(