Skip to content

Commit e000a08

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #175 from TheBlueMatt/main
0.1.5.0
2 parents 58a0e01 + adb1103 commit e000a08

File tree

10 files changed

+74
-44
lines changed

10 files changed

+74
-44
lines changed

‎c_sharp/bindings.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -773,18 +773,20 @@ static inline int32_t LDKLevel_to_cs(LDKLevel val) {
773773
static inline LDKNetwork LDKNetwork_from_cs(int32_t ord) {
774774
switch (ord) {
775775
case 0: return LDKNetwork_Bitcoin;
776-
case 1: return LDKNetwork_Testnet;
777-
case 2: return LDKNetwork_Regtest;
778-
case 3: return LDKNetwork_Signet;
776+
case 1: return LDKNetwork_Testnet3;
777+
case 2: return LDKNetwork_Testnet4;
778+
case 3: return LDKNetwork_Regtest;
779+
case 4: return LDKNetwork_Signet;
779780
default: abort();
780781
}
781782
}
782783
static inline int32_t LDKNetwork_to_cs(LDKNetwork val) {
783784
switch (val) {
784785
case LDKNetwork_Bitcoin: return 0;
785-
case LDKNetwork_Testnet: return 1;
786-
case LDKNetwork_Regtest: return 2;
787-
case LDKNetwork_Signet: return 3;
786+
case LDKNetwork_Testnet3: return 1;
787+
case LDKNetwork_Testnet4: return 2;
788+
case LDKNetwork_Regtest: return 3;
789+
case LDKNetwork_Signet: return 4;
788790
default: abort();
789791
}
790792
}

‎c_sharp/bindings.c.body‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -769,18 +769,20 @@ static inline int32_t LDKLevel_to_cs(LDKLevel val) {
769769
static inline LDKNetwork LDKNetwork_from_cs(int32_t ord) {
770770
switch (ord) {
771771
case 0: return LDKNetwork_Bitcoin;
772-
case 1: return LDKNetwork_Testnet;
773-
case 2: return LDKNetwork_Regtest;
774-
case 3: return LDKNetwork_Signet;
772+
case 1: return LDKNetwork_Testnet3;
773+
case 2: return LDKNetwork_Testnet4;
774+
case 3: return LDKNetwork_Regtest;
775+
case 4: return LDKNetwork_Signet;
775776
default: abort();
776777
}
777778
}
778779
static inline int32_t LDKNetwork_to_cs(LDKNetwork val) {
779780
switch (val) {
780781
case LDKNetwork_Bitcoin: return 0;
781-
case LDKNetwork_Testnet: return 1;
782-
case LDKNetwork_Regtest: return 2;
783-
case LDKNetwork_Signet: return 3;
782+
case LDKNetwork_Testnet3: return 1;
783+
case LDKNetwork_Testnet4: return 2;
784+
case LDKNetwork_Regtest: return 3;
785+
case LDKNetwork_Signet: return 4;
784786
default: abort();
785787
}
786788
}

‎c_sharp/src/org/ldk/enums/Network.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ public enum Network {
99
/**
1010
* The testnet3 blockchain.
1111
*/
12-
LDKNetwork_Testnet,
12+
LDKNetwork_Testnet3,
13+
/**
14+
* The testnet4 blockchain.
15+
*/
16+
LDKNetwork_Testnet4,
1317
/**
1418
* A local test blockchain.
1519
*/

‎src/main/java/org/ldk/enums/Network.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ public enum Network {
1111
/**
1212
* The testnet3 blockchain.
1313
*/
14-
LDKNetwork_Testnet,
14+
LDKNetwork_Testnet3,
15+
/**
16+
* The testnet4 blockchain.
17+
*/
18+
LDKNetwork_Testnet4,
1519
/**
1620
* A local test blockchain.
1721
*/

‎src/main/jni/bindings.c‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,25 +1339,29 @@ static inline LDKNetwork LDKNetwork_from_java(JNIEnv *env, jclass clz) {
13391339
}
13401340
switch (ord) {
13411341
case 0: return LDKNetwork_Bitcoin;
1342-
case 1: return LDKNetwork_Testnet;
1343-
case 2: return LDKNetwork_Regtest;
1344-
case 3: return LDKNetwork_Signet;
1342+
case 1: return LDKNetwork_Testnet3;
1343+
case 2: return LDKNetwork_Testnet4;
1344+
case 3: return LDKNetwork_Regtest;
1345+
case 4: return LDKNetwork_Signet;
13451346
}
13461347
(*env)->FatalError(env, "A call to Network.ordinal() from rust returned an invalid value.");
13471348
abort(); // Unreachable, but will let the compiler know we don't return here
13481349
}
13491350
static jclass Network_class = NULL;
13501351
static jfieldID Network_LDKNetwork_Bitcoin = NULL;
1351-
static jfieldID Network_LDKNetwork_Testnet = NULL;
1352+
static jfieldID Network_LDKNetwork_Testnet3 = NULL;
1353+
static jfieldID Network_LDKNetwork_Testnet4 = NULL;
13521354
static jfieldID Network_LDKNetwork_Regtest = NULL;
13531355
static jfieldID Network_LDKNetwork_Signet = NULL;
13541356
JNIEXPORT void JNICALL Java_org_ldk_enums_Network_init (JNIEnv *env, jclass clz) {
13551357
Network_class = (*env)->NewGlobalRef(env, clz);
13561358
CHECK(Network_class != NULL);
13571359
Network_LDKNetwork_Bitcoin = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Bitcoin", "Lorg/ldk/enums/Network;");
13581360
CHECK(Network_LDKNetwork_Bitcoin != NULL);
1359-
Network_LDKNetwork_Testnet = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet", "Lorg/ldk/enums/Network;");
1360-
CHECK(Network_LDKNetwork_Testnet != NULL);
1361+
Network_LDKNetwork_Testnet3 = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet3", "Lorg/ldk/enums/Network;");
1362+
CHECK(Network_LDKNetwork_Testnet3 != NULL);
1363+
Network_LDKNetwork_Testnet4 = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Testnet4", "Lorg/ldk/enums/Network;");
1364+
CHECK(Network_LDKNetwork_Testnet4 != NULL);
13611365
Network_LDKNetwork_Regtest = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Regtest", "Lorg/ldk/enums/Network;");
13621366
CHECK(Network_LDKNetwork_Regtest != NULL);
13631367
Network_LDKNetwork_Signet = (*env)->GetStaticFieldID(env, Network_class, "LDKNetwork_Signet", "Lorg/ldk/enums/Network;");
@@ -1367,8 +1371,10 @@ static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) {
13671371
switch (val) {
13681372
case LDKNetwork_Bitcoin:
13691373
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Bitcoin);
1370-
case LDKNetwork_Testnet:
1371-
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet);
1374+
case LDKNetwork_Testnet3:
1375+
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet3);
1376+
case LDKNetwork_Testnet4:
1377+
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet4);
13721378
case LDKNetwork_Regtest:
13731379
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Regtest);
13741380
case LDKNetwork_Signet:

