remove networkSeed input from setKeys / genKeyfile flows #85
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -8,7 +8,9 @@ import { RequiredInput, InnerLabel } from '../components/Base' | |
| import StatelessTransaction from '../components/StatelessTransaction' | ||
| import { BRIDGE_ERROR } from '../lib/error' | ||
| import { ROUTE_NAMES } from '../lib/router' | ||
| import { attemptSeedDerivation, genKey } from '../lib/keys' | ||
|
|
||
| import saveAs from 'file-saver' | ||
|
|
||
| import { WALLET_NAMES } from '../lib/wallet' | ||
|
|
||
|
|
@@ -122,22 +124,34 @@ class SetKeys extends React.Component { | |
| }) | ||
| } | ||
|
|
||
| randomHex(len) { | ||
|
There was a problem hiding this comment. Looks like web3 has a function for this. Supposedly "cryptographically strong". We should use that instead of rolling our own. There was a problem hiding this comment. So I tried this out, and it turns out the function is pretty borked; it doesn't generate strings of consistent length >.<. How important is 'cryptographic strength' here do you think? There was a problem hiding this comment. sigh Just slap a |
||
| let hex = ""; | ||
|
|
||
| for (var i = 0; i < len; i++) { | ||
| hex = hex + ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', | ||
| 'C', 'D', 'E', 'F'][Math.floor(Math.random() * 16)] | ||
| } | ||
|
|
||
| return hex; | ||
| } | ||
|
|
||
| async deriveSeed() { | ||
| const next = true | ||
| let seed = await attemptSeedDerivation(next, this.props) | ||
|
|
||
| if (seed.getOrElse('') === '') { | ||
| seed = Maybe.Just(this.randomHex(64)); | ||
| } | ||
|
|
||
| this.setState({ | ||
| networkSeed: seed.getOrElse('') | ||
| }) | ||
| } | ||
|
|
||
| handleNetworkSeedInput(networkSeed) { | ||
| this.setState({ networkSeed }) | ||
| } | ||
|
|
||
| handleCreateUnsignedTxn() { | ||
| const txn = this.createUnsignedTxn() | ||
| this.setState({ txn }) | ||
|
|
@@ -222,12 +236,34 @@ class SetKeys extends React.Component { | |
| }) | ||
| } | ||
|
|
||
| downloadKeyfile(networkSeed) { | ||
| const { pointCache } = this.props | ||
| const { pointCursor } = this.props | ||
|
|
||
| const point = pointCursor.matchWith({ | ||
| Just: (pt) => pt.value, | ||
| Nothing: () => { | ||
| throw BRIDGE_ERROR.MISSING_POINT | ||
| } | ||
| }) | ||
|
|
||
| const pointDetails = | ||
| point in pointCache | ||
| ? pointCache[point] | ||
| : (() => { throw BRIDGE_ERROR.MISSING_POINT })() | ||
|
|
||
| const revision = parseInt(pointDetails.keyRevisionNumber) | ||
| const keyfile = genKey(networkSeed, point, revision) | ||
| let blob = new Blob([keyfile], {type:"text/plain;charset=utf-8"}); | ||
| saveAs(blob, `${ob.patp(point).slice(1)}-${revision}.key`) | ||
| } | ||
|
|
||
| handleSubmit(){ | ||
| const { props, state } = this | ||
| sendSignedTransaction(props.web3.value, state.stx) | ||
| .then(sent => { | ||
| props.setNetworkSeedCache(this.state.networkSeed) | ||
| // this.downloadKeyfile(this.state.networkSeed) | ||
| props.setTxnHashCursor(sent) | ||
| props.popRoute() | ||
| props.pushRoute(ROUTE_NAMES.SENT_TRANSACTION) | ||
|
|
@@ -299,34 +335,22 @@ class SetKeys extends React.Component { | |
| ? props.pointCache[state.point] | ||
| : (() => { throw BRIDGE_ERROR.MISSING_POINT })() | ||
|
|
||
| return ( | ||
| <Row> | ||
| <Col> | ||
| <H1> | ||
| { 'Set Network Keys For ' } <code>{ `${ob.patp(state.point)}` }</code> | ||
| </H1> | ||
|
|
||
| <P className="mt-10"> | ||
| { | ||
| `Set new authentication and encryption keys for your Arvo ship.` | ||
| } | ||
| </P> | ||
|
|
||
| <P> | ||
| { | ||
| `Once the transaction is sent, please generate your Arvo keyfile immediately.` | ||
|
There was a problem hiding this comment. This sentence needs more gravity. We should probably put it in one of those orange warning boxes, like the one we present when you try to configure keys for the very first time. Might also want to add a brief description why. "Your network seed is not deterministic. Once the transaction ..." |
||
| } | ||
| </P> | ||
|
|
||
|
|
@@ -340,17 +364,6 @@ class SetKeys extends React.Component { | |
| </Warning> | ||
| : <div /> } | ||
|
|
||
| <StatelessTransaction | ||
| // Upper scope | ||
| web3={props.web3} | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eww, commented code! (:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, yeah. This was just a convenience for the commented-out development mode workflow. Removed it.