m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

use eth-json-rpc-errors

Browse Source
This commit is contained in:
Erik Marks 2019-09-16 14:07:44 -07:00
parent 3696e4c648
commit 58c5fe01bf
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/scripts/controllers/provider-approval.js
View File

@ -1,6 +1,7 @@
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const SafeEventEmitter = require('safe-event-emitter') const SafeEventEmitter = require('safe-event-emitter')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware') const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
const { errors: rpcErrors } = require('eth-json-rpc-errors')
/** /**
* A controller that services user-approved requests for a full Ethereum provider API * A controller that services user-approved requests for a full Ethereum provider API
@ -48,7 +49,7 @@ class ProviderApprovalController extends SafeEventEmitter {
if (approved) { if (approved) {
res.result = [this.preferencesController.getSelectedAddress()] res.result = [this.preferencesController.getSelectedAddress()]
} else { } else {
throw new Error('User denied account authorization') throw rpcErrors.eth.userRejectedRequest('User denied account authorization')
} }
}) })
} }

7
app/scripts/controllers/transactions/index.js
View File

@ -3,6 +3,7 @@ const ObservableStore = require('obs-store')
const ethUtil = require('ethereumjs-util') const ethUtil = require('ethereumjs-util')
const Transaction = require('ethereumjs-tx') const Transaction = require('ethereumjs-tx')
const EthQuery = require('ethjs-query') const EthQuery = require('ethjs-query')
const { errors: rpcErrors } = require('eth-json-rpc-errors')
const abi = require('human-standard-token-abi') const abi = require('human-standard-token-abi')
const abiDecoder = require('abi-decoder') const abiDecoder = require('abi-decoder')
abiDecoder.addABI(abi) abiDecoder.addABI(abi)
@ -166,11 +167,11 @@ class TransactionController extends EventEmitter {
case 'submitted': case 'submitted':
return resolve(finishedTxMeta.hash) return resolve(finishedTxMeta.hash)
case 'rejected': case 'rejected':
return reject(cleanErrorStack(new Error('MetaMask Tx Signature: User denied transaction signature.'))) return reject(cleanErrorStack(rpcErrors.eth.userRejectedRequest('MetaMask Tx Signature: User denied transaction signature.')))
case 'failed': case 'failed':
return reject(cleanErrorStack(new Error(finishedTxMeta.err.message))) return reject(cleanErrorStack(rpcErrors.internal(finishedTxMeta.err.message)))
default: default:
return reject(cleanErrorStack(new Error(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finishedTxMeta.txParams)}`))) return reject(cleanErrorStack(rpcErrors.internal(`MetaMask Tx Signature: Unknown problem: ${JSON.stringify(finishedTxMeta.txParams)}`)))
} }
}) })
}) })

3
package.json
View File

@ -51,11 +51,11 @@
"3box/ipfs/ipld-zcash/zcash-bitcore-lib/lodash": "^4.17.12" "3box/ipfs/ipld-zcash/zcash-bitcore-lib/lodash": "^4.17.12"
}, },
"dependencies": { "dependencies": {
"3box": "^1.10.2",
"@babel/runtime": "^7.5.5", "@babel/runtime": "^7.5.5",
"@material-ui/core": "1.0.0", "@material-ui/core": "1.0.0",
"@sentry/browser": "^4.1.1", "@sentry/browser": "^4.1.1",
"@zxing/library": "^0.8.0", "@zxing/library": "^0.8.0",
"3box": "^1.10.2",
"abi-decoder": "^1.2.0", "abi-decoder": "^1.2.0",
"abortcontroller-polyfill": "^1.3.0", "abortcontroller-polyfill": "^1.3.0",
"asmcrypto.js": "^2.3.2", "asmcrypto.js": "^2.3.2",
@ -85,6 +85,7 @@
"eth-block-tracker": "^4.4.2", "eth-block-tracker": "^4.4.2",
"eth-contract-metadata": "^1.9.2", "eth-contract-metadata": "^1.9.2",
"eth-ens-namehash": "^2.0.8", "eth-ens-namehash": "^2.0.8",
"eth-json-rpc-errors": "^1.0.1",
"eth-json-rpc-filters": "^4.1.0", "eth-json-rpc-filters": "^4.1.0",
"eth-json-rpc-infura": "^4.0.1", "eth-json-rpc-infura": "^4.0.1",
"eth-json-rpc-middleware": "^4.2.0", "eth-json-rpc-middleware": "^4.2.0",