Properly import TX and Block from fcoin

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

View File

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

View File

@ -7,7 +7,8 @@ var index = require('../../');
var log = index.log;
var utils = require('../../utils');
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 assert = require('assert');
var constants = require('../../constants');

View File

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

View File

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

View File

@ -8,7 +8,8 @@ var log = index.log;
var BaseService = require('../../service');
var assert = require('assert');
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 BitcoreRPC = require('bitcoind-rpc');
var LRU = require('lru-cache');
@ -305,9 +306,10 @@ P2P.prototype._initPubSub = function() {
};
P2P.prototype._onPeerBlock = function(peer, message) {
this._blockCache.set(message.block.rhash(), message.block);
this.emit(message.block.rhash(), message.block);
this._broadcast(this.subscriptions.block, 'p2p/block', message.block);
let block = BcoinBlock.fromRaw(message.block.toBuffer())
this._blockCache.set(block.rhash(), block);
this.emit(block.rhash(), block);
this._broadcast(this.subscriptions.block, 'p2p/block', block);
};
P2P.prototype._onPeerDisconnect = function(peer, addr) {

View File

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