@Override
public Sign get_channel_signer(boolean inbound, long channel_value_satoshis) {
Sign underlying_ck = underlying_if.get_channel_signer(inbound, channel_value_satoshis);
- // TODO: Expose the underlying signer from a Sign
- /*BaseSign.BaseSignInterface si = new BaseSign.BaseSignInterface() {
+ BaseSign underlying_base = underlying_ck.get_base_sign();
+ BaseSign.BaseSignInterface bsi = new BaseSign.BaseSignInterface() {
@Override
public byte[] get_per_commitment_point(long idx) {
- return underlying_ck.get_per_commitment_point(idx);
+ return underlying_base.get_per_commitment_point(idx);
}
@Override
public byte[] release_commitment_secret(long idx) {
- return underlying_ck.release_commitment_secret(idx);
+ return underlying_base.release_commitment_secret(idx);
}
@Override
@Override
public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment(CommitmentTransaction commitment_tx) {
- return underlying_ck.sign_counterparty_commitment(commitment_tx);
+ return underlying_base.sign_counterparty_commitment(commitment_tx);
}
@Override
public Result_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs(HolderCommitmentTransaction holder_commitment_tx) {
- return underlying_ck.sign_holder_commitment_and_htlcs(holder_commitment_tx);
+ return underlying_base.sign_holder_commitment_and_htlcs(holder_commitment_tx);
}
@Override
- public Result_SignatureNoneZ sign_justice_transaction(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc) {
- return underlying_ck.sign_justice_transaction(justice_tx, input, amount, per_commitment_key, htlc);
+ public Result_SignatureNoneZ sign_justice_revoked_output(byte[] justice_tx, long input, long amount, byte[] per_commitment_key) {
+ return underlying_base.sign_justice_revoked_output(justice_tx, input, amount, per_commitment_key);
+ }
+
+ @Override
+ public Result_SignatureNoneZ sign_justice_revoked_htlc(byte[] justice_tx, long input, long amount, byte[] per_commitment_key, HTLCOutputInCommitment htlc) {
+ return underlying_base.sign_justice_revoked_htlc(justice_tx, input, amount, per_commitment_key, htlc);
}
@Override
public Result_SignatureNoneZ sign_counterparty_htlc_transaction(byte[] htlc_tx, long input, long amount, byte[] per_commitment_point, HTLCOutputInCommitment htlc) {
- return underlying_ck.sign_counterparty_htlc_transaction(htlc_tx, input, amount, per_commitment_point, htlc);
+ return underlying_base.sign_counterparty_htlc_transaction(htlc_tx, input, amount, per_commitment_point, htlc);
}
@Override
public Result_SignatureNoneZ sign_closing_transaction(byte[] closing_tx) {
- return underlying_ck.sign_closing_transaction(closing_tx);
+ return underlying_base.sign_closing_transaction(closing_tx);
}
@Override
public Result_SignatureNoneZ sign_channel_announcement(UnsignedChannelAnnouncement msg) {
- return underlying_ck.sign_channel_announcement(msg);
+ return underlying_base.sign_channel_announcement(msg);
}
@Override
public void ready_channel(ChannelTransactionParameters params) {
- underlying_ck.ready_channel(params);
+ underlying_base.ready_channel(params);
}
-
+ };
+ Sign.SignInterface si = new Sign.SignInterface() {
@Override
public byte[] write() {
return underlying_ck.write();
}
- };*/
- //Sign resp = Sign.new_impl(si, underlying_ck.get_pubkeys());
- //must_free_objs.add(new WeakReference<>(si));
- //must_free_objs.add(new WeakReference<>(resp));
+ };
+ Sign resp = Sign.new_impl(si, bsi, underlying_base.get_pubkeys());
+ must_free_objs.add(new WeakReference<>(si));
+ must_free_objs.add(new WeakReference<>(bsi));
+ must_free_objs.add(new WeakReference<>(resp));
+ must_free_objs.add(new WeakReference<>(underlying_base));
must_free_objs.add(new WeakReference<>(underlying_ck));
- //return resp;
- return underlying_ck;
+ return resp;
}
@Override
pending_manager_events.notifyAll();
}
}
- @Override public void persist_manager(byte[] channel_manager_bytes) { }
+ @Override public void persist_manager(byte[] channel_manager_bytes) { assert channel_manager_bytes.length > 1; }
});
this.chan_manager = constructor.channel_manager;
this.peer_manager = constructor.peer_manager;
pending_manager_events.notifyAll();
}
}
- @Override public void persist_manager(byte[] channel_manager_bytes) { }
+ @Override public void persist_manager(byte[] channel_manager_bytes) { assert channel_manager_bytes.length > 1; }
});
this.chan_manager = constructor.channel_manager;
this.peer_manager = constructor.peer_manager;
connect_peers(peer1, peer2);
- Result_NoneAPIErrorZ cc_res = peer1.chan_manager.create_channel(peer2.node_id, 10000, 1000, 42, null);
+ Result_NoneAPIErrorZ cc_res = peer1.chan_manager.create_channel(peer2.node_id, 100000, 1000, 42, null);
assert cc_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK;
Event[] events = peer1.get_manager_events(1, peer1, peer2);
assert events[0] instanceof Event.FundingGenerationReady;
- assert ((Event.FundingGenerationReady) events[0]).channel_value_satoshis == 10000;
+ assert ((Event.FundingGenerationReady) events[0]).channel_value_satoshis == 100000;
assert ((Event.FundingGenerationReady) events[0]).user_channel_id == 42;
byte[] funding_spk = ((Event.FundingGenerationReady) events[0]).output_script;
assert funding_spk.length == 34 && funding_spk[0] == 0 && funding_spk[1] == 32; // P2WSH
funding.addInput(new TransactionInput(bitcoinj_net, funding, new byte[0]));
funding.getInputs().get(0).setWitness(new TransactionWitness(2)); // Make sure we don't complain about lack of witness
funding.getInput(0).getWitness().setPush(0, new byte[]{0x1});
- funding.addOutput(Coin.SATOSHI.multiply(10000), new Script(funding_spk));
+ funding.addOutput(Coin.SATOSHI.multiply(100000), new Script(funding_spk));
Result_NoneAPIErrorZ funding_res = peer1.chan_manager.funding_transaction_generated(chan_id, funding.bitcoinSerialize());
assert funding_res instanceof Result_NoneAPIErrorZ.Result_NoneAPIErrorZ_OK;
ChannelDetails[] peer2_chans = peer2.chan_manager.list_usable_channels();
assert peer1_chans.length == 1;
assert peer2_chans.length == 1;
- assert peer1_chans[0].get_channel_value_satoshis() == 10000;
+ assert peer1_chans[0].get_channel_value_satoshis() == 100000;
assert peer1_chans[0].get_is_usable();
Option_u64Z short_chan_id = peer1_chans[0].get_short_channel_id();
assert short_chan_id instanceof Option_u64Z.Some;
Route route;
try (LockedNetworkGraph netgraph = peer1.router.read_locked_graph()) {
NetworkGraph graph = netgraph.graph();
- Result_RouteLightningErrorZ route_res = UtilMethods.get_route(peer1.chan_manager.get_our_node_id(), graph, peer2.node_id, invoice_features, peer1_chans, route_hints, 1000000, 42, peer1.logger);
+ Result_RouteLightningErrorZ route_res = UtilMethods.get_route(peer1.chan_manager.get_our_node_id(), graph, peer2.node_id, invoice_features, peer1_chans, route_hints, 10000000, 42, peer1.logger);
assert route_res instanceof Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK;
route = ((Result_RouteLightningErrorZ.Result_RouteLightningErrorZ_OK) route_res).res;
}
assert broadcastable_event.length == 1;
assert broadcastable_event[0] instanceof Event.SpendableOutputs;
if (state.peer2.explicit_keys_manager != null) {
- Result_TransactionNoneZ tx_res = state.peer2.explicit_keys_manager.spend_spendable_outputs(((Event.SpendableOutputs) broadcastable_event[0]).outputs, new TxOut[0], new byte[] {0x00}, 253);
+ TxOut[] additional_outputs = new TxOut[] { new TxOut(420, new byte[] { 0x42 }) };
+ Result_TransactionNoneZ tx_res = state.peer2.explicit_keys_manager.spend_spendable_outputs(((Event.SpendableOutputs) broadcastable_event[0]).outputs, additional_outputs, new byte[] {0x00}, 253);
assert tx_res instanceof Result_TransactionNoneZ.Result_TransactionNoneZ_OK;
Transaction built_tx = new Transaction(bitcoinj_net, ((Result_TransactionNoneZ.Result_TransactionNoneZ_OK) tx_res).res);
- assert built_tx.getOutputs().size() == 1;
- assert Arrays.equals(built_tx.getOutput(0).getScriptBytes(), new byte[]{0x00});
+ assert built_tx.getOutputs().size() == 2;
+ assert Arrays.equals(built_tx.getOutput(1).getScriptBytes(), new byte[]{0x00});
+ assert Arrays.equals(built_tx.getOutput(0).getScriptBytes(), new byte[]{0x42});
+ assert built_tx.getOutput(0).getValue().value == 420;
}
}
projects / ldk-java / blobdiff