Skip to content
This repository was archived by the owner on Mar 11, 2024. It is now read-only.

Fixed call to signTransaction #8

Open
ctapang wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Fixed call to signTransaction #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bc7b784
Fixed call to signTransaction
Nov 11, 2020
7ca9ff7
Changes for publishing to GitHub registry
Nov 12, 2020
8cc7905
Bumped version
Nov 12, 2020
33eeeb1
Fixed hooked-wallet.js, use es6-promisify and bluebird
Nov 17, 2020
06681ba
Bumped version, modified 'bundle' script
Nov 18, 2020
0aae4a6
Fixed hooked-wallet.js
Nov 18, 2020
30564ec
Bumped version
Nov 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"name": "@trufflesuite/web3-provider-engine",
"version": "15.0.13-1",
"name": "@puremoney/web3-provider-engine",
"version": "15.0.13-x04",
"description": "Fork of https://github.com/MetaMask/web3-provider-engine",
"repository": "https://github.com/trufflesuite/provider-engine",
"repository": {
"type": "git",
"url": "https://github.com/puremoney/provider-engine"
},
"main": "index.js",
"scripts": {
"test": "node test/index.js && yarn lint",
"prepublishOnly": "yarn build && yarn bundle",
"build": "babel zero.js index.js -d dist/es5 && babel subproviders -d dist/es5/subproviders && babel util -d dist/es5/util",
"bundle": "mkdir -p ./dist && yarn bundle-engine && yarn bundle-zero",
"bundle": "yarn bundle-engine && yarn bundle-zero",
"bundle-zero": "browserify -s ZeroClientProvider -e zero.js -t [ babelify --presets [ @babel/preset-env ] ] > dist/ZeroClientProvider.js",
"bundle-engine": "browserify -s ProviderEngine -e index.js -t [ babelify --presets [ @babel/preset-env ] ] > dist/ProviderEngine.js",
"lint": "eslint --quiet --ignore-path .gitignore ."
Expand All @@ -22,16 +25,17 @@
"@trufflesuite/eth-sig-util": "^1.4.2",
"async": "^2.5.0",
"backoff": "^2.5.0",
"bluebird": "^3.7.2",
"clone": "^2.0.0",
"cross-fetch": "^2.1.0",
"es6-promisify": "^6.1.1",
"eth-block-tracker": "^4.4.2",
"eth-json-rpc-errors": "^2.0.2",
"ethereumjs-block": "^1.2.2",
"ethereumjs-tx": "^1.2.0",
"ethereumjs-util": "^5.1.5",
"ethereumjs-vm": "^2.3.4",
"json-stable-stringify": "^1.0.1",
"promise-to-callback": "^1.0.0",
"readable-stream": "^2.2.9",
"request": "^2.85.0",
"semaphore": "^1.0.3",
Expand All @@ -55,6 +59,7 @@
"ws": false
},
"publishConfig": {
"access": "public"
"access": "public",
"registry": "https://npm.pkg.github.com/"
}
}
127 changes: 69 additions & 58 deletions subproviders/hooked-wallet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,8 @@
* - getAccounts() -- array of addresses supported
* - signTransaction(tx) -- sign a raw transaction object
*/

const {promisify} = require("es6-promisify")
const waterfall = require('async/waterfall')
const parallel = require('async/parallel')
const inherits = require('util').inherits
const ethUtil = require('ethereumjs-util')
const sigUtil = require('@trufflesuite/eth-sig-util')
Expand Down Expand Up @@ -50,7 +49,9 @@ module.exports = HookedWalletSubprovider
// signTransaction (perform the signature)
// publishTransaction (publish signed tx to network)
//


// Now uses Bluebird
promisify.Promise = require("bluebird")

inherits(HookedWalletSubprovider, Subprovider)

