fullstack/fullstack-gatsby-theme-bch-wallet
1
0
Fork 0
mirror of https://github.com/fullstack-cash/fullstack-gatsby-theme-bch-wallet.git synced 2026-09-21 16:52:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(bug): Fixed switch backend bug

Browse Source
This commit is contained in:
Daniel Gonzalez
2020-07-11 23:48:52 -04:00
parent 63e4db1826
commit de16a9926a
8 changed files with 98 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+25 -4
View File
@@ -4910,7 +4910,7 @@
"bip39": "^3.0.2",
"bip66": "^1.1.5",
"bitcoincash-ops": "github:christroutner/bitcoincash-ops",
"bitcoincashjs-lib": "github:christroutner/bitcoincashjs-lib#master",
"bitcoincashjs-lib": "github:christroutner/bitcoincashjs-lib",
"bitcoinjs-message": "^2.0.0",
"bs58": "^4.0.1",
"buffer": "^5.1.0",
@@ -4973,6 +4973,27 @@
"util": "^0.12.0"
}
},
"bitcoincashjs-lib": {
"version": "github:christroutner/bitcoincashjs-lib#715823b5d6eb3e2961e715605ad1464f3223da0b",
"from": "github:christroutner/bitcoincashjs-lib",
"requires": {
"bech32": "^1.1.2",
"bigi": "^1.4.0",
"bip66": "^1.1.0",
"bitcoincash-ops": "github:christroutner/bitcoincash-ops",
"bs58check": "^2.0.0",
"create-hash": "^1.1.0",
"create-hmac": "^1.1.3",
"ecurve": "^1.0.0",
"merkle-lib": "^2.0.10",
"pushdata-bitcoin": "github:Bitcoin-com/pushdata-bitcoin#1.2.1",
"randombytes": "^2.0.1",
"safe-buffer": "^5.0.1",
"typeforce": "^1.18.0",
"varuint-bitcoin": "^1.0.4",
"wif": "^2.0.1"
}
},
"commander": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz",
@@ -27313,9 +27334,9 @@
"integrity": "sha512-zd6KCAyXgmq6FV1mR10oKXYtvmA9vRoB6xPSTUJTbFApCtkefDnYueVR1gkof3KcdLZo1Y8mjF2DFmQMIxsHNQ=="
},
"minimal-slp-wallet": {
"version": "1.3.9",
"resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-1.3.9.tgz",
"integrity": "sha512-PixaM7h81XBXgzkxfWAg//feaTAa64kKVADw6PNKaKvdd+EUq64UDDAUxXjDLXaTjX6SiQBzzxiZthy/ZZV6cQ==",
"version": "1.3.10",
"resolved": "https://registry.npmjs.org/minimal-slp-wallet/-/minimal-slp-wallet-1.3.10.tgz",
"integrity": "sha512-wIfL3BBachEVA50YRoxhl2vlgKrmnoB8za4AxEtW3hsnJltOTFP/bCrLTbwyPpSs6qdMsnbc0Qv/qwLYexXV8w==",
"requires": {
"@chris.troutner/bch-js": "3.3.3",
"apidoc": "^0.23.0",
package.json
+1 -1
View File
@@ -31,7 +31,7 @@
"gatsby-source-filesystem": "^2.3.8",
"gatsby-transformer-sharp": "2.5.3",
"memo-get-gatsby": "^1.0.2",
"minimal-slp-wallet": "1.3.9",
"minimal-slp-wallet": "1.3.10",
"prop-types": "^15.7.2",
"qrcode.react": "^1.0.0",
"react": "^16.12.0",
src/components/admin-lte/configure/index.js
+6 -2
View File
@@ -146,8 +146,12 @@ class Configure extends React.Component {
}
console.log('bchjs options : ', bchjsOptions)
const bchWalletLib = new _this.BchWallet(mnemonic)
bchWalletLib.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
const bchWalletLib = new _this.BchWallet(mnemonic, bchjsOptions)
// Update bchjs instances of minimal-slp-wallet libraries
bchWalletLib.tokens.sendBch.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
bchWalletLib.tokens.utxos.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
_this.props.setBchWallet(bchWalletLib)
}
src/components/admin-lte/configure/servers.js
+6 -3
View File
@@ -212,9 +212,12 @@ class Servers extends React.Component {
bchjsOptions.restURL = restURL
console.log('bchjs options : ', bchjsOptions)
const bchWalletLib = new _this.BchWallet(mnemonic)
bchWalletLib.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
const bchWalletLib = new _this.BchWallet(mnemonic, bchjsOptions)
// Update bchjs instances of minimal-slp-wallet libraries
bchWalletLib.tokens.sendBch.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
bchWalletLib.tokens.utxos.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
_this.props.setBchWallet(bchWalletLib)
}
_this.saveServer()
src/components/admin-lte/tokens/index.js
+6 -1
View File
@@ -133,7 +133,12 @@ class Tokens extends React.Component {
tokens = await bchWallet.listTokens()
} catch (error) {
console.error(error)
if (error.error.match('rate limits')) onEmptyTokensMsg = error.error
if (error.error) {
if (error.error.match('rate limits')) onEmptyTokensMsg = error.error
}
if (error.message) {
onEmptyTokensMsg = error.message
}
}
} else {
onEmptyTokensMsg =
src/components/admin-lte/wallet/create.js
+18 -6
View File
@@ -10,7 +10,8 @@ class NewWallet extends React.Component {
super(props)
_this = this
this.state = {
inFetch: false
inFetch: false,
errMsg: ''
}
_this.BchWallet = BchWallet
@@ -37,6 +38,11 @@ class NewWallet extends React.Component {
<span>New Wallet</span>
</h1>
</Col>
<Col sm={12} className='text-center '>
{_this.state.errMsg && (
<p className='error-color mt-2'>{_this.state.errMsg}</p>
)}
</Col>
<Col sm={12} className='text-center mt-2 mb-2'>
<Button
text='Create Wallet'
@@ -68,12 +74,11 @@ class NewWallet extends React.Component {
_this.setState({
inFetch: true
})
const bchWalletLib = new _this.BchWallet()
const apiToken = currentWallet.JWT
const restURL = currentWallet.selectedServer
const bchjsOptions = {}
if (apiToken || restURL) {
const bchjsOptions = {}
if (apiToken) {
bchjsOptions.apiToken = apiToken
}
@@ -81,9 +86,14 @@ class NewWallet extends React.Component {
bchjsOptions.restURL = restURL
}
console.log('bchjs options : ', bchjsOptions)
bchWalletLib.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
}
const bchWalletLib = new _this.BchWallet(null, bchjsOptions)
// Update bchjs instances of minimal-slp-wallet libraries
bchWalletLib.tokens.sendBch.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
bchWalletLib.tokens.utxos.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
await bchWalletLib.walletInfoPromise // Wait for wallet to be created.
const walletInfo = bchWalletLib.walletInfo
@@ -99,12 +109,14 @@ class NewWallet extends React.Component {
_this.props.setBchWallet(bchWalletLib)
_this.setState({
inFetch: false
inFetch: false,
errMsg: ''
})
} catch (error) {
console.error(error)
_this.setState({
inFetch: false
inFetch: false,
errMsg: error.message
})
}
}
src/components/admin-lte/wallet/import.js
+31 -26
View File
@@ -24,51 +24,51 @@ class ImportWallet extends React.Component {
render () {
return (
<Row className="">
<Row className=''>
<Col sm={2} />
<Col sm={8}>
<Box
className="hover-shadow border-none mt-2"
className='hover-shadow border-none mt-2'
loaded={!_this.state.inFetch}
>
<Row>
<Col sm={12} className="text-center">
<Col sm={12} className='text-center'>
<h1>
<FontAwesomeIcon
className="title-icon"
size="xs"
icon="file-import"
className='title-icon'
size='xs'
icon='file-import'
/>
<span>Import Wallet</span>
</h1>
</Col>
<Col sm={12} className="text-center mt-2 mb-2">
<Row className="flex justify-content-center">
<Col sm={12} className='text-center mt-2 mb-2'>
<Row className='flex justify-content-center'>
<Col sm={8}>
<div>
<Text
id="import-mnemonic"
name="mnemonic"
placeholder="12 word mnemonic"
label="12 word mnemonic"
labelPosition="above"
id='import-mnemonic'
name='mnemonic'
placeholder='12 word mnemonic'
label='12 word mnemonic'
labelPosition='above'
onChange={_this.handleUpdate}
/>
</div>
</Col>
</Row>
</Col>
<Col sm={12} className="text-center">
<Col sm={12} className='text-center'>
{_this.state.errMsg && (
<p className="error-color">{_this.state.errMsg}</p>
<p className='error-color'>{_this.state.errMsg}</p>
)}
</Col>
<Col sm={12} className="text-center mt-2 mb-2">
<Col sm={12} className='text-center mt-2 mb-2'>
<Button
text="Import"
type="primary"
className="btn-lg"
text='Import'
type='primary'
className='btn-lg'
onClick={_this.handleImportWallet}
/>
</Col>
@@ -112,21 +112,29 @@ class ImportWallet extends React.Component {
inFetch: true
})
const bchWalletLib = new _this.BchWallet(_this.state.mnemonic)
const apiToken = currentWallet.JWT
const restURL = currentWallet.selectedServer
const bchjsOptions = {}
if (apiToken || restURL) {
const bchjsOptions = {}
if (apiToken) {
bchjsOptions.apiToken = apiToken
}
if (restURL) {
bchjsOptions.restURL = restURL
}
console.log('bchjs options : ', bchjsOptions)
bchWalletLib.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
}
const bchWalletLib = new _this.BchWallet(
_this.state.mnemonic,
bchjsOptions
)
// Update bchjs instances of minimal-slp-wallet libraries
bchWalletLib.tokens.sendBch.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
bchWalletLib.tokens.utxos.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
await bchWalletLib.walletInfoPromise // Wait for wallet to be created.
const walletInfo = bchWalletLib.walletInfo
@@ -164,9 +172,6 @@ class ImportWallet extends React.Component {
})
const mnemonicEle = document.getElementById('import-mnemonic')
mnemonicEle.value = ''
const privateKeyEle = document.getElementById('privateKey')
privateKeyEle.value = ''
}
validateInputs () {
src/redux/createStore.js
+5 -3
View File
@@ -49,8 +49,6 @@ const instanceWallet = () => {
try {
if (!localStorageInfo.mnemonic) return null
const bchWalletLib = new BchWallet(localStorageInfo.mnemonic)
const jwtToken = localStorageInfo.JWT
const restURL = localStorageInfo.selectedServer
const bchjsOptions = {}
@@ -61,7 +59,11 @@ const instanceWallet = () => {
if (restURL) {
bchjsOptions.restURL = restURL
}
bchWalletLib.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
const bchWalletLib = new BchWallet(localStorageInfo.mnemonic, bchjsOptions)
// Update bchjs instances of minimal-slp-wallet libraries
bchWalletLib.tokens.sendBch.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
bchWalletLib.tokens.utxos.bchjs = new bchWalletLib.BCHJS(bchjsOptions)
return bchWalletLib
} catch (error) {