Merge pull request #127 from TheBlueMatt/main

Add missing `UtilMethods` export and sanity-test node-net setups

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e3a25ff437cb4914d2b471d97367666f6e8e22c..d612a3dbe1aa24ca4dbd9d02f9ccf9da9226120e 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -358,10 +358,6 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
-      - name: Temporarily use rustc from yesterday
-        run: |
-          rustup install 1.67.1
-          rustup default 1.67.1
       - name: Fetch upstream LLVM/clang snapshot
         run: |
           git config --global safe.directory '*'

diff --git a/node-net/net.mts b/node-net/net.mts
index 797bc7a7a47907920d9b00039d643cd82cd21133..9e16ab32601da75ded82e13e98d505ee9f27fac5 100644 (file)
--- a/node-net/net.mts
+++ b/node-net/net.mts
@@ -8,6 +8,12 @@ export class NodeLDKNet {
        private ping_timer;
        private servers: net.Server[];
        public constructor(public peer_manager: ldk.PeerManager) {
+               // @ts-ignore
+               if (peer_manager._node_ldk_net_singleton_check != undefined) {
+                       throw "Only one NdoeLDKNet should exist per PeerManager";
+               }
+               // @ts-ignore
+               peer_manager._node_ldk_net_singleton_check = this;
                this.ping_timer = setInterval(function() {
                        peer_manager.timer_tick_occurred();
                        peer_manager.process_events();
@@ -24,6 +30,8 @@ export class NodeLDKNet {
                        server.close();
                }
                this.peer_manager.disconnect_all_peers();
+               // @ts-ignore
+               delete this.peer_manager._node_ldk_net_singleton_check;
        }
 
        /**

diff --git a/ts/index.mts b/ts/index.mts
index 3f9dbca2366f9ed59caf46721090b0a0abf54682..8d58c6fac11318aec1f023ee148a35cead77ac2a 100644 (file)
--- a/ts/index.mts
+++ b/ts/index.mts
@@ -8,6 +8,7 @@ export async function initializeWasmFromBinary(bin: Uint8Array) {
        await initializeWasmFromUint8Array(bin);
 }
 
+export * from './structs/UtilMethods.mjs';
 export * from './structs/TxOut.mjs';
 export * from './structs/BigEndianScalar.mjs';
 export * from './enums/COption_NoneZ.mjs';

diff --git a/typescript_strings.py b/typescript_strings.py
index 59b1e40211548d566e4ef3995e75f076b7fc6501..5d5eb814c79ac28e95381e42f3608a8571af60a5 100644 (file)
--- a/typescript_strings.py
+++ b/typescript_strings.py
@@ -361,6 +361,7 @@ export async function initializeWasmFromBinary(bin: Uint8Array) {
        await initializeWasmFromUint8Array(bin);
 }
 
+export * from './structs/UtilMethods.mjs';
 """)
 
         self.bindings_version_file = """export function get_ldk_java_bindings_version(): String {