records: tree status relative to update (#293)

kyokan · Apr 20, 2022 · b8fe29d · b8fe29d
1 parent 6874d02
commit b8fe29d
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 15 deletions.
diff --git a/app/components/Blocktime/index.js b/app/components/Blocktime/index.js
@@ -17,12 +17,14 @@ export default class Blocktime extends Component {
     height: PropTypes.number.isRequired,
     className: PropTypes.string,
     fromNow: PropTypes.bool,
+    prefix: PropTypes.bool,
     format: PropTypes.string,
   };
 
   static defaultProps = {
     className: '',
     fromNow: false,
+    prefix: false,
     format: 'YYYY-MM-DD',
   };
 
@@ -41,8 +43,12 @@ export default class Blocktime extends Component {
 
     const delta = this.props.height - this.props.currentHeight;
     const end = moment().add(delta * AVERAGE_BLOCK_TIME);
+
     if (this.props.fromNow) {
-      return '~' + end.toNow(true);
+      return '~'
+        + (delta > 0) ?
+          end.fromNow(!this.props.prefix)
+          : end.toNow(!this.props.prefix);
     }
 
     return end.format(this.props.format);

diff --git a/app/components/Records/index.js b/app/components/Records/index.js
@@ -18,6 +18,7 @@ import { clientStub as aClientStub } from '../../background/analytics/client';
 import './records.scss';
 import {clearDeeplinkParams} from "../../ducks/app";
 import {deserializeRecord} from '../../utils/recordHelpers'
+import {I18nContext} from "../../utils/i18n";
 
 const analytics = aClientStub(() => require('electron').ipcRenderer);
 
@@ -27,6 +28,8 @@ const DEFAULT_RESOURCE = {
 };
 
 export class Records extends Component {
+  static contextType = I18nContext;
+
   static propTypes = {
     name: PropTypes.string.isRequired,
     resource: PropTypes.object,
@@ -244,17 +247,32 @@ export class Records extends Component {
   }
 
   renderTreeUpdateInfo() {
+    const {t} = this.context;
+    const { currentHeight } = this.props;
     const network = Network.get(this.props.network);
-    const nextTreeUpdateBlock = this.props.currentHeight + (network.names.treeInterval - this.props.currentHeight % network.names.treeInterval);
+    const { treeInterval } = network.names;
+
+    // Next Tree Update Block (w.r.t. current height)
+    let block = currentHeight + (treeInterval - (currentHeight % treeInterval));
+    let text = 'treeUpdateGeneric';
+
+    // If last transaction was an UPDATE, then relative block
+    const { height, covenant } = this.props.domain?.lastTx || {};
+    if (
+      height &&
+      (covenant.action === 'UPDATE' || covenant.action === 'REGISTER')
+    ) {
+      block = height + (treeInterval - (height % treeInterval));
+
+      text =
+        currentHeight < block
+          ? 'treeUpdateFuture'
+          : 'treeUpdatePast';
+    }
 
     return (
       <div className="tree-update">
-        Next tree update: Block {nextTreeUpdateBlock} (
-          <Blocktime
-            height={nextTreeUpdateBlock}
-            fromNow={true}
-          />
-        )
+        {t(text)} {block} (<Blocktime height={block} fromNow prefix />)
       </div>
     );
   }

diff --git a/app/ducks/names.js b/app/ducks/names.js
@@ -76,6 +76,7 @@ export const getNameInfo = name => async (dispatch) => {
   let bids = [];
   let reveals = [];
   let winner = null;
+  let lastTx = null;
   let isOwner = false;
   let walletHasName = false;
 
@@ -89,6 +90,7 @@ export const getNameInfo = name => async (dispatch) => {
         bids,
         reveals,
         winner,
+        lastTx,
         isOwner,
         walletHasName,
       },
@@ -114,12 +116,20 @@ export const getNameInfo = name => async (dispatch) => {
       const buyOutput = buyTx.outputs[info.owner.index];
       const coin = await walletClient.getCoin(info.owner.hash, info.owner.index);
       isOwner = !!coin;
-      if (coin && coin.covenant.action === 'TRANSFER') {
-        const {network} = await nodeClient.getInfo();
-        info.transferTo = Address.fromHash(
-          Buffer.from(coin.covenant.items[3], 'hex'),
-          Number(coin.covenant.items[2])
-        ).toString(network);
+
+      if (coin) {
+        lastTx = {
+          height: coin.height,
+          covenant: coin.covenant,
+        }
+
+        if (coin.covenant.action === 'TRANSFER') {
+          const {network} = await nodeClient.getInfo();
+          info.transferTo = Address.fromHash(
+            Buffer.from(coin.covenant.items[3], 'hex'),
+            Number(coin.covenant.items[2])
+          ).toString(network);
+        }
       }
 
       winner = {
@@ -130,7 +140,7 @@ export const getNameInfo = name => async (dispatch) => {
 
   dispatch({
     type: SET_NAME,
-    payload: {name, start, info, bids, reveals, winner, isOwner, walletHasName},
+    payload: {name, start, info, bids, reveals, winner, lastTx, isOwner, walletHasName},
   });
 };
 

diff --git a/locales/en.json b/locales/en.json
@@ -504,6 +504,9 @@
   "transferSuccess": "Your transfer request is submitted! Please wait around 15 minutes for it to be confirmed.",
   "transferring": "Transferring",
   "transferringTo": "Transferring to",
+  "treeUpdateFuture": "Will be committed after block",
+  "treeUpdateGeneric": "Next tree update: Block",
+  "treeUpdatePast": "Committed in tree as of block",
   "txDescBid": "Placed Bid",
   "txDescClaim": "Claimed Reserved Name",
   "txDescCoinbase": "Mining Reward",