RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rpc: error handling.

Browse Source
This commit is contained in:
Christopher Jeffrey 2016-08-09 13:03:22 -07:00
parent 719222b61d
commit 7490ea2b87
No known key found for this signature in database
GPG Key ID: 8962AB9DE6666BBD
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/bcoin/http/rpc.js
View File

@ -1548,10 +1548,16 @@ RPC.prototype.signrawtransaction = function signrawtransaction(args, callback) {
this.node.fillCoins(merged, function(err) { this.node.fillCoins(merged, function(err) {
if (err) if (err)
return callback(err); return callback(err);
self.wallet.fillCoins(merged, function(err) { self.wallet.fillCoins(merged, function(err) {
if (err) if (err)
return callback(err); return callback(err);
self._signrawtransaction(merged, txs, args, callback);
try {
self._signrawtransaction(merged, txs, args, callback);
} catch (e) {
callback(e);
}
}); });
}); });
}; };
@ -1737,7 +1743,11 @@ RPC.prototype._createRedeem = function _createRedeem(args, callback) {
if (err) if (err)
return callback(err); return callback(err);
script = bcoin.script.fromMultisig(m, n, keys); try {
script = bcoin.script.fromMultisig(m, n, keys);
} catch (e) {
return next(new RPCError('Invalid parameters.'));
}
if (script.toRaw().length > constants.script.MAX_PUSH) if (script.toRaw().length > constants.script.MAX_PUSH)
return callback(new RPCError('Redeem script exceeds size limit.')); return callback(new RPCError('Redeem script exceeds size limit.'));
@ -2976,4 +2986,8 @@ function RPCError(msg) {
utils.inherits(RPCError, Error); utils.inherits(RPCError, Error);
/*
* Expose
*/
module.exports = RPC; module.exports = RPC;