diff --git a/plugins/api.js b/plugins/api.js index d116e08..4a3235f 100644 --- a/plugins/api.js +++ b/plugins/api.js @@ -4,9 +4,15 @@ var aschJS = require('asch-js'); var Api = require('../helpers/api.js'); var blockHelper = require('../helpers/block.js'); var cryptoLib = require('../lib/crypto.js'); - +var querystring = require('querystring'); var globalOptions; +function requestURI(a){ + if( typeof(a) !== 'object' ) + return ''; + return '?' + Object.keys(a).map(function(k){ return k + '=' + a[k] }).join('&'); +} + function getApi() { return new Api({host: globalOptions.host, port: globalOptions.port, mainnet: !!globalOptions.main}); } @@ -40,18 +46,16 @@ function getBlockStatus() { } function getBalance(address) { - var params = {address: address}; - getApi().get('/api/accounts/getBalance', params, function (err, result) { - console.log(err || result.balance); + getApi().get('/api/v2/accounts/' + address, null, function (err, result) { + console.log(err || result.account.xas); }); } function getAccount(address) { - var params = {address: address}; - getApi().get('/api/accounts/', params, function (err, result) { + getApi().get('/api/v2/accounts/' + address, null, function (err, result) { console.log(err || pretty(result)); }); -} +} function getVotedDelegates(address, options) { var params = { @@ -103,30 +107,20 @@ function getDelegateByUsername(username) { } function getBlocks(options) { - var params = { - limit: options.limit, - orderBy: options.sort, - offset: options.offset, - totalAmount: options.totalAmount, - totalFee: options.totalFee, - reward: options.reward, - generatorPublicKey: options.generatorPublicKey - }; - getApi().get('/api/blocks/', params, function (err, result) { + let request = querystring.stringify(options); + getApi().get('/api/v2/blocks/?' + request, null, function (err, result) { console.log(err || pretty(result)); }); } function getBlockById(id) { - var params = {id: id}; - getApi().get('/api/blocks/get', params, function (err, result) { + getApi().get('/api/v2/blocks/' + id, null, function (err, result) { console.log(err || pretty(result.block)); }); } function getBlockByHeight(height) { - var params = {height: height}; - getApi().get('/api/blocks/get', params, function (err, result) { + getApi().get('/api/v2/blocks/' + height, null, function (err, result) { console.log(err || pretty(result.block)); }); } @@ -158,27 +152,15 @@ function getUnconfirmedTransactions(options) { } function getTransactions(options) { - var params = { - blockId: options.blockId, - limit: options.limit, - orderBy: options.sort, - offset: options.offset, - type: options.type, - senderPublicKey: options.senderPublicKey, - senderId: options.senderId, - recipientId: options.recipientId, - amount: options.amount, - fee: options.fee, - message: options.message - }; - getApi().get('/api/transactions/', params, function (err, result) { + let request = querystring.stringify(options); + getApi().get('/api/v2/transactions?' + request, null, function (err, result) { console.log(err || pretty(result.transactions)); }); } function getTransaction(id) { var params = {id: id}; - getApi().get('/api/transactions/get', params, function (err, result) { + getApi().get('/api/v2/transactions/' + id, null, function (err, result) { console.log(err || pretty(result.transaction)); }); } @@ -511,11 +493,8 @@ module.exports = function(program) { .description("get blocks") .option("-o, --offset ", "") .option("-l, --limit ", "") - .option("-r, --reward ", "") - .option("-f, --totalFee ", "") - .option("-a, --totalAmount ", "") - .option("-g, --generatorPublicKey ", "") - .option("-s, --sort ", "height:asc, totalAmount:asc, totalFee:asc") + .option("-t, --transactions ", "If this keyword is added with transactions=true then the block will be accompanied by transaction information") + .option("-s, --orderBy ", "height:asc, totalAmount:asc, totalFee:asc") .action(getBlocks); program @@ -546,21 +525,16 @@ module.exports = function(program) { .option("-k, --key ", "") .option("-a, --address
", "") .action(getUnconfirmedTransactions); - + program .command("gettransactions") .description("get transactions") - .option("-b, --blockId ", "") .option("-o, --offset ", "") .option("-l, --limit ", "") .option("-t, --type ", "transaction type") - .option("-s, --sort ", "") - .option("-a, --amount ", "") - .option("-f, --fee ", "") + .option("-s, --orderBy ", "Sort by") .option("-m, --message ", "") - .option("--senderPublicKey ", "") .option("--senderId ", "") - .option("--recipientId ", "") .action(getTransactions); program