Skip to content
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.

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

WIP: Cash addr #529

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
Prev Previous commit
translate input params
matiu committed Nov 11, 2017
commit 2bc46af5dae4a1ab266a549b1dc9e883923da47a
9 changes: 5 additions & 4 deletions app/controllers/addresses.js
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@

var _ = require('lodash');
var Address = require('../models/Address');
var AddressTranslator = require('../../lib/AddressTranslator');
var common = require('./common');
var async = require('async');

@@ -30,6 +31,7 @@ var getAddr = function(req, res, next) {
var a;
try {
var addr = req.param('addr');
addr = AddressTranslator.translate(addr, 'btc', 'bch');
a = new Address(addr);
} catch (e) {
common.handleErrors({
@@ -47,10 +49,9 @@ var getAddrs = function(req, res, next) {
var addrStrs = req.param('addrs');
var s = addrStrs.split(',');
if (s.length === 0) return as;
for (var i = 0; i < s.length; i++) {
var a = new Address(s[i]);
as.push(a);
}
as = _.map(s,function(x) {
return new Address(AddressTranslator.translate(s[i], 'btc', 'bch'));
});
} catch (e) {
common.handleErrors({
message: 'Invalid addrs param:' + e.message,
13 changes: 12 additions & 1 deletion app/controllers/transactions.js
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ var bitcore = require('bitcore');
var RpcClient = bitcore.RpcClient;
var config = require('../../config/config');
var bitcoreRpc = imports.bitcoreRpc || new RpcClient(config.bitcoind);
var AddressTranslator = require('../../lib/AddressTranslator');

var tDb = require('../../lib/TransactionDb').default();
var bdb = require('../../lib/BlockDb').default();
@@ -156,8 +157,18 @@ exports.list = function(req, res, next) {
});
}
else if (addrStr) {
var a = new Address(addrStr);

try {
addrStr = AddressTranslator.translate(addrStr, 'btc', 'bch');
} catch (e) {
common.handleErrors({
message: 'Invalid address:' + e.message,
code: 1
}, res, next);
return null;
};

var a = new Address(addrStr);
a.update(function(err) {
if (err && !a.totalReceivedSat) {
console.log(err);
2 changes: 2 additions & 0 deletions lib/AddressTranslator.js
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@ var Bitcore_ = {
bch: require('bitcore-lib-cash')
};

var _ = require('lodash');

function AddressTranslator() {
};

2 changes: 1 addition & 1 deletion lib/PeerSync.js
Original file line number Diff line number Diff line change
@@ -107,7 +107,7 @@ PeerSync.prototype.handleBlock = function(info) {
if (self.shouldBroadcast) {
sockets.broadcastBlock(blockHash);
// broadcasting address here is a bad idea. listening to new block
// should be enoght
// should be enough
}
}
});
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -66,7 +66,7 @@
"glob": "*",
"leveldown": "~0.10.0",
"levelup": "~0.19.0",
"lodash": "^2.4.1",
"lodash": "^2.4.2",
"microtime": "^0.6.0",
"mkdirp": "^0.5.0",
"moment": "~2.5.0",