Skip to content

Test/nocashaddr #2521

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

Merged
matiu merged 4 commits into from
Nov 7, 2019
Merged

Test/nocashaddr #2521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d34033
add noCashAddr tests and verifier tests
matiu Nov 7, 2019
0032d09
.
matiu Nov 7, 2019
5cf61a0
rm only
matiu Nov 7, 2019
11cbc20
lint
matiu Nov 7, 2019
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
73 changes: 73 additions & 0 deletions packages/bitcore-wallet-client/test/verifier.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
'use strict';

var _ = require('lodash');
var chai = chai || require('chai');
var sinon = sinon || require('sinon');
var should = chai.should();

var { Verifier } = require('../ts_build/lib/verifier');
var { Key } = require('../ts_build/lib/key');


const aKey = Key.fromMnemonic('abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about');

describe('Verifier', function () {

describe('checkAddress', function () {

it('should verify a BTC address', () => {

let cred = aKey.createCredentials(null, { coin: 'btc', network: 'livenet', account: 0, n: 1});
cred.addWalletInfo(
'id',
'name',
1,
1,
'copayer',
);

Verifier.checkAddress(cred, {
address: '1LqBGSKuX5yYUonjxT5qGfpUsXKYYWeabA',
path: 'm/0/0',
publicKeys: ['03aaeb52dd7494c361049de67cc680e83ebcbbbdbeb13637d92cd845f70308af5e'],
}).should.be.true;
})

it('should verify a ETH address', () => {
let cred = aKey.createCredentials(null, { coin: 'eth', network: 'livenet', account: 0, n: 1});
cred.addWalletInfo(
'id',
'name',
1,
1,
'copayer',
);

Verifier.checkAddress(cred, {
address: '0x9858EfFD232B4033E47d90003D41EC34EcaEda94',
path: 'm/0/0',
publicKeys: ['0237b0bb7a8288d38ed49a524b5dc98cff3eb5ca824c9f9dc0dfdb3d9cd600f299'],
}).should.be.true;
})
});

describe('checkCopayers', function () {

it('should verify copayers', () => {
let cred = aKey.createCredentials(null, { coin: 'btc', network: 'livenet', account: 0, n: 1});
cred.addWalletInfo(
'id',
'name',
1,
1,
'copayer',
);
Verifier.checkCopayers(cred, {
address: '0x9858EfFD232B4033E47d90003D41EC34EcaEda94',
path: 'm/0/0',
publicKeys: ['0237b0bb7a8288d38ed49a524b5dc98cff3eb5ca824c9f9dc0dfdb3d9cd600f299'],
}).should.be.true;
});
});
});

14 changes: 7 additions & 7 deletions packages/bitcore-wallet-service/src/lib/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1346,6 +1346,13 @@ export class WalletService {
return cb('Bad xPub');
}

if (wallet.coin == 'bch' && opts.noCashAddr) {
address.address = BCHAddressTranslator.translate(
address.address,
'copay'
);
}

this._store(
wallet,
address,
Expand Down Expand Up @@ -1414,13 +1421,6 @@ export class WalletService {
if (err) {
return cb(err);
}

if (wallet.coin == 'bch' && opts.noCashAddr) {
address.address = BCHAddressTranslator.translate(
address.address,
'copay'
);
}
return cb(err, address);
});
});
Expand Down
66 changes: 64 additions & 2 deletions packages/bitcore-wallet-service/test/integration/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1661,6 +1661,65 @@ describe('Wallet service', function() {
});


describe('1-1 wallet (BIP44/BCH)', function() {
beforeEach(function(done) {
helpers.createAndJoinWallet(1, 1, {
coin: 'bch',
}, function(s, w) {
server = s;
wallet = w;
done();
});
});

it('should create address', function(done) {
server.createAddress({}, function(err, address) {
should.not.exist(err);
should.exist(address);
address.walletId.should.equal(wallet.id);
address.network.should.equal('livenet');
address.address.should.equal('qrg04mz8h67j9dck3f3f3sa560taep87yqnwra9ak6');
address.isChange.should.be.false;
address.path.should.equal('m/0/0');
address.type.should.equal('P2PKH');
address.coin.should.equal('bch');
server.getNotifications({}, function(err, notifications) {
should.not.exist(err);
var notif = _.find(notifications, {
type: 'NewAddress'
});
should.exist(notif);
notif.data.address.should.equal(address.address);
done();
});
});
});


it('should create address (no cash addr)', function(done) {
server.createAddress({noCashAddr:true}, function(err, address) {
should.not.exist(err);
should.exist(address);
address.walletId.should.equal(wallet.id);
address.network.should.equal('livenet');
address.address.should.equal('CbWsiNjh18ynQYc5jfYhhespEGrAaW8YUq');
address.isChange.should.be.false;
address.path.should.equal('m/0/0');
address.type.should.equal('P2PKH');
address.coin.should.equal('bch');
server.getNotifications({}, function(err, notifications) {
should.not.exist(err);
var notif = _.find(notifications, {
type: 'NewAddress'
});
should.exist(notif);
notif.data.address.should.equal(address.address);
done();
});
});
});
});

describe('1-1 wallet (BIP44/BCH/Testnet)', function() {
beforeEach(function(done) {
helpers.createAndJoinWallet(1, 1, {
Expand Down Expand Up @@ -4979,7 +5038,9 @@ describe('#createTX ETH Only tests', () => {
tx.feePerKb.should.equal(123e2);
should.not.exist(tx.feeLevel);
var publishOpts = helpers.getProposalSignatureOpts(tx, TestData.copayers[0].privKey_1H_0);
s.publishTx(publishOpts, function(err) {
publishOpts.noCashAddr = true;
s.publishTx(publishOpts, function(err, txp) {
txp.changeAddress.address.should.equal('CWwtFMy3GMr5qMEtvEdUDjePfShzkJXCnh');
s.getPendingTxs({ noCashAddr: true }, function(err, txs) {
should.not.exist(err);
txs.length.should.equal(1);
Expand Down Expand Up @@ -5035,7 +5096,8 @@ describe('#createTX ETH Only tests', () => {
should.not.exist(tx.feeLevel);

var publishOpts = helpers.getProposalSignatureOpts(tx, TestData.copayers[0].privKey_1H_0);
s.publishTx(publishOpts, function(err) {
s.publishTx(publishOpts, function(err, txp) {
txp.changeAddress.address.should.equal('CWwtFMy3GMr5qMEtvEdUDjePfShzkJXCnh');
s.getPendingTxs({ noCashAddr: true }, function(err, txs) {

should.not.exist(err);
Expand Down