feat: add tx.pendingAt

PORTAL-3423
Conflux-Chain · Aug 1, 2022 · ced5b52 · ced5b52
1 parent c9257d0
commit ced5b52
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.yarn/versions/a580b314.yml b/.yarn/versions/a580b314.yml
@@ -0,0 +1,5 @@
+releases:
+  "@fluent-wallet/db": patch
+
+declined:
+  - helios-background
diff --git a/packages/background/src/db-schema.js b/packages/background/src/db-schema.js
@@ -158,6 +158,7 @@ const schema = {
     blockHash: {doc: 'block this tx packaged in'},
     chainSwitched: {doc: 'chain switched'},
     created: {doc: 'created timestamp get with new Date().getTime()'},
+    pendingAt: {doc: 'first time pending timestamp'},
     err: {doc: 'basic error type/info'},
     txExtra: {doc: 'enriched tx info', ref: true, component: true},
     fromFluent: {doc: 'tx submitted from fluent'},

diff --git a/packages/db/src/main/cfxjs/db/queries.cljs b/packages/db/src/main/cfxjs/db/queries.cljs
@@ -1556,8 +1556,11 @@
       (t [tx]))))
 (defn set-tx-pending [{:keys [hash]}]
   (when-not (tx-end-state? hash)
-    (t [;; [:db.fn/retractAttribute [:tx/hash hash] :tx/raw]
-        {:db/id [:tx/hash hash] :tx/status 2}])))
+    (let [pending-at (:tx/pendingAt (p [:tx/pendingAt] [:tx/hash hash]))]
+      (t [;; [:db.fn/retractAttribute [:tx/hash hash] :tx/raw]
+          {:db/id        [:tx/hash hash]
+           :tx/status    2
+           :tx/pendingAt (or pending-at (.now js/Date))}]))))
 (defn set-tx-packaged [{:keys [hash blockHash]}]
   (when-not (tx-end-state? hash)
     (t [[:db.fn/retractAttribute [:tx/hash hash] :tx/skippedChecked]