Fix broken rpc cmds
This commit is contained in:
+20
-29
@@ -6,8 +6,8 @@ var base_server = 'http://127.0.0.1:' + settings.port + "/";
|
|||||||
|
|
||||||
var base_url = base_server + 'api/';
|
var base_url = base_server + 'api/';
|
||||||
|
|
||||||
const Client = require('node');
|
const onode = require('./node');
|
||||||
const client = new Client(settings.wallet);
|
const client = new onode.Client(settings.wallet);
|
||||||
|
|
||||||
// returns coinbase total sent as current coin supply
|
// returns coinbase total sent as current coin supply
|
||||||
function coinbase_supply(cb) {
|
function coinbase_supply(cb) {
|
||||||
@@ -111,18 +111,15 @@ module.exports = {
|
|||||||
get_blockhash: function(height, cb) {
|
get_blockhash: function(height, cb) {
|
||||||
if (settings.use_rpc) {
|
if (settings.use_rpc) {
|
||||||
var uri = base_url + 'getblockhash?height=' + height;
|
var uri = base_url + 'getblockhash?height=' + height;
|
||||||
request({uri: uri, json: true}, function (error, response, body) {
|
request({uri: uri, json: true, headers: {'User-Agent': 'eiquidus'}}, function (error, response, body) {
|
||||||
return cb(body);
|
return cb(body);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
client.command([{method:'getblockhash', parameters: [parseInt(height)]}], function(err, response){
|
client.cmd([{method:'getblockhash', params: [parseInt(height)]}], function(err, response){
|
||||||
if(err){console.log('Error: ', err); }
|
if (err)
|
||||||
else{
|
console.log('There was an error. Check your console.');
|
||||||
if(response[0].name == 'RpcError'){
|
else
|
||||||
return cb('There was an error. Check your console.');
|
return cb(response);
|
||||||
}
|
|
||||||
return cb(response[0]);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -130,18 +127,15 @@ module.exports = {
|
|||||||
get_block: function(hash, cb) {
|
get_block: function(hash, cb) {
|
||||||
if (settings.use_rpc) {
|
if (settings.use_rpc) {
|
||||||
var uri = base_url + 'getblock?hash=' + hash;
|
var uri = base_url + 'getblock?hash=' + hash;
|
||||||
request({uri: uri, json: true}, function (error, response, body) {
|
request({uri: uri, json: true, headers: {'User-Agent': 'eiquidus'}}, function (error, response, body) {
|
||||||
return cb(body);
|
return cb(body);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
client.command([{method:'getblock', parameters: [hash]}], function(err, response){
|
client.cmd([{method:'getblock', params: [hash]}], function(err, response){
|
||||||
if(err){console.log('Error: ', err); }
|
if (err)
|
||||||
else{
|
console.log('There was an error. Check your console.');
|
||||||
if(response[0].name == 'RpcError'){
|
else
|
||||||
return cb('There was an error. Check your console.');
|
return cb(response);
|
||||||
}
|
|
||||||
return cb(response[0]);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -149,18 +143,15 @@ module.exports = {
|
|||||||
get_rawtransaction: function(hash, cb) {
|
get_rawtransaction: function(hash, cb) {
|
||||||
if (settings.use_rpc) {
|
if (settings.use_rpc) {
|
||||||
var uri = base_url + 'getrawtransaction?txid=' + hash + '&decrypt=1';
|
var uri = base_url + 'getrawtransaction?txid=' + hash + '&decrypt=1';
|
||||||
request({uri: uri, json: true}, function (error, response, body) {
|
request({uri: uri, json: true, headers: {'User-Agent': 'eiquidus'}}, function (error, response, body) {
|
||||||
return cb(body);
|
return cb(body);
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
client.command([{method:'getrawtransaction', parameters: [hash, 1]}], function(err, response){
|
client.cmd([{method:'getrawtransaction', params: [hash, 1]}], function(err, response){
|
||||||
if(err){console.log('Error: ', err); }
|
if (err)
|
||||||
else{
|
console.log('There was an error. Check your console.');
|
||||||
if(response[0].name == 'RpcError'){
|
else
|
||||||
return cb('There was an error. Check your console.');
|
return cb(response);
|
||||||
}
|
|
||||||
return cb(response[0]);
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user