Expand Down Expand Up @@ -277,8 +278,8 @@ HookedWalletSubprovider.prototype.handleRequest = function(payload, next, end){
data: message,
})
waterfall([
(cb) => self.validateTypedMessage(msgParams, cb),
(cb) => self.processTypedMessage(msgParams, cb),
(callb) => self.validateTypedMessage(msgParams, callb),
(callb) => self.processTypedMessage(msgParams, callb),
], end)
})()

Expand Down Expand Up @@ -330,64 +331,64 @@ HookedWalletSubprovider.prototype.getAccounts = function(cb) {
HookedWalletSubprovider.prototype.processTransaction = function(txParams, cb) {
const self = this
waterfall([
(cb) => self.approveTransaction(txParams, cb),
(didApprove, cb) => self.checkApproval('transaction', didApprove, cb),
(cb) => self.finalizeAndSubmitTx(txParams, cb),
(callb) => self.approveTransaction(txParams, callb),
(didApprove, callb) => self.checkApproval('transaction', didApprove, callb),
(callb) => self.finalizeAndSubmitTx(txParams, callb),
], cb)
}


HookedWalletSubprovider.prototype.processSignTransaction = function(txParams, cb) {
const self = this
waterfall([
(cb) => self.approveTransaction(txParams, cb),
(didApprove, cb) => self.checkApproval('transaction', didApprove, cb),
(cb) => self.finalizeTx(txParams, cb),
(callb) => self.approveTransaction(txParams, callb),
(didApprove, callb) => self.checkApproval('transaction', didApprove, callb),
(callb) => self.finalizeTx(txParams, callb),
], cb)
}

HookedWalletSubprovider.prototype.processMessage = function(msgParams, cb) {
const self = this
waterfall([
(cb) => self.approveMessage(msgParams, cb),
(didApprove, cb) => self.checkApproval('message', didApprove, cb),
(cb) => self.signMessage(msgParams, cb),
(callb) => self.approveMessage(msgParams, callb),
(didApprove, callb) => self.checkApproval('message', didApprove, callb),
(callb) => self.signMessage(msgParams, callb),
], cb)
}

HookedWalletSubprovider.prototype.processPersonalMessage = function(msgParams, cb) {
const self = this
waterfall([
(cb) => self.approvePersonalMessage(msgParams, cb),
(didApprove, cb) => self.checkApproval('message', didApprove, cb),
(cb) => self.signPersonalMessage(msgParams, cb),
(callb) => self.approvePersonalMessage(msgParams, callb),
(didApprove, callb) => self.checkApproval('message', didApprove, callb),
(callb) => self.signPersonalMessage(msgParams, callb),
], cb)
}

HookedWalletSubprovider.prototype.processDecryptMessage = function(msgParams, cb) {
const self = this
waterfall([
(cb) => self.approveDecryptMessage(msgParams, cb),
(didApprove, cb) => self.checkApproval('decryptMessage', didApprove, cb),
(cb) => self.decryptMessage(msgParams, cb),
(callb) => self.approveDecryptMessage(msgParams, callb),
(didApprove, callb) => self.checkApproval('decryptMessage', didApprove, callb),
(callb) => self.decryptMessage(msgParams, callb),
], cb)
}

HookedWalletSubprovider.prototype.processEncryptionPublicKey = function(msgParams, cb) {
const self = this
waterfall([
(cb) => self.approveEncryptionPublicKey(msgParams, cb),
(didApprove, cb) => self.checkApproval('encryptionPublicKey', didApprove, cb),
(cb) => self.encryptionPublicKey(msgParams, cb),
(callb) => self.approveEncryptionPublicKey(msgParams, callb),
(didApprove, callb) => self.checkApproval('encryptionPublicKey', didApprove, callb),
(callb) => self.encryptionPublicKey(msgParams, callb),
], cb)
}

HookedWalletSubprovider.prototype.processTypedMessage = function(msgParams, cb) {
const self = this
waterfall([
(cb) => self.approveTypedMessage(msgParams, cb),
(didApprove, cb) => self.checkApproval('message', didApprove, cb),
(cb) => self.signTypedMessage(msgParams, cb),
(callb) => self.approveTypedMessage(msgParams, callb),
(didApprove, callb) => self.checkApproval('message', didApprove, callb),
(callb) => self.signTypedMessage(msgParams, callb),
], cb)
}

Expand All @@ -400,7 +401,7 @@ HookedWalletSubprovider.prototype.autoApprove = function(txParams, cb) {
}

HookedWalletSubprovider.prototype.checkApproval = function(type, didApprove, cb) {
cb( didApprove ? null : new Error('User denied '+type+' signature.') )
cb( didApprove ? null : new Error('User denied '+type+' signature.'))
}

//
Expand Down Expand Up @@ -569,9 +570,9 @@ HookedWalletSubprovider.prototype.finalizeAndSubmitTx = function(txParams, cb) {
// so we can atomically consume a nonce
self.nonceLock.take(function(){
waterfall([
self.fillInTxExtras.bind(self, txParams),
self.signTransaction.bind(self),
self.publishTransaction.bind(self),
(callb) => self.fillInTxExtras(txParams, callb),
(params, callb) => self.signTransaction(params, callb),
(params, callb) => self.publishTransaction(params, callb),
], function(err, txHash){
self.nonceLock.leave()
if (err) return cb(err)
Expand All @@ -586,8 +587,8 @@ HookedWalletSubprovider.prototype.finalizeTx = function(txParams, cb) {
// so we can atomically consume a nonce
self.nonceLock.take(function(){
waterfall([
self.fillInTxExtras.bind(self, txParams),
self.signTransaction.bind(self),
(callb) => self.fillInTxExtras(txParams, callb),
(params, callb) => self.signTransaction(params, callb),
], function(err, signedTx){
self.nonceLock.leave()
if (err) return cb(err)
Expand Down Expand Up @@ -622,36 +623,46 @@ HookedWalletSubprovider.prototype.getGasPrice = function(cb) {

HookedWalletSubprovider.prototype.fillInTxExtras = function(txParams, cb){
const self = this
const address = txParams.from
// console.log('fillInTxExtras - address:', address)

const tasks = {}

if (txParams.gasPrice === undefined) {
// console.log("need to get gasprice")
tasks.gasPrice = self.getGasPrice.bind(self)
}

if (txParams.nonce === undefined) {
// console.log("need to get nonce")
tasks.nonce = self.emitPayload.bind(self, { method: 'eth_getTransactionCount', params: [address, 'pending'] })
}
const {from, gasPrice, nonce, gas} = txParams

if (txParams.gas === undefined) {
// console.log("need to get gas")
tasks.gas = self.estimateGas.bind(self, cloneTxParams(txParams))
if (gasPrice && nonce && gas) {
cb(null, txParams)
return
}

parallel(tasks, function(err, taskResults) {
if (err) return cb(err)

const result = {}
if (taskResults.gasPrice) result.gasPrice = taskResults.gasPrice
if (taskResults.nonce) result.nonce = taskResults.nonce.result
if (taskResults.gas) result.gas = taskResults.gas
let ta = new Array(3)
ta.push(!gasPrice ?
promisify((cb) => self.getGasPrice(cb)) :
Promise.resolve(gasPrice))
ta.push(!nonce ?
promisify((cb) => self.emitPayload({ method: 'eth_getTransactionCount',
params: [from, 'pending'] }, cb)) :
Promise.resolve(nonce))
ta.push(!gas ?
promisify((cb) => self.estimateGas(cloneTxParams(txParams), cb)) :
Promise.resolve(gas))

// do it all in parallel
Promise.all(ta).then(
(result) => {
result.map((p, i) => {
switch(i) {
case 0: txParams.gasPrice = !txParams.gasPrice ? p : txParams.gasPrice
break
case 1: txParams.nonce = !txParams.nonce ? p : txParams.nonce
break
case 2: txParams.gas = !txParams.gas ? p : txParams.gas
break
default:
}
})
cb(null, txParams)
},
(reason) => {
cb(reason)
}
)

cb(null, extend(txParams, result))
})
}

// util
Expand Down