‎src/main/jni/bindings.c.body‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,16 +1335,18 @@ static inline LDKNetwork LDKNetwork_from_java(JNIEnv *env, jclass clz) {
13351335
}
13361336
switch (ord) {
13371337
case 0: return LDKNetwork_Bitcoin;
1338-
case 1: return LDKNetwork_Testnet;
1339-
case 2: return LDKNetwork_Regtest;
1340-
case 3: return LDKNetwork_Signet;
1338+
case 1: return LDKNetwork_Testnet3;
1339+
case 2: return LDKNetwork_Testnet4;
1340+
case 3: return LDKNetwork_Regtest;
1341+
case 4: return LDKNetwork_Signet;
13411342
}
13421343
(*env)->FatalError(env, "A call to Network.ordinal() from rust returned an invalid value.");
13431344
abort(); // Unreachable, but will let the compiler know we don't return here
13441345
}
13451346
static jclass Network_class = NULL;
13461347
static jfieldID Network_LDKNetwork_Bitcoin = NULL;
1347-
static jfieldID Network_LDKNetwork_Testnet = NULL;
1348+
static jfieldID Network_LDKNetwork_Testnet3 = NULL;
1349+
static jfieldID Network_LDKNetwork_Testnet4 = NULL;
13481350
static jfieldID Network_LDKNetwork_Regtest = NULL;
13491351
static jfieldID Network_LDKNetwork_Signet = NULL;
13501352
JNIEXPORT void JNICALL Java_org_ldk_enums_Network_init (JNIEnv *env, jclass clz) {
@@ -1363,8 +1365,10 @@ static inline jclass LDKNetwork_to_java(JNIEnv *env, LDKNetwork val) {
13631365
switch (val) {
13641366
case LDKNetwork_Bitcoin:
13651367
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Bitcoin);
1366-
case LDKNetwork_Testnet:
1367-
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet);
1368+
case LDKNetwork_Testnet3:
1369+
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet3);
1370+
case LDKNetwork_Testnet4:
1371+
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Testnet4);
13681372
case LDKNetwork_Regtest:
13691373
return (*env)->GetStaticObjectField(env, Network_class, Network_LDKNetwork_Regtest);
13701374
case LDKNetwork_Signet:

