Syncing upstream, fixing merge conflicts

This commit is contained in:
Chris Troutner
2024-04-27 13:21:48 -07:00
4 changed files with 13 additions and 10 deletions
+4 -1
View File
@@ -122,7 +122,10 @@ export default {
'@type': 'Organization', '@type': 'Organization',
name: 'Permissionless Software Foundation', name: 'Permissionless Software Foundation',
url: 'https://PSFoundation.cash' url: 'https://PSFoundation.cash'
} },
// If this node has an IP4 address or domain name used to provide a REST API.
web2Api: process.env.WEB2_API ? process.env.WEB2_API : null
}, },
// IPFS Ports // IPFS Ports
+7 -7
View File
@@ -28,7 +28,7 @@
"datastore-fs": "9.1.6", "datastore-fs": "9.1.6",
"glob": "7.1.6", "glob": "7.1.6",
"helia": "2.1.0", "helia": "2.1.0",
"helia-coord": "1.5.6", "helia-coord": "1.5.7",
"jsonrpc-lite": "2.2.0", "jsonrpc-lite": "2.2.0",
"jsonwebtoken": "8.5.1", "jsonwebtoken": "8.5.1",
"jwt-bch-lib": "1.3.0", "jwt-bch-lib": "1.3.0",
@@ -11597,9 +11597,9 @@
} }
}, },
"node_modules/helia-coord": { "node_modules/helia-coord": {
"version": "1.5.6", "version": "1.5.7",
"resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.5.6.tgz", "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.5.7.tgz",
"integrity": "sha512-sh7rEiw883aPsIMZ4vxbzA6OKQjuhz4vlIRoaNWJruju1mJY4hrn9BFPrtJ96KN054zZ0EwziVdTxD9vPV4bSQ==", "integrity": "sha512-S3untLIDr4A15bUw+dUmLHfqSNmJ9wjqENPzdqHjEP9HSUs7w+CtVNrvY3MSXTD+/nwTtUX5V4NiTdMXdWlBAA==",
"dependencies": { "dependencies": {
"@chris.troutner/retry-queue": "1.0.8", "@chris.troutner/retry-queue": "1.0.8",
"bch-encrypt-lib": "2.1.1", "bch-encrypt-lib": "2.1.1",
@@ -34241,9 +34241,9 @@
} }
}, },
"helia-coord": { "helia-coord": {
"version": "1.5.6", "version": "1.5.7",
"resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.5.6.tgz", "resolved": "https://registry.npmjs.org/helia-coord/-/helia-coord-1.5.7.tgz",
"integrity": "sha512-sh7rEiw883aPsIMZ4vxbzA6OKQjuhz4vlIRoaNWJruju1mJY4hrn9BFPrtJ96KN054zZ0EwziVdTxD9vPV4bSQ==", "integrity": "sha512-S3untLIDr4A15bUw+dUmLHfqSNmJ9wjqENPzdqHjEP9HSUs7w+CtVNrvY3MSXTD+/nwTtUX5V4NiTdMXdWlBAA==",
"requires": { "requires": {
"@chris.troutner/retry-queue": "1.0.8", "@chris.troutner/retry-queue": "1.0.8",
"bch-encrypt-lib": "2.1.1", "bch-encrypt-lib": "2.1.1",
+1 -1
View File
@@ -44,7 +44,7 @@
"datastore-fs": "9.1.6", "datastore-fs": "9.1.6",
"glob": "7.1.6", "glob": "7.1.6",
"helia": "2.1.0", "helia": "2.1.0",
"helia-coord": "1.5.6", "helia-coord": "1.5.7",
"jsonrpc-lite": "2.2.0", "jsonrpc-lite": "2.2.0",
"jsonwebtoken": "8.5.1", "jsonwebtoken": "8.5.1",
"jwt-bch-lib": "1.3.0", "jwt-bch-lib": "1.3.0",
+1 -1
View File
@@ -22,7 +22,7 @@ services:
options: options:
max-size: '10m' max-size: '10m'
max-file: '10' max-file: '10'
#mem_limit: 1500mb mem_limit: 4000mb
links: links:
- mongo-bch-service - mongo-bch-service
ports: ports: