Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch chains, standardize chain id as number #592

Merged
merged 5 commits into from
Oct 11, 2021
Merged

Switch chains, standardize chain id as number #592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3380f88
Switch chains, standardize chain id as number
floating Oct 9, 2021
e129cf6
Add tests
floating Oct 9, 2021
30dad58
Review fixes
floating Oct 10, 2021
b316f8e
use node 14
mholtzman Oct 11, 2021
73184d0
Fix punc
floating Oct 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
69 changes: 49 additions & 20 deletions app/App/Panel/Main/Account/Requests/ChainRequest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ class ChainRequest extends React.Component {
render () {
const status = this.props.req.status
const notice = this.props.req.notice
const type = this.props.req.type
let requestClass = 'signerRequest'
if (status === 'success') requestClass += ' signerRequestSuccess'
if (status === 'declined') requestClass += ' signerRequestDeclined'
Expand Down Expand Up @@ -50,36 +51,64 @@ class ChainRequest extends React.Component {
</div>
) : (
<div className='approveTransactionPayload'>
<div className='approveRequestHeader approveTransactionHeader'>
<div className='approveRequestHeaderIcon'> {svg.octicon('shield', { height: 20 })}</div>
<div className='approveRequestHeaderLabel'> Add Chain</div>
</div>
{type === 'switchChain' ? (
<div className='approveRequestHeader approveTransactionHeader'>
<div className='approveRequestHeaderIcon'> {svg.octicon('shield', { height: 20 })}</div>
<div className='approveRequestHeaderLabel'> Switch Chain</div>
</div>
) : (
<div className='approveRequestHeader approveTransactionHeader'>
<div className='approveRequestHeaderIcon'> {svg.octicon('shield', { height: 20 })}</div>
<div className='approveRequestHeaderLabel'> Add Chain</div>
</div>
)}
<div className='requestChain scaleIn'>
<div className='requestChainInner'>
<div className={originClass}>{this.props.req.origin}</div>
<div className={'requestChainOriginSub'}>{'wants to add chain'}</div>
<div className='requestChainName'>{chain.name}</div>
<div className={'requestChainOriginSub'}>{type === 'switchChain' ? 'wants to switch to chain' : 'wants to add chain'}</div>
<div className='requestChainName'>{type === 'switchChain' ? (
this.store('main.networks', chain.type, parseInt(chain.id), 'name')
) : chain.name}</div>
</div>
</div>
</div>
)}
</div>
<div className='requestApprove'>
<div
className='requestDecline'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) link.send('tray:addChain', false, this.props.req)
}}>
<div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
{type === 'switchChain' ? (
<div className='requestApprove'>
<div
className='requestDecline'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) link.send('tray:switchChain', false, false, this.props.req)
}}>
<div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
</div>
<div
className='requestSign'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) link.send('tray:switchChain', chain.type, parseInt(chain.id), this.props.req)
}}>
<div className='requestSignButton _txButton'>Switch</div>
</div>
</div>
<div
className='requestSign'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) this.store.notify('addChain', this.props.req)
}}>
<div className='requestSignButton _txButton'>Review</div>
) : (
<div className='requestApprove'>
<div
className='requestDecline'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) link.send('tray:addChain', false, this.props.req)
}}>
<div className='requestDeclineButton _txButton _txButtonBad'>Decline</div>
</div>
<div
className='requestSign'
style={{ pointerEvents: this.state.allowInput && this.props.onTop ? 'auto' : 'none'}}
onClick={() => { if (this.state.allowInput && this.props.onTop) this.store.notify('addChain', this.props.req)
}}>
<div className='requestSignButton _txButton'>Review</div>
</div>
</div>
</div>
)}
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Main/Account/Requests/TransactionRequest/TxFeeNew/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ class TxFee extends React.Component {
super(props, context)
this.chain = {
type: 'ethereum',
id: parseInt(props.req.data.chainId, 'hex').toString()
id: parseInt(props.req.data.chainId, 'hex')
}
}
toDisplayUSD (bn) {
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Main/Account/Requests/TransactionRequest/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class TransactionRequest extends React.Component {
super(props, context)
this.chain = {
type: 'ethereum',
id: parseInt(props.req.data.chainId, 'hex').toString()
id: parseInt(props.req.data.chainId, 'hex')
}
this.state = { allowInput: false, dataView: false }
setTimeout(() => {
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Main/Account/Requests/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ class Requests extends React.Component {
if (req.type === 'access') return <ProviderRequest key={req.handlerId} req={req} pos={pos} z={z} onTop={i === normal.length - 1} />
if (req.type === 'sign') return <SignatureRequest key={req.handlerId} req={req} pos={pos} z={z} onTop={i === normal.length - 1} />
if (req.type === 'signTypedData') return <SignTypedDataRequest key={req.handlerId} req={req} pos={pos} z={z} onTop={i === normal.length - 1} />
if (req.type === 'addChain') return <ChainRequest key={req.handlerId} req={req} pos={pos} z={z} onTop={i === normal.length - 1} />
if (req.type === 'addChain' || req.type === 'switchChain') return <ChainRequest key={req.handlerId} req={req} pos={pos} z={z} onTop={i === normal.length - 1} />
return null
})}
</div>
Expand Down
24 changes: 0 additions & 24 deletions app/App/Panel/Main/Account/SignerStatus/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,30 +21,6 @@ class SignerStatus extends React.Component {
this.inputRef = React.createRef()
}

// clickListener (event) {
// console.log('found a clikc')
// const statusRef = ReactDOM.findDOMNode(this.statusRef.current)
// if (statusRef && statusRef.contains(event.target)) {
// console.log('inside statu ref')
// this.setState({ hideStatus: false })
// } else {
// console.log('outside statu ref')
// this.setState({ hideStatus: true })
// }
// // if (!element.contains(event.target)) { // or use: event.target.closest(selector) === null
// // element.style.display = 'none'
// // removeClickListener()
// // }
// }

// componentDidMount () {
// document.addEventListener('mousedown', this.clickListener.bind(this))
// }

// componentWillUnmount () {
// document.removeEventListener('mousedown', this.clickListener.bind(this))
// }

shake () {
this.setState({ shake: true })
setTimeout(() => {
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Main/Account/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ class _AccountMain extends React.Component {
const chainId = this.store('main.currentNetwork.id')
let slideHeight = 0
const modules = accountModuleOrder.map((id, i) => {
if (chainId !== '1' && id === 'inventory') return undefined
if (chainId !== 1 && id === 'inventory') return undefined
const module = accountModules[id] || { height: 0 }
slideHeight += module.height + 5
return this.renderModule(id, module, slideHeight - module.height - 5, i, id => {
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Main/Signer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class _Balances extends React.Component {

setActive (active) {
const { type, id } = this.store('main.currentNetwork')
if (type !== 'ethereum' || id !== '1') return
if (type !== 'ethereum' || id !== 1) return
this.setState({ openActive: active })
this.openTimer = setTimeout(() => this.setState({ open: active }), 480)
if (active && !this.state.openActive) {
Expand Down
10 changes: 5 additions & 5 deletions app/App/Panel/Networks/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ class _Network extends React.Component {
}}
/>
</div>
{this.props.id === '1' ? (
{this.props.id === 1 ? (
<div className='mainnetToggleLock'>{svg.lock(9)}</div>
) : (
<div className={this.props.on ? 'signerPermissionToggle signerPermissionToggleOn' : 'signerPermissionToggle'} onMouseDown={() => {
Expand Down Expand Up @@ -295,7 +295,7 @@ class _Network extends React.Component {
className='chainIdInput'
value={this.state.id} spellCheck='false'
onChange={(e) => {
if (type === 'ethereum' && id === '1') return
if (type === 'ethereum' && id === 1) return
this.setState({ id: e.target.value })
}}
onBlur={(e) => {
Expand All @@ -306,7 +306,7 @@ class _Network extends React.Component {
className='chainSymbolInput'
value={this.state.symbol} spellCheck='false'
onChange={(e) => {
if (type === 'ethereum' && id === '1') return
if (type === 'ethereum' && id === 1) return
if (e.target.value.length > 8) return e.preventDefault()
this.setState({ symbol: e.target.value })
}}
Expand All @@ -317,7 +317,7 @@ class _Network extends React.Component {
<Dropdown
syncValue={this.state.layer}
onChange={layer => this.setState({ layer })}
options={type === 'ethereum' && id === '1' ? [
options={type === 'ethereum' && id === 1 ? [
{ text: 'mainnet', value: 'mainnet'}
] : [
{ text: 'rollup', value: 'rollup'},
Expand All @@ -343,7 +343,7 @@ class _Network extends React.Component {
) : null}

{this.state.showControls ? (
type === 'ethereum' && id === '1' ? (
type === 'ethereum' && id === 1 ? (
<div className='chainMore cardShow'>
<div className='moduleButton moduleButtonLocked'>
{svg.lock(11)}
Expand Down
13 changes: 9 additions & 4 deletions app/App/Panel/Notify/AddChain/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,18 @@ class AddChain extends React.Component {
this.newNetworkLayer = ''
this.req = props.req
this.chain = (this.req && this.req.chain) || {}

const blockExplorerUrls = this.chain.blockExplorerUrls || []
const rpcUrls = this.chain.rpcUrls || []
const nativeChainCurrency = this.chain.nativeCurrency || {}

this.state = {
newNetworkId: parseInt(this.chain.id, 'hex') || this.newNetworkIdDefault,
newNetworkName: this.chain.name || this.newNetworkNameDefault,
newNetworkExplorer: this.chain.explorer || this.newNetworkExplorerDefault,
newNetworkRPCPrimary: this.chain.rpcUrl || this.newNetworkRPCPrimary,
newNetworkRPCSecondary: this.newNetworkRPCSecondary,
newNetworkSymbol: this.chain.symbol || this.newNetworkSymbolDefault,
newNetworkExplorer: blockExplorerUrls[0] || this.newNetworkExplorerDefault,
newNetworkRPCPrimary: rpcUrls[0] || this.newNetworkRPCPrimary,
newNetworkRPCSecondary: rpcUrls[1] || this.newNetworkRPCSecondary,
newNetworkSymbol: nativeChainCurrency.symbol || this.newNetworkSymbolDefault,
newNetworkType: this.chain.type || this.newNetworkType,
newNetworkLayer: this.chain.layer || 'other',
localShake: {},
Expand Down
4 changes: 2 additions & 2 deletions app/App/Panel/Phase/AddAragon/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ class AddAragon extends React.Component {
className='phaseItemSummary' onMouseDown={() => {
const net = this.store('main.currentNetwork.id')
const open = url => this.store.notify('openExternal', { url })
if (net === '1') return open('https://mainnet.aragon.org')
if (net === '4') return open('https://rinkeby.aragon.org')
if (net === 1) return open('https://mainnet.aragon.org')
if (net === 4) return open('https://rinkeby.aragon.org')
return open('https://aragon.org')
}}
>{'Don\'t have a dao? Create one'}
Expand Down
2 changes: 1 addition & 1 deletion app/App/Panel/Phase/AddPhrase/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ class AddPhrase extends React.Component {
<div
className='phaseItemOptionIntro' onMouseDown={() => {
this.adding()
if (this.store('main.currentNetwork.id') === '1') setTimeout(() => this.store.notify('hotAccountWarning'), 800)
if (this.store('main.currentNetwork.id') === 1) setTimeout(() => this.store.notify('hotAccountWarning'), 800)
}}
>
Add Phrase Account
Expand Down
2 changes: 1 addition & 1 deletion main/accounts/Account/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class Account {
this.update()
}, {
type: 'ethereum',
id: '1'
id: 1
})
})
}
Expand Down
8 changes: 4 additions & 4 deletions main/accounts/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ class Accounts extends EventEmitter {
if (currentAccount.requests[id].type !== 'transaction') return reject(new Error('Request is not transaction'))

const data = JSON.parse(JSON.stringify(currentAccount.requests[id].data))
const targetChain = { type: 'ethereum', id: parseInt(data.chainId, 'hex').toString()}
const targetChain = { type: 'ethereum', id: parseInt(data.chainId, 'hex')}
const { levels } = store('main.networksMeta', targetChain.type, targetChain.id, 'gas.price')

// Set the gas default to asap
Expand Down Expand Up @@ -219,7 +219,7 @@ class Accounts extends EventEmitter {
account.update()
if (!account.requests[id].feeAtTime) {
const network = targetChain
if (network.type === 'ethereum' && network.id === '1') {
if (network.type === 'ethereum' && network.id === 1) {
fetch('https://api.etherscan.io/api?module=stats&action=ethprice&apikey=KU5RZ9156Q51F592A93RUKHW1HDBBUPX9W').then(res => res.json()).then(res => {
if (res && res.message === 'OK' && res.result && res.result.ethusd) {
const { gasUsed } = account.requests[id].tx.receipt
Expand Down Expand Up @@ -386,7 +386,7 @@ class Accounts extends EventEmitter {
// If chainId, update pending tx requests from that chain, otherwise update all pending tx requests
const transactions = Object.entries(currentAccount.requests)
.filter(([_, req]) => req.type === 'transaction' && !req.locked && !req.feesUpdatedByUser)
.filter(([_, req]) => !chainId || parseInt(req.data.chainId, 'hex').toString() === chainId)
.filter(([_, req]) => !chainId || parseInt(req.data.chainId, 'hex') === chainId)

transactions.forEach(([id, req]) => {
const tx = req.data
Expand Down Expand Up @@ -832,7 +832,7 @@ class Accounts extends EventEmitter {
} else {
const { from, chainId } = txRequest.data

const targetChain = { type: 'ethereum', id: parseInt(chainId, 'hex').toString() }
const targetChain = { type: 'ethereum', id: parseInt(chainId, 'hex') }

proxyProvider.emit('send', { id: 1, jsonrpc: '2.0', method: 'eth_getTransactionCount', params: [from, 'pending'] }, (res) => {
if (res.result) {
Expand Down
6 changes: 3 additions & 3 deletions main/clients/Parity/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ class Parity extends EthereumClient {
}

_getChain (networkId) {
if (networkId === '1') return 'mainnet'
if (networkId === '3') return 'ropsten'
if (networkId === '42') return 'kovan'
if (networkId === 1) return 'mainnet'
if (networkId === 3) return 'ropsten'
if (networkId === 42) return 'kovan'
}
}

Expand Down
4 changes: 2 additions & 2 deletions main/externalData/rates/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ async function loadPlatforms () {

allPlatforms = platforms.reduce((platformMapping, platform) => {
if (platform.chain_identifier) {
const chainId = platform.chain_identifier.toString()
const chainId = platform.chain_identifier
return { ...platformMapping, [chainId]: platform.id }
}

Expand Down Expand Up @@ -111,7 +111,7 @@ async function loadRates (ids: string[], chainId: number) {

try {
const symbolQuotes = await fetchPrices(Object.keys(lookupIds.symbols))
const tokenQuotes = await fetchTokenPrices(lookupIds.contracts, platforms[chainId.toString()] || 'ethereum')
const tokenQuotes = await fetchTokenPrices(lookupIds.contracts, platforms[chainId] || 'ethereum')

return Object.entries({ ...symbolQuotes, ...tokenQuotes }).reduce((rates, [lookupId, quote]) => {
const originalId = lookupIds.symbols[lookupId] || lookupId // could be symbol or contract address
Expand Down
5 changes: 5 additions & 0 deletions main/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,11 @@ ipcMain.on('tray:addChain', (e, chain, req) => {
accounts.resolveRequest(req)
})

ipcMain.on('tray:switchChain', (e, type, id, req) => {
if (type && id) store.selectNetwork(type, id)
accounts.resolveRequest(req)
})

ipcMain.on('tray:adjustNonce', (e, handlerId, nonceAdjust) => {
accounts.adjustNonce(handlerId, nonceAdjust)
})
Expand Down