RanchiMall/fcoin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #598 from pinheadmz/broadcasttx

Browse Source 
Fixes pool.getBroadcasted() error item.hash is not a function
This commit is contained in:
Javed Khan 2018-08-31 22:06:53 +05:30 committed by GitHub
commit 15b024a392
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/net/pool.js
View File

@ -955,7 +955,7 @@ class Pool extends EventEmitter {
this.logger.debug(
'Peer requested %s %h as a %s packet (%s).',
item.isTX() ? 'tx' : 'block',
item.hash(),
item.hash,
item.hasWitness() ? 'witness' : 'normal',
peer.hostname());

26
test/node-test.js
View File

@ -12,6 +12,9 @@ const FullNode = require('../lib/node/fullnode');
const MTX = require('../lib/primitives/mtx');
const TX = require('../lib/primitives/tx');
const Address = require('../lib/primitives/address');
const Peer = require('../lib/net/peer');
const InvItem = require('../lib/primitives/invitem');
const invTypes = InvItem.types;
const node = new FullNode({
memory: true,
@ -716,6 +719,29 @@ describe('Node', function() {
assert.strictEqual(result.coinbasevalue, 125e7 + fees);
});
it('should broadcast a tx from inventory', async () => {
const rawTX1 =
'01000000011d06bce42b67f1de811a3444353fab5d400d82728a5bbf9c89978be37ad' +
'3eba9000000006a47304402200de4fd4ecc365ea90f93dbc85d219d7f1bd92ec87436' +
'48acb48b6602977e0b4302203ca2eeabed8e6f457234652a92711d66dd8eda71ed90f' +
'b6c49b3c12ce809a5d401210257654e1b0de2d8b08d514e51af5d770e9ef617ca2b25' +
'4d84dd26685fbc609ec3ffffffff0280969800000000001976a914a4ecde9642f8070' +
'241451c5851431be9b658a7fe88acc4506a94000000001976a914b9825cafc838c5b5' +
'befb70ecded7871d011af89d88ac00000000';
const tx1 = TX.fromRaw(rawTX1, 'hex');
const dummyPeer = Peer.fromOptions({
network: 'regtest',
agent: 'my-subversion',
hasWitness: () => {
return false;
}
});
const txItem = new InvItem(invTypes.TX, tx1.hash());
await node.sendTX(tx1); // add TX to inventory
const tx2 = node.pool.getBroadcasted(dummyPeer, txItem);
assert.strictEqual(tx1.txid(), tx2.txid());
});
it('should cleanup', async () => {
consensus.COINBASE_MATURITY = 100;
await node.close();