From b473a3803cf32badba6deabb9e6c11e2beea76f0 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 13 Apr 2024 07:02:32 -0700 Subject: [PATCH 1/5] fix(config): Adding web2Api property to jsonLd config --- config/env/common.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/env/common.js b/config/env/common.js index 464357d..87b56e7 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -119,7 +119,10 @@ export default { '@type': 'Organization', name: 'Permissionless Software Foundation', url: 'https://PSFoundation.cash' - } + }, + + // If this node has an IP4 address or domain name used to provide a REST API. + web2Api: null }, // IPFS Ports From a03c5d8c91b707568f0190c3d945397ebb157dc0 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 13 Apr 2024 07:09:45 -0700 Subject: [PATCH 2/5] fix(config): web2Api can be set with env var --- config/env/common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/env/common.js b/config/env/common.js index 87b56e7..2fac04c 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -122,7 +122,7 @@ export default { }, // If this node has an IP4 address or domain name used to provide a REST API. - web2Api: null + web2Api: process.env.WEB2_API ? process.env.WEB2_API : null }, // IPFS Ports From b27136d03bb9eb26790e0751c2c3b789038129ef Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Fri, 26 Apr 2024 14:39:18 -0700 Subject: [PATCH 3/5] fix(Docker): Removing Volume statement --- production/docker/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/production/docker/Dockerfile b/production/docker/Dockerfile index 2a85bce..66ce299 100644 --- a/production/docker/Dockerfile +++ b/production/docker/Dockerfile @@ -66,8 +66,6 @@ RUN npm install # Generate the API docs RUN npm run docs -VOLUME /home/safeuser/keys - # Expose the port the API will be served on. EXPOSE 5010 From a32ed63d472df88d48bffd519abc97202bd2ff4c Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sat, 27 Apr 2024 13:17:57 -0700 Subject: [PATCH 4/5] fix(Docker): Setting memory limit at 4GB --- production/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/production/docker/docker-compose.yml b/production/docker/docker-compose.yml index d4f24fc..f4eb9e6 100644 --- a/production/docker/docker-compose.yml +++ b/production/docker/docker-compose.yml @@ -22,7 +22,7 @@ services: options: max-size: '10m' max-file: '10' - #mem_limit: 500mb + mem_limit: 4000mb links: - mongo-ipfs-service ports: From 70a69e98bb6f4dd0cb4a0bfcb1cdb23754b7fcc1 Mon Sep 17 00:00:00 2001 From: Chris Troutner Date: Sun, 28 Apr 2024 16:53:34 -0700 Subject: [PATCH 5/5] fix(pollForBchServices()): filtering for only wallet-services, not consumers --- src/adapters/ipfs/ipfs-coord.js | 2 +- src/use-cases/ipfs-use-cases.js | 4 ++++ test/unit/mocks/adapters/ipfs-coord-mocks.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/adapters/ipfs/ipfs-coord.js b/src/adapters/ipfs/ipfs-coord.js index 53502a5..dc409e3 100644 --- a/src/adapters/ipfs/ipfs-coord.js +++ b/src/adapters/ipfs/ipfs-coord.js @@ -20,7 +20,7 @@ import config from '../../../config/index.js' // The minimum version of ipfs-bch-wallet-service that this wallet can work with. const MIN_BCH_WALLET_VERSION = '1.11.11' -const WALLET_PROTOCOL = 'bch-wallet' +const WALLET_PROTOCOL = 'bch-wallet-service' const MIN_P2WDB_VERSION = '1.4.0' const P2WDB_PROTOCOL = 'p2wdb' const MIN_FILE_PIN_VERSION = '1.0.0' diff --git a/src/use-cases/ipfs-use-cases.js b/src/use-cases/ipfs-use-cases.js index 3670070..46f0e1e 100644 --- a/src/use-cases/ipfs-use-cases.js +++ b/src/use-cases/ipfs-use-cases.js @@ -96,6 +96,10 @@ class IpfsUseCases { const metadata = await ipfsFiles.getFileMetadata({ cid }) console.log('getCidMetadata() metadata: ', metadata) + if (metadata.success === false) { + throw new Error(metadata.message) + } + const filename = metadata.fileMetadata.filename return filename diff --git a/test/unit/mocks/adapters/ipfs-coord-mocks.js b/test/unit/mocks/adapters/ipfs-coord-mocks.js index ff89baa..f381abd 100644 --- a/test/unit/mocks/adapters/ipfs-coord-mocks.js +++ b/test/unit/mocks/adapters/ipfs-coord-mocks.js @@ -47,7 +47,7 @@ const peerData = [ '@type': 'WebAPI', name: 'trout-bch-wallet-service-dev', version: '1.11.12', - protocol: 'bch-wallet', + protocol: 'bch-wallet-service', description: 'IPFS service providing BCH blockchain access needed by a wallet.', documentation: 'https://ipfs-bch-wallet-service.fullstack.cash/',