Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions c_sharp/bindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -773,18 +773,20 @@ static inline int32_t LDKLevel_to_cs(LDKLevel val) {
static inline LDKNetwork LDKNetwork_from_cs(int32_t ord) {
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
default: abort();
}
}
static inline int32_t LDKNetwork_to_cs(LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin: return 0;
case LDKNetwork_Testnet: return 1;
case LDKNetwork_Regtest: return 2;
case LDKNetwork_Signet: return 3;
case LDKNetwork_Testnet3: return 1;
case LDKNetwork_Testnet4: return 2;
case LDKNetwork_Regtest: return 3;
case LDKNetwork_Signet: return 4;
default: abort();
}
}
Expand Down
14 changes: 8 additions & 6 deletions c_sharp/bindings.c.body
Original file line number Diff line number Diff line change
Expand Up @@ -769,18 +769,20 @@ static inline int32_t LDKLevel_to_cs(LDKLevel val) {
static inline LDKNetwork LDKNetwork_from_cs(int32_t ord) {
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
default: abort();
}
}
static inline int32_t LDKNetwork_to_cs(LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin: return 0;
case LDKNetwork_Testnet: return 1;
case LDKNetwork_Regtest: return 2;
case LDKNetwork_Signet: return 3;
case LDKNetwork_Testnet3: return 1;
case LDKNetwork_Testnet4: return 2;
case LDKNetwork_Regtest: return 3;
case LDKNetwork_Signet: return 4;
default: abort();
}
}
Expand Down
6 changes: 5 additions & 1 deletion c_sharp/src/org/ldk/enums/Network.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ public enum Network {
/**
* The testnet3 blockchain.
*/
LDKNetwork_Testnet,
LDKNetwork_Testnet3,
/**
* The testnet4 blockchain.
*/
LDKNetwork_Testnet4,
/**
* A local test blockchain.
*/
Expand Down
6 changes: 5 additions & 1 deletion src/main/java/org/ldk/enums/Network.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ public enum Network {
/**
* The testnet3 blockchain.
*/
LDKNetwork_Testnet,
LDKNetwork_Testnet3,
/**
* The testnet4 blockchain.
*/
LDKNetwork_Testnet4,
/**
* A local test blockchain.
*/
Expand Down
22 changes: 14 additions & 8 deletions src/main/jni/bindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -1339,25 +1339,29 @@ static inline LDKNetwork LDKNetwork_from_java(JNIEnv *env, jclass clz) {
}
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
}
(*env)->FatalError(env, "A call to Network.ordinal() from rust returned an invalid value.");
abort(); // Unreachable, but will let the compiler know we don't return here
}
static jclass Network_class = NULL;
static jfieldID Network_LDKNetwork_Bitcoin = NULL;
static jfieldID Network_LDKNetwork_Testnet = NULL;
static jfieldID Network_LDKNetwork_Testnet3 = NULL;
static jfieldID Network_LDKNetwork_Testnet4 = NULL;
static jfieldID Network_LDKNetwork_Regtest = NULL;
static jfieldID Network_LDKNetwork_Signet = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_Network_init (JNIEnv *env, jclass clz) {
Network_class = (*env)->NewGlobalRef(env, clz);
CHECK(Network_class != NULL);
Network_LDKNetwork_Bitcoin = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Bitcoin", "Lorg/ldk/enums/Network;");
CHECK(Network_LDKNetwork_Bitcoin != NULL);
Network_LDKNetwork_Testnet = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet", "Lorg/ldk/enums/Network;");
CHECK(Network_LDKNetwork_Testnet != NULL);
Network_LDKNetwork_Testnet3 = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet3", "Lorg/ldk/enums/Network;");
CHECK(Network_LDKNetwork_Testnet3 != NULL);
Network_LDKNetwork_Testnet4 = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet4", "Lorg/ldk/enums/Network;");
CHECK(Network_LDKNetwork_Testnet4 != NULL);
Network_LDKNetwork_Regtest = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Regtest", "Lorg/ldk/enums/Network;");
CHECK(Network_LDKNetwork_Regtest != NULL);
Network_LDKNetwork_Signet = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Signet", "Lorg/ldk/enums/Network;");
Expand All @@ -1367,8 +1371,10 @@ static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Bitcoin);
case LDKNetwork_Testnet:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet);
case LDKNetwork_Testnet3:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet3);
case LDKNetwork_Testnet4:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet4);
case LDKNetwork_Regtest:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Regtest);
case LDKNetwork_Signet:
Expand Down
16 changes: 10 additions & 6 deletions src/main/jni/bindings.c.body
Original file line number Diff line number Diff line change
Expand Up @@ -1335,16 +1335,18 @@ static inline LDKNetwork LDKNetwork_from_java(JNIEnv *env, jclass clz) {
}
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
}
(*env)->FatalError(env, "A call to Network.ordinal() from rust returned an invalid value.");
abort(); // Unreachable, but will let the compiler know we don't return here
}
static jclass Network_class = NULL;
static jfieldID Network_LDKNetwork_Bitcoin = NULL;
static jfieldID Network_LDKNetwork_Testnet = NULL;
static jfieldID Network_LDKNetwork_Testnet3 = NULL;
static jfieldID Network_LDKNetwork_Testnet4 = NULL;
static jfieldID Network_LDKNetwork_Regtest = NULL;
static jfieldID Network_LDKNetwork_Signet = NULL;
JNIEXPORT void JNICALL Java_org_ldk_enums_Network_init (JNIEnv *env, jclass clz) {
Expand All @@ -1363,8 +1365,10 @@ static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Bitcoin);
case LDKNetwork_Testnet:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet);
case LDKNetwork_Testnet3:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet3);
case LDKNetwork_Testnet4:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet4);
case LDKNetwork_Regtest:
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Regtest);
case LDKNetwork_Signet:
Expand Down
14 changes: 8 additions & 6 deletions ts/bindings.c
Original file line number Diff line number Diff line change
Expand Up @@ -566,18 +566,20 @@ static inline int32_t LDKLevel_to_js(LDKLevel val) {
static inline LDKNetwork LDKNetwork_from_js(int32_t ord) {
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
}
abort();
}
static inline int32_t LDKNetwork_to_js(LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin: return 0;
case LDKNetwork_Testnet: return 1;
case LDKNetwork_Regtest: return 2;
case LDKNetwork_Signet: return 3;
case LDKNetwork_Testnet3: return 1;
case LDKNetwork_Testnet4: return 2;
case LDKNetwork_Regtest: return 3;
case LDKNetwork_Signet: return 4;
default: abort();
}
}
Expand Down
14 changes: 8 additions & 6 deletions ts/bindings.c.body
Original file line number Diff line number Diff line change
Expand Up @@ -564,18 +564,20 @@ static inline int32_t LDKLevel_to_js(LDKLevel val) {
static inline LDKNetwork LDKNetwork_from_js(int32_t ord) {
switch (ord) {
case 0: return LDKNetwork_Bitcoin;
case 1: return LDKNetwork_Testnet;
case 2: return LDKNetwork_Regtest;
case 3: return LDKNetwork_Signet;
case 1: return LDKNetwork_Testnet3;
case 2: return LDKNetwork_Testnet4;
case 3: return LDKNetwork_Regtest;
case 4: return LDKNetwork_Signet;
}
abort();
}
static inline int32_t LDKNetwork_to_js(LDKNetwork val) {
switch (val) {
case LDKNetwork_Bitcoin: return 0;
case LDKNetwork_Testnet: return 1;
case LDKNetwork_Regtest: return 2;
case LDKNetwork_Signet: return 3;
case LDKNetwork_Testnet3: return 1;
case LDKNetwork_Testnet4: return 2;
case LDKNetwork_Regtest: return 3;
case LDKNetwork_Signet: return 4;
default: abort();
}
}
Expand Down
6 changes: 5 additions & 1 deletion ts/bindings.mts
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,11 @@ export enum Network {
/**
* The testnet3 blockchain.
*/
LDKNetwork_Testnet,
LDKNetwork_Testnet3,
/**
* The testnet4 blockchain.
*/
LDKNetwork_Testnet4,
/**
* A local test blockchain.
*/
Expand Down
6 changes: 3 additions & 3 deletions ts/test/tests.mts
Original file line number Diff line number Diff line change
Expand Up @@ -106,14 +106,14 @@ function get_chanman(): Node {
seed_counter++;
const keys_manager = ldk.KeysManager.constructor_new(seed, BigInt(42), 42);

const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger);
const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet4, logger);
const scorer = ldk.ProbabilisticScorer.constructor_new(ldk.ProbabilisticScoringDecayParameters.constructor_default(), net_graph, logger);
const lockable_score = ldk.MultiThreadedLockableScore.constructor_new(scorer.as_Score());
const router = ldk.DefaultRouter.constructor_new(net_graph, logger, keys_manager.as_EntropySource(), lockable_score.as_LockableScore(), ldk.ProbabilisticScoringFeeParameters.constructor_default());
const msg_router = ldk.DefaultMessageRouter.constructor_new(net_graph, keys_manager.as_EntropySource());

const config = ldk.UserConfig.constructor_default();
const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet));
const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet4, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet4));
const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, router.as_Router(),
msg_router.as_MessageRouter(), logger, keys_manager.as_EntropySource(), keys_manager.as_NodeSigner(),
keys_manager.as_SignerProvider(), config, params, 42);
Expand Down Expand Up @@ -489,7 +489,7 @@ tests.push(async () => {
console.log(record.get_module_path() + ": " + record.get_args());
}
} as ldk.LoggerInterface);
const network_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger);
const network_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet4, logger);
const graph_lock_1 = network_graph.read_only();
graph_lock_1.free();
const graph_lock_2 = network_graph.read_only();
Expand Down
Loading