‎ts/bindings.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -566,18 +566,20 @@ static inline int32_t LDKLevel_to_js(LDKLevel val) {
566566
static inline LDKNetwork LDKNetwork_from_js(int32_t ord) {
567567
switch (ord) {
568568
case 0: return LDKNetwork_Bitcoin;
569-
case 1: return LDKNetwork_Testnet;
570-
case 2: return LDKNetwork_Regtest;
571-
case 3: return LDKNetwork_Signet;
569+
case 1: return LDKNetwork_Testnet3;
570+
case 2: return LDKNetwork_Testnet4;
571+
case 3: return LDKNetwork_Regtest;
572+
case 4: return LDKNetwork_Signet;
572573
}
573574
abort();
574575
}
575576
static inline int32_t LDKNetwork_to_js(LDKNetwork val) {
576577
switch (val) {
577578
case LDKNetwork_Bitcoin: return 0;
578-
case LDKNetwork_Testnet: return 1;
579-
case LDKNetwork_Regtest: return 2;
580-
case LDKNetwork_Signet: return 3;
579+
case LDKNetwork_Testnet3: return 1;
580+
case LDKNetwork_Testnet4: return 2;
581+
case LDKNetwork_Regtest: return 3;
582+
case LDKNetwork_Signet: return 4;
581583
default: abort();
582584
}
583585
}

‎ts/bindings.c.body‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -564,18 +564,20 @@ static inline int32_t LDKLevel_to_js(LDKLevel val) {
564564
static inline LDKNetwork LDKNetwork_from_js(int32_t ord) {
565565
switch (ord) {
566566
case 0: return LDKNetwork_Bitcoin;
567-
case 1: return LDKNetwork_Testnet;
568-
case 2: return LDKNetwork_Regtest;
569-
case 3: return LDKNetwork_Signet;
567+
case 1: return LDKNetwork_Testnet3;
568+
case 2: return LDKNetwork_Testnet4;
569+
case 3: return LDKNetwork_Regtest;
570+
case 4: return LDKNetwork_Signet;
570571
}
571572
abort();
572573
}
573574
static inline int32_t LDKNetwork_to_js(LDKNetwork val) {
574575
switch (val) {
575576
case LDKNetwork_Bitcoin: return 0;
576-
case LDKNetwork_Testnet: return 1;
577-
case LDKNetwork_Regtest: return 2;
578-
case LDKNetwork_Signet: return 3;
577+
case LDKNetwork_Testnet3: return 1;
578+
case LDKNetwork_Testnet4: return 2;
579+
case LDKNetwork_Regtest: return 3;
580+
case LDKNetwork_Signet: return 4;
579581
default: abort();
580582
}
581583
}

‎ts/bindings.mts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1056,7 +1056,11 @@ export enum Network {
10561056
/**
10571057
* The testnet3 blockchain.
10581058
*/
1059-
LDKNetwork_Testnet,
1059+
LDKNetwork_Testnet3,
1060+
/**
1061+
* The testnet4 blockchain.
1062+
*/
1063+
LDKNetwork_Testnet4,
10601064
/**
10611065
* A local test blockchain.
10621066
*/

‎ts/test/tests.mts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ function get_chanman(): Node {
106106
seed_counter++;
107107
const keys_manager = ldk.KeysManager.constructor_new(seed, BigInt(42), 42);
108108

109-
const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger);
109+
const net_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet4, logger);
110110
const scorer = ldk.ProbabilisticScorer.constructor_new(ldk.ProbabilisticScoringDecayParameters.constructor_default(), net_graph, logger);
111111
const lockable_score = ldk.MultiThreadedLockableScore.constructor_new(scorer.as_Score());
112112
const router = ldk.DefaultRouter.constructor_new(net_graph, logger, keys_manager.as_EntropySource(), lockable_score.as_LockableScore(), ldk.ProbabilisticScoringFeeParameters.constructor_default());
113113
const msg_router = ldk.DefaultMessageRouter.constructor_new(net_graph, keys_manager.as_EntropySource());
114114

115115
const config = ldk.UserConfig.constructor_default();
116-
const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet));
116+
const params = ldk.ChainParameters.constructor_new(ldk.Network.LDKNetwork_Testnet4, ldk.BestBlock.constructor_from_network(ldk.Network.LDKNetwork_Testnet4));
117117
const chan_man = ldk.ChannelManager.constructor_new(fee_est, chain_watch, tx_broadcaster!, router.as_Router(),
118118
msg_router.as_MessageRouter(), logger, keys_manager.as_EntropySource(), keys_manager.as_NodeSigner(),
119119
keys_manager.as_SignerProvider(), config, params, 42);
@@ -489,7 +489,7 @@ tests.push(async () => {
489489
console.log(record.get_module_path() + ": " + record.get_args());
490490
}
491491
} as ldk.LoggerInterface);
492-
const network_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet, logger);
492+
const network_graph = ldk.NetworkGraph.constructor_new(ldk.Network.LDKNetwork_Testnet4, logger);
493493
const graph_lock_1 = network_graph.read_only();
494494
graph_lock_1.free();
495495
const graph_lock_2 = network_graph.read_only();

0 commit comments

Comments
 (0)