From 1c61f150b1c8c8289cc7bb7baa87ea946c09c7a6 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 3 Nov 2023 12:07:43 -0700 Subject: [PATCH] fix(v1 relays): Discerning between v1 and v2 circuit relays --- config/env/common.js | 10 ++++++- package-lock.json | 14 ++++----- package.json | 2 +- src/adapters/ipfs/ipfs-coord.js | 3 +- src/adapters/ipfs/ipfs.js | 52 ++++++++++++++++----------------- 5 files changed, 44 insertions(+), 37 deletions(-) diff --git a/config/env/common.js b/config/env/common.js index 1f2e65f..0e42093 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -95,5 +95,13 @@ export default { ? parseInt(process.env.IPFS_API_PORT) : 5001, - chatPubSubChan: 'psf-ipfs-chat-001' + chatPubSubChan: 'psf-ipfs-chat-001', + + v1Relays: [ + // v1 & v2 Circuit Relay (Token Tiger) + '/ip4/137.184.93.145/tcp/6002/p2p/12D3KooWBTkiEn4fSGYRMtNT2ZTKhjguymGFHjiJeVVPSwEjXJwq', + + // v1 & v2 Circuit Relay server (FullStack.cash) + '/ip4/78.46.129.7/tcp/4002/p2p/12D3KooWR8URLT2d85MSKMUAHB2poADNz1jbrsGNL1GAjA1cZtTY' + ] } diff --git a/package-lock.json b/package-lock.json index ed99e02..23c5861 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "datastore-fs": "9.1.5", "glob": "7.1.6", "helia": "2.0.3", - "helia-coord": "1.2.0", + "helia-coord": "1.2.2", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1", "jwt-bch-lib": "1.3.0", @@ -8451,9 +8451,9 @@ } }, "node_modules/helia-coord": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.0.tgz", - "integrity": "sha512-7tDzTvB8jgfwctLi+vaNGuKDwNX7Jtn6HPcZDIH91SNVm8gSe8oYJ5dYUXi+t0dHEeQdVeNsJVQtx8pYMjzyog==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.2.tgz", + "integrity": "sha512-klV/8IWso2V7uvcs0Pm3w4WPmP5ZKfCFHqLE1Jrun4j0aTLgxeFqLWjFgwKSdLCKXYoa/c8c4BJ+16+/pDwqyg==", "dependencies": { "@chris.troutner/retry-queue": "1.0.8", "@multiformats/multiaddr": "12.1.8", @@ -25797,9 +25797,9 @@ } }, "helia-coord": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.0.tgz", - "integrity": "sha512-7tDzTvB8jgfwctLi+vaNGuKDwNX7Jtn6HPcZDIH91SNVm8gSe8oYJ5dYUXi+t0dHEeQdVeNsJVQtx8pYMjzyog==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.2.tgz", + "integrity": "sha512-klV/8IWso2V7uvcs0Pm3w4WPmP5ZKfCFHqLE1Jrun4j0aTLgxeFqLWjFgwKSdLCKXYoa/c8c4BJ+16+/pDwqyg==", "requires": { "@chris.troutner/retry-queue": "1.0.8", "@multiformats/multiaddr": "12.1.8", diff --git a/package.json b/package.json index 618da1e..c011851 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "datastore-fs": "9.1.5", "glob": "7.1.6", "helia": "2.0.3", - "helia-coord": "1.2.0", + "helia-coord": "1.2.2", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1", "jwt-bch-lib": "1.3.0", diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js index e7341b6..833f618 100644 --- a/src/adapters/ipfs/ipfs-coord.js +++ b/src/adapters/ipfs/ipfs-coord.js @@ -78,7 +78,8 @@ class IpfsCoordAdapter { circuitRelayInfo, apiInfo: this.config.apiInfo, announceJsonLd: this.config.announceJsonLd, - debugLevel: this.config.debugLevel + debugLevel: this.config.debugLevel, + v1Relays: this.config.v1Relays } // Production env uses external go-ipfs node. diff --git a/src/adapters/ipfs/ipfs.js b/src/adapters/ipfs/ipfs.js index 297f2da..7098166 100644 --- a/src/adapters/ipfs/ipfs.js +++ b/src/adapters/ipfs/ipfs.js @@ -108,6 +108,30 @@ class IpfsAdapter { console.log('Helia (IPFS) node IS NOT configured as Circuit Relay') } + let bootstrapList = [ + + // launchpad-p2wdb-service (Launchpad pinning service) + '/ip4/137.184.13.92/tcp/4001/p2p/12D3KooWPpBXhhAeoCZCGuQ3KR4xwHzzvtP57f6zLmo8P7ZFBJFE', + + // PSFoundation.info metrics + '/ip4/5.161.72.148/tcp/4001/p2p/12D3KooWDL1kPixc6hcT4s7teWGufrxXmZFD1kPeGdDrsKgYrFUt', + + // PSFoundation.info P2WDB + '/ip4/5.161.72.148/tcp/4101/p2p/12D3KooWHz1sRB94EEVRQRJvUX9MyRm3xhr4QSyCoJbTdu2AYheq', + + // TokenTiger.com backup P2WDB + '/ip4/161.35.99.207/tcp/4001/p2p/12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu', + + // helia-p2wdb-dev-server-01 prototype P2WDB server using Helia (Token Tiger) + '/ip4/137.184.93.145/tcp/4001/p2p/12D3KooWGZCpD5Ue3CJCBBEKowcuKEgeVKbTM7VMbJ8xm1bqST1j', + + // helia-p2wdb-dev-server-01 prototype P2WDB server using Helia (FullStack.cash) + '/ip4/78.46.129.7/tcp/7001/p2p/12D3KooWRqe7TwTj8apPxmpPqPgHiv7qv5YBJTo1VeQ7zrdyA2HN' + + ] + bootstrapList = bootstrapList.concat(this.config.v1Relays) + // console.log('bootstrapList: ', bootstrapList) + // libp2p is the networking layer that underpins Helia const libp2p = await this.createLibp2p({ datastore, @@ -131,33 +155,7 @@ class IpfsAdapter { ], peerDiscovery: [ bootstrap({ - list: [ - - // launchpad-p2wdb-service (Launchpad pinning service) - '/ip4/137.184.13.92/tcp/4001/p2p/12D3KooWPpBXhhAeoCZCGuQ3KR4xwHzzvtP57f6zLmo8P7ZFBJFE', - - // PSFoundation.info metrics - '/ip4/5.161.72.148/tcp/4001/p2p/12D3KooWDL1kPixc6hcT4s7teWGufrxXmZFD1kPeGdDrsKgYrFUt', - - // PSFoundation.info P2WDB - '/ip4/5.161.72.148/tcp/4101/p2p/12D3KooWHz1sRB94EEVRQRJvUX9MyRm3xhr4QSyCoJbTdu2AYheq', - - // TokenTiger.com backup P2WDB - '/ip4/161.35.99.207/tcp/4001/p2p/12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu', - - // helia-p2wdb-dev-server-01 prototype P2WDB server using Helia (Token Tiger) - '/ip4/137.184.93.145/tcp/4001/p2p/12D3KooWGZCpD5Ue3CJCBBEKowcuKEgeVKbTM7VMbJ8xm1bqST1j', - - // v1 & v2 Circuit Relay (Token Tiger) - '/ip4/137.184.93.145/tcp/6001/p2p/12D3KooWBTkiEn4fSGYRMtNT2ZTKhjguymGFHjiJeVVPSwEjXJwq', - - // v1 & v2 Circuit Relay server (FullStack.cash) - '/ip4/78.46.129.7/tcp/4002/p2p/12D3KooWBigV2M3Sx4KmM3m2DQMznnZzyNuXPawPsZWRpZmiJ8Kp', - - // helia-p2wdb-dev-server-01 prototype P2WDB server using Helia (FullStack.cash) - '/ip4/78.46.129.7/tcp/7001/p2p/12D3KooWBigV2M3Sx4KmM3m2DQMznnZzyNuXPawPsZWRpZmiJ8Kp' - - ] + list: bootstrapList }) ], services