diff --git a/config/env/common.js b/config/env/common.js index 3eedd6f..e67decb 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -97,11 +97,12 @@ export default { chatPubSubChan: 'psf-ipfs-chat-001', + // This can add specific Circuit Relay v2 servers to connect to. bootstrapRelays: [ // v2 Circuit Relay (Token Tiger) - '/ip4/137.184.93.145/tcp/8001/p2p/12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g', + // '/ip4/137.184.93.145/tcp/8001/p2p/12D3KooWGMEKkdJfyZbwdH9EafZbRTtMn7FnhWPrE4MhRty2763g', // v2 Circuit Relay server (FullStack.cash) - '/ip4/78.46.129.7/tcp/4001/p2p/12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL' + // '/ip4/78.46.129.7/tcp/4001/p2p/12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL' ] } diff --git a/package-lock.json b/package-lock.json index 57ecd10..edcbc8d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,7 +20,7 @@ "datastore-fs": "9.1.5", "glob": "7.1.6", "helia": "2.1.0", - "helia-coord": "1.2.18", + "helia-coord": "1.2.20", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1", "jwt-bch-lib": "1.3.0", @@ -7106,9 +7106,9 @@ } }, "node_modules/helia-coord": { - "version": "1.2.18", - "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.18.tgz", - "integrity": "sha512-w7bdrVXW9vkmURRc8N4AF58gUToW+m5lbtqdCxANKDU4aE7POsCVvTWDLZJrYCEHjrVtbb7fJSVfcMvTNWetkQ==", + "version": "1.2.20", + "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.20.tgz", + "integrity": "sha512-HaUJ3w5WfmijN+745D9z9RlE793KvwczB1vttrvmdvaHr0EzyhEJ8EY24YQaoLoPgs4w6pnHqMwAxabGmQuH4A==", "dependencies": { "@chris.troutner/retry-queue": "1.0.8", "@multiformats/multiaddr": "12.1.8", @@ -23066,9 +23066,9 @@ } }, "helia-coord": { - "version": "1.2.18", - "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.18.tgz", - "integrity": "sha512-w7bdrVXW9vkmURRc8N4AF58gUToW+m5lbtqdCxANKDU4aE7POsCVvTWDLZJrYCEHjrVtbb7fJSVfcMvTNWetkQ==", + "version": "1.2.20", + "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.2.20.tgz", + "integrity": "sha512-HaUJ3w5WfmijN+745D9z9RlE793KvwczB1vttrvmdvaHr0EzyhEJ8EY24YQaoLoPgs4w6pnHqMwAxabGmQuH4A==", "requires": { "@chris.troutner/retry-queue": "1.0.8", "@multiformats/multiaddr": "12.1.8", diff --git a/package.json b/package.json index 1a9f907..433789e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "datastore-fs": "9.1.5", "glob": "7.1.6", "helia": "2.1.0", - "helia-coord": "1.2.18", + "helia-coord": "1.2.20", "jsonrpc-lite": "2.2.0", "jsonwebtoken": "8.5.1", "jwt-bch-lib": "1.3.0", diff --git a/src/adapters/ipfs/ipfs.js b/src/adapters/ipfs/ipfs.js index 51f242a..b36c8b8 100644 --- a/src/adapters/ipfs/ipfs.js +++ b/src/adapters/ipfs/ipfs.js @@ -17,7 +17,7 @@ import { createLibp2p } from 'libp2p' import { tcp } from '@libp2p/tcp' import { noise } from '@chainsafe/libp2p-noise' import { yamux } from '@chainsafe/libp2p-yamux' -import { bootstrap } from '@libp2p/bootstrap' +// import { bootstrap } from '@libp2p/bootstrap' import { identifyService } from 'libp2p/identify' import { circuitRelayServer, circuitRelayTransport } from 'libp2p/circuit-relay' import { gossipsub } from '@chainsafe/libp2p-gossipsub' @@ -120,27 +120,27 @@ 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.bootstrapRelays) + // const 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.bootstrapRelays) // console.log('bootstrapList: ', bootstrapList) // libp2p is the networking layer that underpins Helia @@ -166,11 +166,11 @@ class IpfsAdapter { streamMuxers: [ yamux() ], - peerDiscovery: [ - bootstrap({ - list: bootstrapList - }) - ], + // peerDiscovery: [ + // bootstrap({ + // list: bootstrapList + // }) + // ], services })