Merge pull request #52 from Permissionless-Software-Foundation/ct-unstable

several little tweeks

config/env/common.js

@@ -113,5 +113,8 @@ export default {
     ? parseInt(process.env.IPFS_API_PORT)
     : 5001,
 
-  chatPubSubChan: 'psf-ipfs-chat-001'
+  chatPubSubChan: 'psf-ipfs-chat-001',
+
+  // IPFS gateway
+  ipfsGateway: process.env.IPFS_GATEWAY ? process.env.IPFS_GATEWAY : 'https://p2wdb-gateway.fullstack.cash/ipfs/'
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bch-dex",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "A DEX on BCH for trading SLP tokens.",
   "main": "index.js",
   "type": "module",

production/rpi-docker/bch-dex/start-production.sh

@@ -24,7 +24,7 @@ export DBURL=mongodb://172.17.0.1:5666/bch-swap-service-prod
 export PORT=5700
 
 # bch-dex specific env vars
-export BCH_DEX=production
+export BCH_DEX=prod
 export WEBHOOKSERVICE=http://172.17.0.1:5667/webhook
 export WEBHOOKTARGET=http://172.17.0.1:5700/p2wdb
 export APP_ID=bch-dex-001

production/rpi-docker/docker-compose.yml

@@ -43,7 +43,7 @@ services:
     #build:
     #  context: ./p2wdb/
     #  dockerfile: Dockerfile
-    image: christroutner/p2wdb-rpi:v3.1.5
+    image: christroutner/p2wdb-rpi:v3.1.8
     container_name: p2wdb
     environment:
       CONSUMER_URL: 'https://wa-usa-bch-consumer.fullstackcash.nl'
@@ -70,7 +70,7 @@ services:
     #build:
     # context: ./bch-dex/
     # dockerfile: Dockerfile
-    image: christroutner/bch-dex-rpi:v1.13.0
+    image: christroutner/bch-dex-rpi:v2.0.0
     container_name: bch-dex
     environment:
       #CONSUMER_URL: 'https://free-bch.fullstack.cash'

production/scripts/create-order.js

@@ -6,7 +6,7 @@
   the DEX app wallet in order to be acceped.
 */
 
-const axios = require('axios')
+import axios from 'axios'
 
 const LOCALHOST = 'http://localhost:5700'
 // const LOCALHOST = 'http://172.17.0.1:5700'

production/scripts/create-wallet.js

@@ -3,8 +3,9 @@
 */
 
 // Public NPM libraries
-const BchWallet = require('minimal-slp-wallet/index')
-const fs = require('fs').promises
+import BchWallet from 'minimal-slp-wallet/index'
+
+import { promises as fs } from 'fs'
 
 async function createWallet () {
   try {

production/scripts/sweep-nfts.js

@@ -5,10 +5,10 @@
 */
 
 // Global npm libraries
-const BchWallet = require('minimal-slp-wallet/index')
+import BchWallet from 'minimal-slp-wallet/index.js'
 
 // Local libraries
-const WalletAdapter = require('../../src/adapters/wallet')
+import WalletAdapter from '../../src/adapters/wallet.js'
 
 // Constants
 const EMTPY_ADDR_CUTOFF = 10

production/scripts/sweep-wallet.js

@@ -8,10 +8,10 @@
 
 // Public npm libraries
 // const BCHJS = require('@psf/bch-js')
-const BchTokenSweep = require('bch-token-sweep/index')
+import BchTokenSweep from 'bch-token-sweep/index.js'
 
 // Local libraries
-const WalletAdapter = require('../../src/adapters/wallet')
+import WalletAdapter from '../../src/adapters/wallet.js'
 
 // Constants
 const EMTPY_ADDR_CUTOFF = 10

src/use-cases/offer/index.js

@@ -18,7 +18,6 @@ import axios from 'axios'
 
 // Local libraries
 import OfferEntity from '../../entities/offer.js'
-
 import config from '../../../config/index.js'
 
 const DEFAULT_ENTRIES_PER_PAGE = 20
@@ -132,7 +131,8 @@ class OfferUseCases {
       const cid = mutableCid.substring(7)
 
       // Retrieve the mutable data from Filecoin/IPFS.
-      const url = `https://${cid}.ipfs.w3s.link/data.json`
+      // const url = `https://${cid}.ipfs.w3s.link/data.json`
+      const url = `${this.config.ipfsGateway}${cid}/data.json`
       const result = await axios.get(url)
       const mutableData = result.data
       console.log(`mutableData: ${JSON.stringify(mutableData, null, 2)}`)