Merge pull request #138 from urbit/keyfile-fix

Ensure we generate the keyfile for latest-set keys
urbit · May 17, 2019 · 883c00b · 883c00b
2 parents 9128082 + bacec7e
commit 883c00b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 42 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -17,7 +17,7 @@
     "@ledgerhq/hw-app-eth": "^4.35.0",
     "@ledgerhq/hw-transport-u2f": "^4.35.0",
     "PaperCollateralRenderer": "github:urbit/PaperCollateralRenderer",
-    "azimuth-js": "^0.10.0",
+    "azimuth-js": "^0.13.2",
     "azimuth-solidity": "1.0.2",
     "babel-polyfill": "^6.26.0",
     "bip32": "^1.0.2",

diff --git a/src/bridge/Bridge.js b/src/bridge/Bridge.js
@@ -190,9 +190,10 @@ class Bridge extends React.Component {
     }
   }
 
-  setNetworkSeedCache(networkSeed) {
+  setNetworkSeedCache(networkSeed, revision) {
     this.setState({
-      networkSeedCache: networkSeed
+      networkSeedCache: networkSeed,
+      networkRevisionCache: revision
     })
   }
 
@@ -263,6 +264,7 @@ class Bridge extends React.Component {
       urbitWallet,
       authMnemonic,
       networkSeedCache,
+      networkRevisionCache,
       pointCursor,
       pointCache,
       txnHashCursor,
@@ -316,6 +318,7 @@ class Bridge extends React.Component {
                 pointCursor={ pointCursor }
                 pointCache={ pointCache }
                 networkSeedCache= { networkSeedCache }
+                networkRevisionCache={ networkRevisionCache }
                 setNetworkSeedCache= { this.setNetworkSeedCache }
                 // txn
                 setTxnHashCursor={ this.setTxnHashCursor }

diff --git a/src/bridge/components/StatelessTransaction.js b/src/bridge/components/StatelessTransaction.js
@@ -93,8 +93,9 @@ class StatelessTransaction extends React.Component {
         props.setTxnHashCursor(sent)
         props.popRoute()
 
-        if (props.networkSeed) {
-          props.setNetworkSeedCache(props.networkSeed)
+        //TODO this special logic should live in a handler in SetKeys.
+        if (props.networkSeed && props.newRevision) {
+          props.setNetworkSeedCache(props.networkSeed, props.newRevision)
           props.pushRoute(ROUTE_NAMES.SENT_TRANSACTION, {promptKeyfile: true})
         } else {
           props.pushRoute(ROUTE_NAMES.SENT_TRANSACTION)

diff --git a/src/bridge/views/GenKeyfile.js b/src/bridge/views/GenKeyfile.js
@@ -40,7 +40,10 @@ class GenKeyfile extends React.Component {
       ? pointCache[point]
       : (() => { throw BRIDGE_ERROR.MISSING_POINT })()
 
-    const revision = parseInt(pointDetails.keyRevisionNumber)
+    // in case we did SetKeys earlier this session, make sure to generate the
+    // newer keyfile, rather than the one that will expire soon
+    const revision = (this.props.networkRevisionCache ||
+                      parseInt(pointDetails.keyRevisionNumber));
 
     return {
       point,

diff --git a/src/bridge/views/SetKeys.js b/src/bridge/views/SetKeys.js
@@ -210,6 +210,7 @@ class SetKeys extends React.Component {
             canGenerate={ canGenerate }
             createUnsignedTxn={this.createUnsignedTxn}
             networkSeed={ state.networkSeed }
+            newRevision={ (parseInt(pointDetails.keyRevisionNumber) + 1) }
             setNetworkSeedCache={ props.setNetworkSeedCache } />
 
         </Col>