Skip to content

add /v2/balance/ endpoint; fix tests #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bsnowden3 wants to merge 1 commit into
base: ffeat/bigint
Choose a base branch
from
Open

add /v2/balance/ endpoint; fix tests #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 9 additions & 7 deletions packages/bitcore-wallet-client/src/lib/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,27 +1563,27 @@ export class API extends EventEmitter {
}

private convertBalance(inB) {
let ret: any = {};
let ret: any = {};
const fields = [
'totalAmount',
'lockedAmount',
'totalConfirmedAmount',
'lockedConfirmedAmount',
'availableAmount',
'availableConfirmedAmount',
'availableConfirmedAmount'
];

fields.forEach(x=> {
fields.forEach(x => {
ret[x] = BigInt(inB[x] || 0);
});

ret.byAddress = inB.byAddress;
ret.byAddress.forEach(x=> {
ret.byAddress.forEach(x => {
x = BigInt(x.amount || 0);
});

return ret;
};
}

// /**
// * Update wallet balance
Expand All @@ -1593,14 +1593,15 @@ export class API extends EventEmitter {
// * @param {String} opts.multisigContractAddress optional: MULTISIG ETH Contract Address
// * @param {Callback} cb
// */
getBalance(opts, cb) {
getBalance(opts, cb, baseUrl) {
Copy link
Owner

@matiu matiu Jan 26, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

by default baseUrl should be the current URL (/v2/balance/ ? )

Copy link

@razeljoy29 razeljoy29 Jun 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok

Copy link

@danmaster01 danmaster01 Aug 25, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool

if (!cb) {
cb = opts;
opts = {};
log.warn('DEPRECATED WARN: getBalance should receive 2 parameters.');
}

opts = opts || {};
baseUrl = baseUrl || '/v2/balance/';

$.checkState(
this.credentials && this.credentials.isComplete(),
Expand All @@ -1624,9 +1625,10 @@ export class API extends EventEmitter {
qs = '?' + args.join('&');
}

var url = '/v1/balance/' + qs;
var url = baseUrl + qs;
this.request.get(url, (err, inB) => {
if (err) return cb(err);
if (opts.doNotConvertResponse) return cb(null, inB);
return cb(null, this.convertBalance(inB));
});
}
Expand Down
71 changes: 68 additions & 3 deletions packages/bitcore-wallet-client/test/api.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var chai = require('chai');
chai.config.includeStack = true;
var sinon = require('sinon');
var should = chai.should();
var expect = chai.expect();
var async = require('async');
var request = require('supertest');
var Uuid = require('uuid');
Expand Down Expand Up @@ -41,6 +42,7 @@ var ExpressApp = BWS.ExpressApp;
var Storage = BWS.Storage;
var TestData = require('./testdata');
var Errors = require('../ts_build/lib/errors');
const { assert } = require('console');

var helpers = {};
helpers.toSatoshi = btc => {
Expand Down Expand Up @@ -6998,7 +7000,70 @@ describe('client API', function() {
});
});

it('should be able to recover funds from recreated wallet', function(done) {
it('should be able to recover funds from recreated wallet /v1/balance/', function(done) {
this.timeout(10000);
helpers.createAndJoinWallet(clients, keys, 2, 2, {}, () => {
clients[0].createAddress((err, addr) => {
should.not.exist(err,err);
should.exist(addr);
blockchainExplorerMock.setUtxo(addr, 1, 2);

var storage = new Storage({
db: db2
});
var newApp;
var expressApp = new ExpressApp();
expressApp.start(
{
storage: storage,
blockchainExplorer: blockchainExplorerMock,
disableLogs: true
},
() => {
newApp = expressApp.app;

var recoveryClient = helpers.newClient(newApp);
recoveryClient.fromString(clients[0].toString());

recoveryClient.getStatus({}, (err, status) => {
should.exist(err);
err.should.be.an.instanceOf(Errors.NOT_AUTHORIZED);
recoveryClient.recreateWallet(err => {
should.not.exist(err,err);
recoveryClient.getStatus({}, (err, status) => {
should.not.exist(err,err);
recoveryClient.startScan({}, err => {
should.not.exist(err,err);
var balance = 0;
async.whilst(
() => {
return balance == 0;
},
next => {
setTimeout(() => {
recoveryClient.getBalance({doNotConvertResponse: true}, (err, b) => {
balance = b.totalAmount;
next(err);
}, '/v1/balance/');
}, 200);
},
err => {
should.not.exist(err,err);
(typeof(balance) === "string").should.equal(true);
done();
}
);
});
});
});
});
}
);
});
});
});

it('should be able to recover funds from recreated wallet /v2/balance/', function(done) {
this.timeout(10000);
helpers.createAndJoinWallet(clients, keys, 2, 2, {}, () => {
clients[0].createAddress((err, addr) => {
Expand Down Expand Up @@ -7042,12 +7107,12 @@ describe('client API', function() {
recoveryClient.getBalance({}, (err, b) => {
balance = b.totalAmount;
next(err);
});
}, '/v2/balance/');
}, 200);
},
err => {
should.not.exist(err,err);
balance.should.equal(1e8);
(typeof(balance) === "bigint").should.equal(true);
done();
}
);
Expand Down
41 changes: 39 additions & 2 deletions packages/bitcore-wallet-service/src/lib/expressapp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@ const Defaults = Common.Defaults;

// / Patch bigint for JSON serealization
// @ts-ignore-start
BigInt.prototype.toJSON = function() { return this.toString(); }
BigInt.prototype.toJSON = function() {
return this.toString();
};
// @ts-ignore-end/

export class ExpressApp {
app: express.Express;


constructor() {
this.app = express();
}
Expand Down Expand Up @@ -738,6 +739,42 @@ export class ExpressApp {
});
});

router.get('/v2/balance/', (req, res) => {
getServerWithAuth(req, res, server => {
const opts: {
coin?: string;
twoStep?: boolean;
tokenAddress?: string;
multisigContractAddress?: string;
} = {};
if (req.query.coin) opts.coin = req.query.coin;
if (req.query.twoStep == '1') opts.twoStep = true;
if (req.query.tokenAddress) opts.tokenAddress = req.query.tokenAddress;
if (req.query.multisigContractAddress) opts.multisigContractAddress = req.query.multisigContractAddress;

server.getBalance(opts, (err, balance) => {
let balanceResponse = {};

if (err) return returnError(err, res, req);
_.forEach(balance, (value, key) => {
if (key == 'totalAmount') {
balanceResponse[key] = balance[key].toString();
}

if (key == 'byAddress') {
balanceResponse[key] = balance[key];
if (balanceResponse[key].amount) {
balanceResponse[key].amount = balanceResponse[key].amount.toString();
}
} else {
balanceResponse[key] = balance[key];
}
});
res.json(balanceResponse);
});
});
});

let estimateFeeLimiter;

if (Defaults.RateLimit.estimateFee && !opts.ignoreRateLimiter) {
Expand Down