RanchiMall/flocore-node
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly import TX and Block from fcoin

Browse Source
This commit is contained in:
Sky Young 2019-07-22 17:26:54 -06:00
parent 4118f2f140
commit ecf9bbaeea
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/services/block/encoding.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
var Block = require('fcoin').block; var Block = require('fcoin').Block;
// stores -- block header as key, block itself as value (optionally) // stores -- block header as key, block itself as value (optionally)
function Encoding(servicePrefix) { function Encoding(servicePrefix) {

3
lib/services/header/index.js
View File

@ -7,7 +7,8 @@ var index = require('../../');
var log = index.log; var log = index.log;
var utils = require('../../utils'); var utils = require('../../utils');
var async = require('async'); var async = require('async');
var BN = require('bn.js'); // var BN = require('bn.js');
var BN = require('bcrypto/lib/bn.js')
var consensus = require('fcoin').consensus; var consensus = require('fcoin').consensus;
var assert = require('assert'); var assert = require('assert');
var constants = require('../../constants'); var constants = require('../../constants');

2
lib/services/mempool/encoding.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
var tx = require('fcoin').tx; var tx = require('fcoin').TX;
function Encoding(servicePrefix) { function Encoding(servicePrefix) {
this.servicePrefix = servicePrefix; this.servicePrefix = servicePrefix;

4
lib/services/p2p/bcoin.js
View File

@ -40,8 +40,8 @@ Bcoin.prototype._getConfig = function(options) {
logConsole: true, logConsole: true,
logLevel: 'info', logLevel: 'info',
indexTx: true, // indexTx: true,
indexAddress: true, // indexAddress: true,
checkpoints: true, checkpoints: true,
memory: false, memory: false,

10
lib/services/p2p/index.js
View File

@ -8,7 +8,8 @@ var log = index.log;
var BaseService = require('../../service'); var BaseService = require('../../service');
var assert = require('assert'); var assert = require('assert');
var Bcoin = require('./bcoin'); var Bcoin = require('./bcoin');
var BcoinTx = require('fcoin').tx; var BcoinBlock = require('fcoin').Block;
var BcoinTx = require('fcoin').TX;
var Networks = require('flocore-lib').Networks; var Networks = require('flocore-lib').Networks;
var BitcoreRPC = require('bitcoind-rpc'); var BitcoreRPC = require('bitcoind-rpc');
var LRU = require('lru-cache'); var LRU = require('lru-cache');
@ -305,9 +306,10 @@ P2P.prototype._initPubSub = function() {
}; };
P2P.prototype._onPeerBlock = function(peer, message) { P2P.prototype._onPeerBlock = function(peer, message) {
this._blockCache.set(message.block.rhash(), message.block); let block = BcoinBlock.fromRaw(message.block.toBuffer())
this.emit(message.block.rhash(), message.block); this._blockCache.set(block.rhash(), block);
this._broadcast(this.subscriptions.block, 'p2p/block', message.block); this.emit(block.rhash(), block);
this._broadcast(this.subscriptions.block, 'p2p/block', block);
}; };
P2P.prototype._onPeerDisconnect = function(peer, addr) { P2P.prototype._onPeerDisconnect = function(peer, addr) {

2
lib/services/transaction/encoding.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
var Tx = require('fcoin').tx; var Tx = require('fcoin').TX;
function Encoding(servicePrefix) { function Encoding(servicePrefix) {
this.servicePrefix = servicePrefix; this.servicePrefix = servicePrefix;