Return tx customData wth txHistory
This commit is contained in:
parent
57e5a743e8
commit
6a9db29192
|
@ -2196,6 +2196,7 @@ WalletService.prototype.getTxHistory = function(opts, cb) {
|
||||||
var txpOut = _.find(proposal.outputs, query);
|
var txpOut = _.find(proposal.outputs, query);
|
||||||
output.message = txpOut ? txpOut.message : null;
|
output.message = txpOut ? txpOut.message : null;
|
||||||
});
|
});
|
||||||
|
newTx.customData = proposal.customData;
|
||||||
// newTx.sentTs = proposal.sentTs;
|
// newTx.sentTs = proposal.sentTs;
|
||||||
// newTx.merchant = proposal.merchant;
|
// newTx.merchant = proposal.merchant;
|
||||||
//newTx.paymentAckMemo = proposal.paymentAckMemo;
|
//newTx.paymentAckMemo = proposal.paymentAckMemo;
|
||||||
|
|
|
@ -4651,7 +4651,8 @@ describe('Wallet service', function() {
|
||||||
message: 'message #2'
|
message: 'message #2'
|
||||||
}];
|
}];
|
||||||
var txOpts = helpers.createProposalOpts(Model.TxProposalLegacy.Types.MULTIPLEOUTPUTS, outputs, TestData.copayers[0].privKey_1H_0, {
|
var txOpts = helpers.createProposalOpts(Model.TxProposalLegacy.Types.MULTIPLEOUTPUTS, outputs, TestData.copayers[0].privKey_1H_0, {
|
||||||
message: 'some message'
|
message: 'some message',
|
||||||
|
customData: { "test": true }
|
||||||
});
|
});
|
||||||
server.createTxLegacy(txOpts, function(err, tx) {
|
server.createTxLegacy(txOpts, function(err, tx) {
|
||||||
should.not.exist(err);
|
should.not.exist(err);
|
||||||
|
@ -4713,6 +4714,8 @@ describe('Wallet service', function() {
|
||||||
tx.outputs[1].amount.should.equal(helpers.toSatoshi(30));
|
tx.outputs[1].amount.should.equal(helpers.toSatoshi(30));
|
||||||
should.exist(tx.outputs[1].message);
|
should.exist(tx.outputs[1].message);
|
||||||
tx.outputs[1].message.should.equal('message #2');
|
tx.outputs[1].message.should.equal('message #2');
|
||||||
|
should.exist(tx.customData);
|
||||||
|
should.exist(tx.customData["test"]);
|
||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue