Customizing for temp demo

.gitignore

@@ -69,9 +69,5 @@ ipfs-service-provider.sh
 run-dev.sh
 wallet.json
 data/
-run-dev.sh
-*.zip
 
 !README.md
-
-wallet.json

CONTRIBUTING.md

@@ -1,93 +0,0 @@
-# Permissionless Software Foundation Community Contributing Guide 1.0
-
-This document describes a very simple process suitable for most projects under
-the PSF umbrella. It is based on [this Medium article](https://medium.com/the-node-js-collection/healthy-open-source-967fa8be7951) and the [Node.js Community Contribution Guide](https://github.com/nodejs/TSC/blob/master/BasePolicies/CONTRIBUTING.md).
-Projects are encouraged to adopt this whether they
-are hosted under the PSF or not.
-
-The goal of this document is to create a contribution process that:
-
-* Encourages new contributions.
-* Encourages contributors to remain involved.
-* Avoids unnecessary processes and bureaucracy whenever possible.
-* Creates a transparent decision making process which makes it clear how
-contributors can be involved in decision making.
-
-This document is based on much prior art in the Node.js community, io.js,
-and the Node.js project.
-
-Additional guidance can be found at the [Permissionless Software Foundation Telegram Channel](https://t.me/permissionless_software).
-
-## Vocabulary
-
-* A **Contributor** is any individual creating or commenting on an issue or pull request.
-* A **Committer** is a subset of contributors who have been given write access to the repository.
-* A **TC (Technical Committee)** is a group of committers representing the required technical
-expertise to resolve rare disputes.
-
-# Logging Issues
-
-Log an issue for any question or problem you might have. When in doubt, log an issue,
-any additional policies about what to include will be provided in the responses. The only
-exception is security disclosures which should be sent privately.
-
-Committers may direct you to another repository, ask for additional clarifications, and
-add appropriate metadata before the issue is addressed.
-
-Please be courteous, respectful, and every participant is expected to follow the
-project's Code of Conduct.
-
-# Contributions
-
-Any change to resources in this repository must be through pull requests. This applies to all changes
-to documentation, code, binary files, etc. Even long term committers and TC members must use
-pull requests.
-
-No pull request can be merged without being reviewed.
-
-For non-trivial contributions, pull requests should sit for at least 36 hours to ensure that
-contributors in other timezones have time to review. Consideration should also be given to
-weekends and other holiday periods to ensure active committers all have reasonable time to
-become involved in the discussion and review process if they wish.
-
-The default for each contribution is that it is accepted once no committer has an objection.
-During review committers may also request that a specific contributor who is most versed in a
-particular area gives a "LGTM" before the PR can be merged. There is no additional "sign off"
-process for contributions to land. Once all issues brought by committers are addressed it can
-be landed by any committer.
-
-In the case of an objection being raised in a pull request by another committer, all involved
-committers should seek to arrive at a consensus by way of addressing concerns being expressed
-by discussion, compromise on the proposed change, or withdrawal of the proposed change.
-
-If a contribution is controversial and committers cannot agree about how to get it to land
-or if it should land then it should be escalated to the TC. TC members should regularly
-discuss pending contributions in order to find a resolution. It is expected that only a
-small minority of issues be brought to the TC for resolution and that discussion and
-compromise among committers be the default resolution mechanism.
-
-# Becoming a Committer
-
-All contributors who land a non-trivial contribution should be on-boarded in a timely manner,
-and added as a committer, and be given write access to the repository.
-
-Committers are expected to follow this policy and continue to send pull requests, go through
-proper review, and have other committers merge their pull requests.
-
-# TC Process
-
-The TC uses a "consensus seeking" process for issues that are escalated to the TC.
-The group tries to find a resolution that has no open objections among TC members.
-If a consensus cannot be reached that has no objections then a majority wins vote
-is called. It is also expected that the majority of decisions made by the TC are via
-a consensus seeking process and that voting is only used as a last-resort.
-
-Resolution may involve returning the issue to committers with suggestions on how to
-move forward towards a consensus. It is not expected that a meeting of the TC
-will resolve all issues on its agenda during that meeting and may prefer to continue
-the discussion happening among the committers.
-
-Members can be added to the TC at any time. Any committer can nominate another committer
-to the TC and the TC uses its standard consensus seeking process to evaluate whether or
-not to add this new member. Members who do not participate consistently at the level of
-a majority of the other members are expected to resign.

LICENSE.md

@@ -1,5 +1,5 @@
 The MIT License (MIT)
-Copyright (c) 2021-2024 Permissionless Software Foundation
+Copyright (c) 2022 Permissionless Software Foundation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

PEDIGREE.md

@@ -1,3 +0,0 @@
-# Pedigree
-
-This repository was forked from [koa-api-boilerplate](https://github.com/christroutner/koa-api-boilerplate). Code changes from that upstream repository is frequently pulled in and merged to this repository.

README.md

@@ -1,14 +1,14 @@
 # bch-dex
 
-[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+[![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com) [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release) [![Join the chat at https://gitter.im/Permissionless-Software-Foundation/psf-dex-dev](https://badges.gitter.im/Permissionless-Software-Foundation/psf-dex-dev.svg)](https://gitter.im/Permissionless-Software-Foundation/psf-dex-dev?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-`bch-dex` is a decentralized exchange *protocol* for permissionless trading of [SLP tokens](https://github.com/simpleledger/slp-specifications/blob/master/slp-token-type-1.md) and [NFTs](https://github.com/simpleledger/slp-specifications/blob/master/slp-nft-1.md). Trading fees are incredibly small, compared to other DEX platforms. The software is based entirely on open protocols and open source software. `bch-dex` software is maintained by the [Permissionless Software Foundation](https://psfoundation.info).
+`bch-dex` is a decentralized exchange for permissionless trading of [SLP tokens](https://github.com/simpleledger/slp-specifications/blob/master/slp-token-type-1.md) and [NFTs](https://github.com/simpleledger/slp-specifications/blob/master/slp-nft-1.md). Trading fees are incredibly small, compared to other DEX platforms. The software is based entirely on open protocols and open source software. It's not a '.com' website that you visit, but software you run on your own computer, in the confort of your own home. So long as you have an internet connection and the technical knowledge to run this software, no one can stop you from trading tokens. `bch-dex` software is maintained by the [Permissionless Software Foundation](https://psfoundation.cash/).
 
 - [High-level Overview of bch-dex](https://youtu.be/LVX8CLi4sHw) (Video)
 
-This is a prototype web service that monitors one or more [Nostr relays](https://nostr.com) for trading signals, to trade BCH and SLP tokens. It's inspired by the [SWaP Protocol](https://github.com/vinarmani/swap-protocol/blob/master/swap-protocol-spec.md).
+This is a prototype web service that monitors the [P2WDB](https://github.com/Permissionless-Software-Foundation/ipfs-p2wdb-service) for trading signals, to trade BCH and SLP tokens. It's inspired by the [SWaP Protocol](https://github.com/vinarmani/swap-protocol/blob/master/swap-protocol-spec.md).
 
-This repository contains the back end code. The user interface is contained in the [bch-dex-ui-v3](https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v3) repository.
+This repository contains the back end code. The user interface is contained in the [bch-dex-ui](https://github.com/Permissionless-Software-Foundation/bch-dex-ui) repository.
 
 **Warning**: This repository is under active development. Things will be constantly changing and breaking.
 
@@ -19,17 +19,24 @@ This repository contains the back end code. The user interface is contained in t
 
 ## Participate
 This is an open source project, and we encourage other JavaScript developers to participate in its creation and maintenance. We have two chat rooms for the community:
-- [Telegram Channel](https://t.me/bch_js_toolkit)
+- [Telegram Channel](https://t.me/psf_dex_dev)
+- [Gitter Channel](https://gitter.im/Permissionless-Software-Foundation/psf-dex-dev)
 
 ## Installation
 Running the DEX requires composition of these different software packages:
 - bch-dex - This repository is the back end software that tracks trade data on the network, generates [Offers and Counter Offers](https://github.com/Permissionless-Software-Foundation/bch-dex/tree/ct-unstable/dev-docs#definitions), and finalizes trades by accepting Counter Offers.
-- [bch-dex-ui-v3](https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v3) web app and user interface (UI) for bch-dex focused on Sellers of tokens.
-- [MongoDB](https://www.mongodb.com/) is a database used by bch-dex to store and manage local data, user accounts, etc.
+- [bch-dex-ui](https://github.com/Permissionless-Software-Foundation/bch-dex-ui) is a [Gatsby](https://www.gatsbyjs.com/) web app and user interface (UI) for bch-dex.
+- [P2WDB](https://github.com/Permissionless-Software-Foundation/ipfs-p2wdb-service) is a censorship-resistant database used to communicate trade data between peers running bch-dex.
+- [IPFS](https://ipfs.io/) is a censorship-resistant network for communicating data over the internet.
+- [MongoDB](https://www.mongodb.com/) is a database used by both P2WDB and bch-dex to store and manage local data.
 
-The above software is orchestrated using [Docker](https://www.docker.com/) and Docker Compose. The target operating system is Ubuntu 20+, and the target hardware is amd64 (normal desktop PCs). Trying to operate this software on other operating systems or hardware is possible, but not supported.
+The above software is orchestrated using [Docker](https://www.docker.com/) and Docker Compose. The target operating system is Ubuntu 20+, and the target hardware is amd64 (normal desktop PCs) and the arm64 (Raspberry Pi 4). Trying to operate this software on other operating systems or hardware is possible, but not supported.
 
-Setup instructions:
+The Raspberry Pi 4 is the primary hardware target, because this software functions best when it is always running. The Pi 4 makes a great appliance for monitoring trade signals and finalizing trades.
+
+Instructions for setting up Node.js, Docker, and Docker Compose can be found in [this Gist](https://gist.github.com/christroutner/a39f656850dc022b60f25c9663dd1cdd). Walk-through videos can also be found on the [PSF Videos page](https://psfoundation.cash/video/).
+
+Here are the steps involved in setting up bch-dex:
 
 1. Follow the direction in [this Gist](https://gist.github.com/christroutner/a39f656850dc022b60f25c9663dd1cdd) to install Node.js, Docker, and Docker Compose.
 1. Clone the repository with `git clone https://github.com/Permissionless-Software-Foundation/bch-dex` and enter it with `cd bch-dex`.
@@ -37,17 +44,32 @@ Setup instructions:
 1. Create a wallet:
   - `cd production/scripts`
   - `node create-wallet.js`
-1. Change directory to the `production/docker` folder.
+1. Change directory to the `production/docker` or `production/rpi-docker` folder depending on your hardware target.
 1. Pull the Docker images down from Docker Hub: `docker-compose pull`
-1. Build the core software: `docker-compose build --no-cache`
 1. Start the Docker containers with `docker-compose up -d`
+1. Wait for the P2WDB to sync and populate bch-dex with trade data. You can monitor it with `docker logs --tail 20 -f p2wdb`.
 1. Open a web browser and navigate the `http://localhost:4500`. You'll be able to see new Offers as they come in and are detected by bch-dex.
 1. To take the other side of the trade, click the `Take` button in the UI.
 1. You can add the 12-word mnemonic from the `wallet.json` file to the the web wallet, which will mirror your wallet in the UI, and allow you to perform basic wallet functions (send and receive BCH and tokens).
 
 ## Blockchain Infrastructure
 
-bch-dex requires a [Cash Stack](https://cashstack.info) back end in order to connect to the blockchain. By default, the Docker containers connect to [free-bch.fullstack.cash](https://free-bch.fullstack.cash/). Several community-provided servers are provided and can be [viewed here](https://consumers.psfoundation.info/consumers.json). The back end can be changed by setting the `CONSUMER_URL` environment variable in the `docker-compose.yml` file.
+The P2WDB and bch-dex containers requires a 'Global Back End' (as described in [CashStack.info](https://cashstack.info)) in order to connect to the blockchain. By default, the Docker containers connect to [free-bch.fullstack.cash](https://free-bch.fullstack.cash/). Several community-provided Global Back End servers are provided and can be [viewed here](https://gist.github.com/christroutner/63c5513782181f8b8ea3eb89f7cadeb6). The back end can be changed by setting the `CONSUMER_URL` environment variable in the `docker-compose.yml` file.
+
+### Applying Software Updates
+As this is an active project, software updates will happen frequently. To apply a software update, perform these steps.
+
+
+1. Enter the `docker` or `rpi-docker` folder, depending on your hardware target.
+1. Bring down the Docker containers with `docker-compose down`.
+1. Pull in the software updates with `git pull`
+1. Update dependencies with `npm install`
+1. Pull new Docker images with `docker-compose pull`
+1. Clean up disk space by deleting old Docker images with `./cleanup-images.sh`
+1. Start the Docker containers with `docker-compose up -d`
+
+
+Sometimes it may be necessary to delete the databases before applying a software update. This can be done by stopping the Docker containers and deleting the `production/data` directory. When the Docker containers are restarted, they will recreate that directory. The P2WDB will re-sync and bch-dex will be populated with fresh trade data.
 
 ## License
 

bin/server.js

@@ -25,7 +25,6 @@ import config from '../config/index.js' // this first.
 
 import AdminLib from '../src/adapters/admin.js'
 import errorMiddleware from '../src/controllers/rest-api/middleware/error.js'
-import { usageMiddleware } from '../src/use-cases/usage-use-cases.js'
 // import wlogger from '../src/adapters/wlogger.js'
 import Controllers from '../src/controllers/index.js'
 import { applyPassportMods } from '../config/passport.js'
@@ -46,18 +45,16 @@ class Server {
       const app = new Koa()
       app.keys = [this.config.session]
 
-      if (!this.config.noMongo) {
-        // Connect to the Mongo Database.
-        this.mongoose.Promise = global.Promise
-        this.mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-        console.log(
-          `Connecting to MongoDB with this connection string: ${this.config.database}`
-        )
-        await this.mongoose.connect(this.config.database, {
-          useUnifiedTopology: true,
-          useNewUrlParser: true
-        })
-      }
+      // Connect to the Mongo Database.
+      this.mongoose.Promise = global.Promise
+      this.mongoose.set('useCreateIndex', true) // Stop deprecation warning.
+      console.log(
+        `Connecting to MongoDB with this connection string: ${this.config.database}`
+      )
+      await this.mongoose.connect(this.config.database, {
+        useUnifiedTopology: true,
+        useNewUrlParser: true
+      })
 
       console.log(`Starting environment: ${this.config.env}`)
       console.log(`Debug level: ${this.config.debugLevel}\n`)
@@ -71,7 +68,6 @@ class Server {
       app.use(bodyParser())
       app.use(session())
       app.use(errorMiddleware())
-      app.use(usageMiddleware())
 
       // Used to generate the docs.
       app.use(mount('/', serve(`${process.cwd()}/docs`)))
@@ -128,11 +124,9 @@ class Server {
       this.server = await app.listen(config.port)
       console.log(`Server started on ${config.port}`)
 
-      if (!this.config.noMongo) {
-        // Create the system admin user.
-        const success = await this.adminLib.createSystemUser()
-        if (success) console.log('System admin user created.')
-      }
+      // Create the system admin user.
+      const success = await this.adminLib.createSystemUser()
+      if (success) console.log('System admin user created.')
 
       // Attach the other IPFS controllers.
       // Skip if this is a test environment.
@@ -144,9 +138,7 @@ class Server {
       console.log('\nConfiguration:')
       console.log(`Circuit Relay: ${this.config.isCircuitRelay}`)
       console.log(`IPFS TCP port: ${this.config.ipfsTcpPort}`)
-      console.log(`IPFS WS port: ${this.config.ipfsWsPort}`)
-      console.log(`IPFS WebRTC port: ${this.config.ipfsWebRtcPort}`)
-      console.log(`Connection preference: ${this.config.connectPref}\n`)
+      console.log(`IPFS WS port: ${this.config.ipfsWsPort}\n`)
 
       return app
     } catch (err) {

config/env/common.js

@@ -1,11 +1,6 @@
 /*
   This file is used to store unsecure, application-specific data common to all
   environments.
-
-  Additional Environent Variables:
-  - CONNECT_PREF: should have a value of 'cr' (default), or 'direct'. This is
-    used by helia-coord to select a connection preference between peers. Servers
-    with an ip4 or ip6 address should use 'direct'.
 */
 
 /* eslint  no-unneeded-ternary:0 */
@@ -52,70 +47,23 @@ export default {
 
   // P2WDB URL that will accept API calls from the p2wdb npm library.
   p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'https://p2wdb.fullstack.cash',
-  // p2wdbUrl: process.env.P2WDB_URL ? process.env.P2WDB_URL : 'http://localhost:5010',
-
-  // Enable or Disable the usage of Mongo DB.
-  noMongo: process.env.NO_MONGO ? true : false,
-
-  // BEGIN WALLET CONFIGURATION
-
-  // BCH Mnemonic for generating encryption keys and payment address
-  mnemonic: process.env.MNEMONIC ? process.env.MNEMONIC : '',
-
-  // (Optional) use a wallet file generated by psf-bch-wallet.
-  walletFile: process.env.WALLET_FILE
-    ? process.env.WALLET_FILE
-    : `${__dirname.toString()}/../../wallet.json`,
-
-  // Wallet Configuration
-  // Default value: web3 - connect to bch-api through web 3 JSON RPC over IPFS.
-  // Alternate value: web2 - connect to bch-api through a web 2 REST API over HTTP.
-  walletInterface: process.env.WALLET_INTERFACE ? process.env.WALLET_INTERFACE : 'web3',
-
-  // Wallet API Server
-  // Default web2 server: https://api.fullstack.cash/v5/
-  // Default web3 server: https://free-bch.fullstack.cash/
-  apiServer: process.env.WALLET_INTERFACE === 'web2'
-    ? (
-        process.env.APISERVER
-          ? process.env.APISERVER
-          : 'https://api.fullstack.cash/v5/'
-      )
-    : 'https://free-bch.fullstack.cash/',
-
-  // Basic Authentication Password for connecting to bch-api through a web 2
-  // REST API over HTTP.
-  authPass: process.env.WALLET_AUTH_PASS
-    ? process.env.WALLET_AUTH_PASS
-    : '',
 
   // FullStack.cash account information, used for automatic JWT handling.
   getJwtAtStartup: process.env.GET_JWT_AT_STARTUP ? true : false,
   authServer: process.env.AUTHSERVER
     ? process.env.AUTHSERVER
     : 'https://auth.fullstack.cash',
+  apiServer: process.env.APISERVER
+    ? process.env.APISERVER
+    : 'https://api.fullstack.cash/v5/',
   fullstackLogin: process.env.FULLSTACKLOGIN
     ? process.env.FULLSTACKLOGIN
     : 'demo@demo.com',
   fullstackPassword: process.env.FULLSTACKPASS
     ? process.env.FULLSTACKPASS
     : 'demo',
-  // authPass: process.env.FULLSTACK_AUTH_PASS
-  //   ? process.env.FULLSTACK_AUTH_PASS
-  //   : '',
-
-  // END WALLET CONFIGURATION
-
-  // BEGIN IPFS CONFIGURATION
-
-  // Debug verbosity level of helia-coord.
-  // 0 = no debug logs. 3 = maximum logs.
-  debugLevel: process.env.DEBUG_LEVEL ? parseInt(process.env.DEBUG_LEVEL) : 2,
-
-  // Enable/Disable the IPFS node at startup. Enabled by default.
-  // useIpfs: process.env.DISABLE_IPFS ? false : true,
-  useIpfs: false,
 
+  // IPFS settings.
   isCircuitRelay: process.env.ENABLE_CIRCUIT_RELAY ? true : false,
   // SSL domain used for websocket connection via browsers.
   crDomain: process.env.CR_DOMAIN ? process.env.CR_DOMAIN : '',
@@ -136,10 +84,7 @@ 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: process.env.WEB2_API ? process.env.WEB2_API : null
+    }
   },
 
   // P2WDB webhook endpoint
@@ -155,11 +100,14 @@ export default {
   // IPFS Ports
   ipfsTcpPort: process.env.IPFS_TCP_PORT ? process.env.IPFS_TCP_PORT : 4001,
   ipfsWsPort: process.env.IPFS_WS_PORT ? process.env.IPFS_WS_PORT : 4003,
-  ipfsWebRtcPort: process.env.IPFS_WEB_RTC_PORT ? process.env.IPFS_WEB_RTC_PORT : 4005,
-  connectPref: process.env.CONNECT_PREF, // Used in helia-coord to select connection preference.
+
+  // BCH Mnemonic for generating encryption keys and payment address
+  mnemonic: process.env.MNEMONIC ? process.env.MNEMONIC : '',
+
+  debugLevel: process.env.DEBUG_LEVEL ? parseInt(process.env.DEBUG_LEVEL) : 1,
 
   // Settings for production, using external go-ipfs node.
-  isProduction: process.env.SVC_ENV === 'prod' ? true : false,
+  isProduction: process.env.SVC_ENV === 'production' ? true : false,
   ipfsHost: process.env.IPFS_HOST ? process.env.IPFS_HOST : 'localhost',
   ipfsApiPort: process.env.IPFS_API_PORT
     ? parseInt(process.env.IPFS_API_PORT)
@@ -168,26 +116,5 @@ export default {
   chatPubSubChan: 'psf-ipfs-chat-001',
 
   // IPFS gateway
-  ipfsGateway: process.env.IPFS_GATEWAY ? process.env.IPFS_GATEWAY : 'https://pin.fullstack.cash/ipfs/download/',
-
-  // 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',
-
-    // v2 Circuit Relay server (FullStack.cash)
-    // '/ip4/78.46.129.7/tcp/4001/p2p/12D3KooWFQ11GQ5NubsJGhYZ4X3wrAGimLevxfm6HPExCrMYhpSL'
-  ],
-
-  // END IPFS CONFIGURATION
-
-  // Nostr
-  nostrRelay: process.env.NOSTR_RELAY ? process.env.NOSTR_RELAY : 'wss://nostr-relay.psfoundation.info',
-  nostrTopic: process.env.NOSTR_TOPIC ? process.env.NOSTR_TOPIC : 'bch-dex-test-topic-01',
-
-  // Account Configuration
-  disableNewAccounts: process.env.DISABLE_NEW_ACCOUNTS ? true : false,
-
-  // Admin password
-  adminPassword: process.env.ADMIN_PASSWORD
+  ipfsGateway: process.env.IPFS_GATEWAY ? process.env.IPFS_GATEWAY : 'https://p2wdb-gateway-678.fullstack.cash/ipfs/'
 }

config/env/test.js

@@ -8,6 +8,5 @@ export default {
   session: 'secret-boilerplate-token',
   token: 'secret-jwt-token',
   database: 'mongodb://localhost:27017/bch-swap-service-test',
-  env: 'test',
-  nostrRelay: 'wss://'
+  env: 'test'
 }

config/index.js

@@ -14,4 +14,8 @@ if (env === 'test') {
   config = production
 }
 
+// const importStr = `./env/${env}.js`
+// console.log('importStr: ', importStr)
+// import config from importStr
+
 export default Object.assign({}, common, config)

config/passport.js

@@ -53,4 +53,7 @@ function applyPassportMods (passport) {
   return true
 }
 
+// For testing
+// export default { passport, passportCallback };
+// export default applyPassportMods
 export { applyPassportMods, passportCallback }

index.js

@@ -1,8 +1,4 @@
 import Server from './bin/server.js'
 const server = new Server()
 
-process.on('unhandledRejection', (reason, promise) => {
-  console.log(`Handling ${reason.code} error. stack: `, reason)
-})
-
 server.startServer()

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bch-dex",
-  "version": "3.0.0",
+  "version": "2.0.2",
   "description": "A DEX on BCH for trading SLP tokens.",
   "main": "index.js",
   "type": "module",
@@ -28,34 +28,14 @@
   },
   "repository": "Permissionless-Software-Foundation/bch-dex",
   "dependencies": {
-    "@chainsafe/libp2p-gossipsub": "14.1.0",
-    "@chainsafe/libp2p-noise": "16.0.1",
-    "@chainsafe/libp2p-yamux": "7.0.1",
     "@chris.troutner/retry-queue": "1.0.8",
-    "@helia/unixfs": "4.0.2",
-    "@libp2p/bootstrap": "11.0.26",
-    "@libp2p/circuit-relay-v2": "3.2.2",
-    "@libp2p/config": "1.1.0",
-    "@libp2p/identify": "3.0.22",
-    "@libp2p/keychain": "5.0.14",
-    "@libp2p/logger": "5.1.8",
-    "@libp2p/ping": "2.0.22",
-    "@libp2p/tcp": "10.1.2",
-    "@libp2p/webrtc": "5.2.2",
-    "@libp2p/websockets": "9.2.2",
-    "@multiformats/multiaddr": "12.3.5",
+    "@psf/bch-js": "6.5.1",
     "axios": "0.27.2",
     "bch-message-lib": "2.2.1",
-    "bch-nostr": "1.3.3",
-    "bch-token-sweep": "2.2.1",
     "bcryptjs": "2.4.3",
-    "bitcoincashjs-lib": "3.3.3",    
-    "blockstore-fs": "2.0.2",
-    "datastore-fs": "10.0.2",
+    "bitcoincashjs-lib": "3.3.3",
     "glob": "7.1.6",
-    "helia": "5.2.1",
-    "helia-coord": "1.7.2",
-    "ipfs-coord-esm": "9.1.7",
+    "ipfs-coord-esm": "9.1.3",
     "ipfs-http-client": "58.0.0",
     "jsonrpc-lite": "2.2.0",
     "jsonwebtoken": "8.5.1",
@@ -71,26 +51,25 @@
     "koa-router": "10.0.0",
     "koa-static": "5.0.0",
     "koa2-ratelimit": "0.9.1",
-    "libp2p": "2.7.2",
+    "libp2p": "0.36.2",
     "line-reader": "0.4.0",
-    "minimal-slp-wallet": "5.13.2",
+    "minimal-slp-wallet": "5.4.3",
     "mongoose": "5.13.14",
     "node-fetch": "npm:@achingbrain/node-fetch@2.6.7",
     "nodemailer": "6.7.5",
-    "nostr-tools": "2.10.4",
-    "p2wdb-esm": "2.2.9",
+    "p2wdb-esm": "2.2.7",
     "passport-local": "1.0.0",
-    "public-ip": "6.0.1",
+    "public-ip": "4.0.4",
     "winston": "3.3.3",
     "winston-daily-rotate-file": "4.5.0"
   },
   "devDependencies": {
     "apidoc": "0.51.1",
+    "bch-token-sweep": "2.1.2",
     "c8": "7.12.0",
     "chai": "4.3.0",
     "coveralls": "2.11.4",
     "husky": "4.3.8",
-    "lodash.clonedeep": "4.5.0",
     "mocha": "10.0.0",
     "semantic-release": "19.0.3",
     "sinon": "9.2.4",

production/docker/.env

@@ -1 +0,0 @@
-COMPOSE_PROJECT_NAME=bch-dex

production/docker/bch-dex-ui/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update
 RUN apt-get install -y sudo git curl nano gnupg wget
 
 #Install Node and NPM
-RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh
 RUN bash nodesource_setup.sh
 RUN apt-get install -y nodejs build-essential
 
@@ -34,7 +34,7 @@ WORKDIR /home/safeuser
 
 # Update to the latest version of npm.
 #RUN npm install -g npm@7.23.0
-#RUN npm install -g npm
+RUN npm install -g npm
 
 # npm mirror to prevent direct dependency on npm.
 #RUN npm set registry http://94.130.170.209:4873/
@@ -46,14 +46,14 @@ WORKDIR /home/safeuser
 
 # Clone the rest.bitcoin.com repository
 WORKDIR /home/safeuser
-RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v3
+RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex-ui-v2
 
 # Switch to the desired branch. `master` is usually stable,
 # and `stage` has the most up-to-date changes.
-WORKDIR /home/safeuser/bch-dex-ui-v3
+WORKDIR /home/safeuser/bch-dex-ui-v2
 
 # For development: switch to unstable branch
-RUN git checkout ct-unstable
+RUN git checkout temp-demo
 
 # Install dependencies
 #RUN mkdir .ipfsdata
@@ -61,13 +61,13 @@ RUN git checkout ct-unstable
 RUN npm install
 
 # Build the site
-RUN npm run build
+RUN CI=true npm run build
 
 # Load the NGINX image.
 FROM nginx
 EXPOSE 80
 
 # Copy the files built in the first container to the new NGINX container.
-COPY --from=builder /home/safeuser/bch-dex-ui-v3/build /usr/share/nginx/html
+COPY --from=builder /home/safeuser/bch-dex-ui-v2/build /usr/share/nginx/html
 
 #USER safeuser

production/docker/bch-dex/Dockerfile

@@ -12,7 +12,7 @@ RUN apt-get update
 RUN apt-get install -y sudo git curl nano gnupg wget
 
 #Install Node and NPM
-RUN curl -sL https://deb.nodesource.com/setup_20.x -o nodesource_setup.sh
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh
 RUN bash nodesource_setup.sh
 RUN apt-get install -y nodejs build-essential
 
@@ -34,7 +34,7 @@ WORKDIR /home/safeuser
 
 # Update to the latest version of npm.
 #RUN npm install -g npm@7.23.0
-#RUN npm install -g npm
+RUN npm install -g npm
 
 # npm mirror to prevent direct dependency on npm.
 RUN npm set registry http://94.130.170.209:4873/

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

@@ -29,6 +29,4 @@ export WEBHOOKSERVICE=http://172.17.0.1:5667/webhook
 export WEBHOOKTARGET=http://172.17.0.1:5700/p2wdb
 export APP_ID=bch-dex-001
 
-#export P2WDB_URL=http://172.17.0.1:5667
-
 npm start

production/docker/docker-compose.yml

@@ -3,9 +3,9 @@
 version: '3.9'
 
 services:
-  mongo-dex:
+  mongo-p2wdb-service:
     image: mongo:4.2.0
-    container_name: mongo-dex
+    container_name: mongo-p2wdb-service
     ports:
       - '5666:27017' # <host port>:<container port>
     volumes:
@@ -13,11 +13,67 @@ services:
     command: mongod --logpath=/dev/null # -- quiet
     restart: always
 
+  ipfs:
+    # https://github.com/christroutner/trickle-ipfs
+    image: christroutner/trickle-ipfs:v1.0.1
+    #build:
+    #  context: ./
+    #  dockerfile: Dockerfile
+    container_name: ipfs
+    environment:
+      IPFS_DAEMON_ARGUMENTS: '--enable-pubsub-experiment --migrate=true --agent-version-suffix=docker --routing=dhtclient'
+      UPLOAD_KBPS: '1000'
+      DOWNLOAD_KBPS: '1000'
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '10m'
+        max-file: '10'
+    mem_limit: 2000mb
+    ports:
+      - 4001:4001
+      - 4003:4003
+      - 172.17.0.1:5001:5001
+      - 172.17.0.1:8080:8080
+    command: [
+      './start-ipfs.sh'
+    ]
+    volumes:
+      - ../data/go-ipfs/data:/root/.ipfs
+    restart: always
+
+  p2wdb:
+    #build:
+    #  context: ./p2wdb/
+    #  dockerfile: Dockerfile
+    image: christroutner/p2wdb:v3.1.8
+    container_name: p2wdb
+    environment:
+      CONSUMER_URL: 'https://free-bch.fullstack.cash'
+      DEBUG_LEVEL: 1
+    logging:
+      driver: 'json-file'
+      options:
+        max-size: '10m'
+        max-file: '10'
+    mem_limit: 1gb
+    links:
+      - mongo-p2wdb-service
+    ports:
+      # <host port>:<container port>
+      - 5667:5667 # REST API
+      #- 5668:5668 # IPFS TCP port
+      #- 5669:5669 # IPFS WS Port
+    volumes:
+      - ../data/ipfsdata/p2wdb:/home/safeuser/ipfs-p2wdb-service/.ipfsdata/p2wdb
+      - ./p2wdb/start-production.sh:/home/safeuser/ipfs-p2wdb-service/start-production.sh
+    restart: always
+
   bch-dex:
     build:
       context: ./bch-dex/
       dockerfile: Dockerfile
-    #image: christroutner/bch-dex:v2.2.4
+    #image: christroutner/bch-dex:v2.0.8
     container_name: bch-dex
     environment:
       CONSUMER_URL: 'https://free-bch.fullstack.cash'
@@ -28,15 +84,10 @@ services:
         max-file: '10'
     mem_limit: 1000mb
     links:
-      - mongo-dex
-      #- p2wdb
+      - mongo-p2wdb-service
+      - p2wdb
     ports:
-      # <host port>:<container port>
-      - '5700:5700' # REST API
-      - '4001:4001' # TCP
-      - '4003:4003' # Websockets
-      - '4005:4005' # WebRTC
-
+      - '5700:5700' # <host port>:<container port>
     volumes:
       - ../scripts/wallet.json:/home/safeuser/bch-dex/wallet.json
       - ./bch-dex/start-production.sh:/home/safeuser/bch-dex/start-production.sh
@@ -49,13 +100,13 @@ services:
     #image: christroutner/bch-dex-ui:v1.2.4
     container_name: dex-ui
     environment:
-      SERVER: 'http://172.17.0.1'
+      SERVER: 'http://192.168.2.3'
     logging:
       driver: 'json-file'
       options:
         max-size: '10m'
         max-file: '10'
-    mem_limit: 1000mb
+    mem_limit: 500mb
     links:
       - bch-dex
     ports:

production/docker/p2wdb/Dockerfile

@@ -0,0 +1,71 @@
+# Create a Docker container for the P2WDB
+#
+
+#IMAGE BUILD COMMANDS
+FROM ubuntu:20.04
+MAINTAINER Chris Troutner <chris.troutner@gmail.com>
+
+#Update the OS and install any OS packages needed.
+RUN apt-get update
+RUN apt-get install -y sudo git curl nano gnupg wget
+
+#Install Node and NPM
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install -y nodejs build-essential
+
+#Create the user 'safeuser' and add them to the sudo group.
+RUN useradd -ms /bin/bash safeuser
+RUN adduser safeuser sudo
+
+#Set password to 'abcd8765' change value below if you want a different password
+RUN echo safeuser:abcd8765 | chpasswd
+
+#Set the working directory to be the users home directory
+WORKDIR /home/safeuser
+
+#Setup NPM for non-root global install (like on a mac)
+RUN mkdir /home/safeuser/.npm-global
+RUN chown -R safeuser .npm-global
+RUN echo "export PATH=~/.npm-global/bin:$PATH" >> /home/safeuser/.profile
+RUN runuser -l safeuser -c "npm config set prefix '~/.npm-global'"
+
+# Update to the latest version of npm.
+#RUN npm install -g npm@7.23.0
+RUN npm install -g npm
+
+# npm mirror to prevent direct dependency on npm.
+RUN npm set registry http://94.130.170.209:4873/
+
+# Switch to user account.
+#USER safeuser
+# Prep 'sudo' commands.
+#RUN echo 'abcd8765' | sudo -S pwd
+
+# Clone the rest.bitcoin.com repository
+RUN git clone https://github.com/Permissionless-Software-Foundation/ipfs-p2wdb-service
+WORKDIR /home/safeuser/ipfs-p2wdb-service
+RUN mkdir .ipfsdata
+RUN git checkout ct-unstable
+
+#RUN npm install fsevents
+
+# Install dependencies
+#RUN mkdir .ipfsdata
+RUN npm install
+
+# Generate the API docs
+RUN npm run docs
+
+# Expose the port the API will be served on.
+#EXPOSE 5010
+
+# Start the application.
+#COPY start-production.sh start-production.sh
+CMD ["./start-production.sh"]
+
+#CMD ["npm", "start"]
+
+# Used for debugging
+#COPY dummyapp.js dummyapp.js
+#CMD ["node", "dummyapp.js"]

production/docker/p2wdb/dummyapp.js

@@ -0,0 +1,4 @@
+setInterval(function () {
+  const now = new Date()
+  console.log(`ping ${now.toLocaleString()}`)
+}, 10000)

production/docker/p2wdb/start-production.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# BEGIN: Optional configuration settings
+
+# This mnemonic is used to set up persistent public key for e2ee
+# Replace this with your own 12-word mnemonic.
+export MNEMONIC="mass response fiscal world message exact series swallow forward confirm canoe festival"
+
+# The human readable name this IPFS node identifies as.
+export COORD_NAME=generic-p2wdb-production
+
+# Allow this node to function as a circuit relay. It must not be behind a firewall.
+#export ENABLE_CIRCUIT_RELAY=true
+# For browsers to use your circuit realy, you must set up a domain, SSL certificate,
+# and you must forward that subdomain to the IPFS_WS_PORT.
+#export CR_DOMAIN=subdomain.yourdomain.com
+
+# Debug level. 0 = minimal info. 2 = max info.
+# This value set by docker-compose.yml
+#export DEBUG_LEVEL=1
+
+# Log-in information for retrieving a JWT token from FullStack.cash.
+export FULLSTACKLOGIN=demo@demo.com
+export FULLSTACKPASS=demo
+
+# END: Optional configuration settings
+
+
+# Production database connection string.
+export DBURL=mongodb://172.17.0.1:5666/p2wdb-service-dev
+
+# Configure IPFS ports
+#export IPFS_TCP_PORT=5668
+#export IPFS_WS_PORT=5669
+
+# Configure REST API port
+export PORT=5667
+
+export P2W_ENV=production
+export IPFS_HOST=172.17.0.1
+export IPFS_API_PORT=5001
+export IPFS_TCP_PORT=4001
+
+# P2WDB specific env vars
+#export ORBITDB_NAME=/orbitdb/zdpuAm4fPafpjs5mgbBUJV8Az7kd8Xj1ttD6M1JaAxF8RMRrw/psf-bch-p2wdb-keyvalue-v1.0.0-0004
+
+npm start

production/rpi-docker/bch-dex/Dockerfile

@@ -12,12 +12,9 @@ RUN apt-get update
 RUN apt-get install -y sudo git curl nano gnupg wget
 
 #Install Node and NPM
-RUN sudo apt-get install -y ca-certificates curl gnupg
-RUN sudo mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | sudo tee /etc/apt/sources.list.d/nodesource.list
-RUN sudo apt-get update
-RUN sudo apt-get install -y nodejs build-essential
+RUN curl -sL https://deb.nodesource.com/setup_16.x -o nodesource_setup.sh
+RUN bash nodesource_setup.sh
+RUN apt-get install -y nodejs build-essential
 
 #Create the user 'safeuser' and add them to the sudo group.
 #RUN useradd -ms /bin/bash safeuser
@@ -37,7 +34,7 @@ WORKDIR /home/safeuser
 
 # Update to the latest version of npm.
 #RUN npm install -g npm@7.23.0
-#RUN npm install -g npm
+RUN npm install -g npm
 
 # npm mirror to prevent direct dependency on npm.
 RUN npm set registry http://94.130.170.209:4873/
@@ -56,7 +53,7 @@ RUN git clone https://github.com/Permissionless-Software-Foundation/bch-dex
 WORKDIR /home/safeuser/bch-dex
 
 # For development: switch to unstable branch
-RUN git checkout master
+RUN git checkout ct-unstable
 
 # Install dependencies
 #RUN mkdir .ipfsdata
@@ -66,6 +63,14 @@ RUN npm install
 # Generate the API docs
 RUN npm run docs
 
+# Copy the wallet files
+#COPY wallet.json wallet.json
+
+#VOLUME /home/safeuser/keys
+
+# Expose the port the API will be served on.
+#EXPOSE 5010
+
 # Start the application.
 #COPY start-production.sh start-production.sh
 CMD ["./start-production.sh"]

production/rpi-docker/p2wdb/start-production.sh

@@ -41,14 +41,8 @@ export IPFS_HOST=172.17.0.1
 export IPFS_API_PORT=5001
 export IPFS_TCP_PORT=4001
 export IPFS_WS_PORT=4003
-export IPFS_WEB_RTC_PORT=4005
-# Set the debug level for helia-coord. 0-3.
-# 0 = no debug logs. 3 = maximum debug logs.
-export DEBUG_LEVEL=0
 
-# Use this if the IPFS node has a publically accessible IP address.
-#export CONNECT_PREF=direct
-# Use this if the IPFS node is behind a NAT or Firewall and cannot be accessed directly.
-export CONNECT_PREF=cr
+# P2WDB specific env vars
+#export ORBITDB_NAME=/orbitdb/zdpuAqNiwLiJBfbRK7uihV2hAbNSXj78ufzv5VyQb8GuvRwDh/psf-bch-p2wdb-keyvalue-v3.0.0-0001
 
 npm start

production/scripts/bulk-sweep-wallet.js

@@ -1,153 +0,0 @@
-/*
-  This script is similar ot sweep-wallet.js, but it can do a much faster (bulk)
-  scanning of addresses. However, this requires a subscription to a FullStack.cash
-  or access to a web2 Cash Stack.
-
-  This script will scan 20 addresses at a time. If a balance is found in any
-  of the addresses, it will sweep the funds from that address.
-*/
-/*
-// Public npm libraries
-import BchTokenSweep from 'bch-token-sweep/index.js'
-
-// Local libraries
-import WalletAdapter from '../../src/adapters/wallet.js'
-import BCHJS from '@psf/bch-js'
-import JwtLib from 'jwt-bch-lib'
-
-// Constants
-// const EMTPY_ADDR_CUTOFF = 100
-const LAST_ADDR_INDEX = 100
-
-if (!process.env.BCHJSTOKEN) {
-  console.log('You will need a JWT token from FullStack.cash to execute this script. Export it to the BCHJSTOKEN environment variable and try again.')
-  exit(0)
-}
-
-async function sweepFunds () {
-  try {
-    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
-    const walletLib = new WalletAdapter()
-    walletLib.config.useFullStackCash = true
-    walletLib.config.apiServer = 'http://192.168.2.129:3000/v5/'
-
-    // const walletInfo = await walletLib.openWallet()
-    const walletInfo = await openWallet(walletLib)
-    const wallet = await walletLib.instanceWallet(walletInfo)
-    console.log('walletInfo: ', walletInfo)
-
-    const rootAddr = walletInfo.cashAddress
-    const rootWif = walletInfo.privateKey
-    console.log(`Sweeping all funds into root address ${rootAddr}...`)
-
-    // Instantiate bch-js, and use the JWT token saved to environment variable.
-
-    // Generate an HD tree
-    // const bchjs = wallet.bchjs
-    const bchjs = new BCHJS()
-    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
-    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
-
-    const emptyAddrCnt = 0
-    const hdIndex = 1
-
-    // Divide all the addresses by 20, since that's how many will be checked at once.
-    const numOfLoops = Math.ceil(LAST_ADDR_INDEX / 20)
-
-    for (let i = 1; i < numOfLoops; i++) {
-      const startIndex = i
-      const stopIndex = i * 20
-      console.log(`startIndex: ${startIndex}, stopIndex: ${stopIndex}`)
-
-      // Generate the next block of 20 key pairs to scan.
-      const addrsToScan = []
-      const wifsToScan = []
-      for (let j = startIndex; j < stopIndex; j++) {
-        // Generate a keypair from the HD wallet.
-        const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${j}`)
-        const cashAddress = bchjs.HDNode.toCashAddress(childNode)
-        const wifToSweep = bchjs.HDNode.toWIF(childNode)
-
-        addrsToScan.push(cashAddress)
-        wifsToScan.push(wifToSweep)
-      }
-      console.log(`Scanning these addresses for a balance: ${JSON.stringify(addrsToScan, null, 2)}`)
-
-      // Scan a block of 20 addresses for a balance.
-      const balances = await bchjs.Electrumx.balance(addrsToScan)
-      console.log(`balances: ${JSON.stringify(balances, null, 2)}`)
-
-      // Scan through the results and look for a balance.
-      for (let j = 0; j < balances.balances.length; j++) {
-        const thisBalance = balances.balances[j]
-
-        // const combinedBal = thisBalance.balance.confirmed + thisBalance.balance.
-
-        // if(thisBalance.)
-      }
-    }
-
-    // do {
-    //   // Generate a keypair from the HD wallet.
-    //   const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
-    //   const cashAddress = bchjs.HDNode.toCashAddress(childNode)
-    //   const wifToSweep = bchjs.HDNode.toWIF(childNode)
-    //
-    //   console.log(`\nSweeping ${cashAddress} with private key ${wifToSweep}`)
-    //
-    //   try {
-    //     // Sweep tokens from address
-    //     const sweeper = new BchTokenSweep(
-    //       wifToSweep,
-    //       rootWif,
-    //       wallet,
-    //       550,
-    //       rootAddr
-    //     )
-    //     await sweeper.populateObjectFromNetwork()
-    //
-    //     const hex = await sweeper.sweepTo(rootAddr)
-    //     // console.log(`hex: ${hex}`)
-    //
-    //     const txid = await sweeper.blockchain.broadcast(hex)
-    //
-    //     // console.log('Transaction ID', txid)
-    //     console.log(`Swept HD index ${hdIndex}. TXID: ${txid}`)
-    //
-    //     emptyAddrCnt = 0
-    //
-    //     // Wait between loop iterations.
-    //     await bchjs.Util.sleep(3000)
-    //   } catch (err) {
-    //     console.log(`error message with index ${hdIndex}: ${err.message}`)
-    //     // console.log(err)
-    //     emptyAddrCnt++
-    //   }
-    //
-    //   hdIndex++
-    // } while (emptyAddrCnt < EMTPY_ADDR_CUTOFF)
-    //
-    // console.log(`${EMTPY_ADDR_CUTOFF} empty addresses detected. Exiting.`)
-    //
-    // console.log('\n\nDo not forget to reset the nextAddress property in the wallet.json file!\n\n')
-  } catch (err) {
-    console.error('Error in sweepFunds(): ', err)
-  }
-}
-sweepFunds()
-
-// Open the wallet file, or create one if the file doesn't exist.
-// Does not instance the wallet. The output of this function is expected to
-// be passed to instanceWallet().
-async function openWallet (walletLib) {
-  try {
-    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
-    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
-
-    return walletData
-  } catch (err) {
-    console.error('Error in openWallet()')
-    throw err
-  }
-}
-*/

production/scripts/fullstack-sweep-wallet.js

@@ -1,111 +0,0 @@
-/*
-  This script is the same as sweep-wallet.js, but it requires a FullStack.cash
-  account, which makes the scanning much faster.
-*/
-
-// Public npm libraries
-// const BCHJS = require('@psf/bch-js')
-import BchTokenSweep from 'bch-token-sweep/index.js'
-
-// Local libraries
-import WalletAdapter from '../../src/adapters/wallet.js'
-
-// Constants
-// const EMTPY_ADDR_CUTOFF = 10
-const START_INDEX = 1
-const LAST_ADDR_INDEX = 100
-
-if (!process.env.BCHJSTOKEN) {
-  console.log('You will need a JWT token from FullStack.cash to execute this script. Export it to the BCHJSTOKEN environment variable and try again.')
-  process.exit(0)
-}
-
-async function sweepFunds () {
-  try {
-    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
-    const walletLib = new WalletAdapter()
-    walletLib.config.useFullStackCash = true
-    // walletLib.config.apiServer = 'http://192.168.2.129:3000/v5/'
-    walletLib.config.apiServer = 'https://api.fullstack.cash/v5/'
-
-    // Open the wallet files.
-    const walletInfo = await openWallet(walletLib)
-    const wallet = await walletLib.instanceWallet(walletInfo)
-    console.log('walletInfo: ', walletInfo)
-
-    const rootAddr = walletInfo.cashAddress
-    const rootWif = walletInfo.privateKey
-    console.log(`Sweeping all funds into root address ${rootAddr}...`)
-
-    // Generate an HD tree
-    const bchjs = wallet.bchjs
-    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
-    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
-
-    let emptyAddrCnt = 0
-    let hdIndex = START_INDEX
-
-    do {
-      // Generate a keypair from the HD wallet.
-      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
-      const cashAddress = bchjs.HDNode.toCashAddress(childNode)
-      const wifToSweep = bchjs.HDNode.toWIF(childNode)
-
-      console.log(`\nSweeping ${cashAddress} with private key ${wifToSweep}`)
-
-      try {
-        // Sweep tokens from address
-        const sweeper = new BchTokenSweep(
-          wifToSweep,
-          rootWif,
-          wallet,
-          550,
-          rootAddr
-        )
-        await sweeper.populateObjectFromNetwork()
-
-        const hex = await sweeper.sweepTo(rootAddr)
-        // console.log(`hex: ${hex}`)
-
-        const txid = await sweeper.blockchain.broadcast(hex)
-
-        // console.log('Transaction ID', txid)
-        console.log(`Swept HD index ${hdIndex}. TXID: ${txid}`)
-
-        emptyAddrCnt = 0
-
-        // Wait between loop iterations.
-        await bchjs.Util.sleep(3000)
-      } catch (err) {
-        console.log(`error message with index ${hdIndex}: ${err.message}`)
-        // console.log(err)
-        emptyAddrCnt++
-      }
-
-      hdIndex++
-      // } while (emptyAddrCnt < EMTPY_ADDR_CUTOFF)
-      // console.log(`${EMTPY_ADDR_CUTOFF} empty addresses detected. Exiting.`)
-    } while (hdIndex < LAST_ADDR_INDEX)
-    console.log(`Last index of ${LAST_ADDR_INDEX} reached. emptyAddrCnt: ${emptyAddrCnt}`)
-
-    console.log('\n\nDo not forget to reset the nextAddress property in the wallet.json file!\n\n')
-  } catch (err) {
-    console.error('Error in sweepFunds(): ', err)
-  }
-}
-sweepFunds()
-
-// Open the wallet file, or create one if the file doesn't exist.
-// Does not instance the wallet. The output of this function is expected to
-// be passed to instanceWallet().
-async function openWallet (walletLib) {
-  try {
-    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
-    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
-
-    return walletData
-  } catch (err) {
-    console.error('Error in openWallet()')
-    throw err
-  }
-}

production/scripts/list-addrs.js

@@ -1,67 +0,0 @@
-/*
-  This script is the same as sweep-wallet.js, but instead of sweeping the keys,
-  it simply lists out the addresses in the HD keychain. This is hany when trying
-  to figure out which address a token was sent to.
-*/
-
-// Public npm libraries
-
-// Local libraries
-import WalletAdapter from '../../src/adapters/wallet.js'
-
-// Constants
-const START_INDEX = 1
-const LAST_ADDR_INDEX = 100
-
-async function listAddrs () {
-  try {
-    // Configure the wallet library to use a FullStack.cash or a local Cash Stack
-    const walletLib = new WalletAdapter()
-
-    // Open the wallet files.
-    const walletInfo = await openWallet(walletLib)
-    const wallet = await walletLib.instanceWallet(walletInfo)
-    console.log('walletInfo: ', walletInfo)
-
-    const rootAddr = walletInfo.cashAddress
-    // const rootWif = walletInfo.privateKey
-    console.log(`Sweeping all funds into root address ${rootAddr}...`)
-
-    // Generate an HD tree
-    const bchjs = wallet.bchjs
-    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
-    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
-
-    let hdIndex = START_INDEX
-
-    do {
-      // Generate a keypair from the HD wallet.
-      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
-      const cashAddress = bchjs.HDNode.toCashAddress(childNode)
-      // const wifToSweep = bchjs.HDNode.toWIF(childNode)
-
-      console.log(`HD Index ${hdIndex}: ${cashAddress}`)
-
-      hdIndex++
-    } while (hdIndex < LAST_ADDR_INDEX)
-    console.log(`Last index of ${LAST_ADDR_INDEX} reached.`)
-  } catch (err) {
-    console.error('Error in sweepFunds(): ', err)
-  }
-}
-listAddrs()
-
-// Open the wallet file, or create one if the file doesn't exist.
-// Does not instance the wallet. The output of this function is expected to
-// be passed to instanceWallet().
-async function openWallet (walletLib) {
-  try {
-    // console.log('this.WALLET_FILE: ', this.WALLET_FILE)
-    const walletData = await walletLib.jsonFiles.readJSON('./wallet.json')
-
-    return walletData
-  } catch (err) {
-    console.error('Error in openWallet()')
-    throw err
-  }
-}

production/scripts/sweep-wallet.js

@@ -2,6 +2,8 @@
   This script will travers the HD wallet and sweep funds and tokens back
   into the root address (index 0). That root address needs to have funds
   to pay for the transactions.
+
+  This script will sweep BCH and fungible (Type 1) tokens, but not NFTs.
 */
 
 // Public npm libraries

shell-scripts/local-external-ipfs-node.sh

@@ -13,7 +13,7 @@ export COORD_NAME=ipfs-service-provider-generic
 export MNEMONIC="churn aisle shield silver ladder swear hunt slim pen demand spoil veteran"
 
 # 0 = less verbose. 3 = most verbose
-export DEBUG_LEVEL=0
+export DEBUG_LEVEL=2
 
 # Production settings that use external IPFS node.
 # https://github.com/christroutner/docker-ipfs

src/adapters/admin.js

@@ -51,38 +51,70 @@ class Admin {
   // used by the Listing Manager and test scripts, in order access private API
   // functions.
   async createSystemUser () {
+    // Create the system user.
     try {
-      const context = {
-        email: 'system@system.com',
-        name: 'admin',
-        password: _this.config.adminPassword || _this._randomString(20),
-        type: 'admin',
-        mnemonic: 'spread ivory oval pioneer flash gap merit nerve simple image entire trouble'
+      context.password = _this._randomString(20)
+
+      const options = {
+        method: 'POST',
+        url: `${LOCALHOST}/users`,
+        data: {
+          user: {
+            email: 'system@system.com',
+            password: context.password,
+            name: 'admin'
+          }
+        }
       }
-      // Check if the user already exists
-      let adminUser = await _this.User.findOne({ email: context.email })
+      const result = await _this.axios.request(options)
+      // console.log('admin.data: ', result.data)
 
-      if (adminUser) {
-        // Update the password
-        adminUser.password = context.password
-      } else {
-        // Create a new admin user
-        adminUser = new _this.User(context)
-      }
-      // Update context with the new user id and token
-      context.id = adminUser._id
-      context.token = await adminUser.generateToken()
+      context.email = result.data.user.email
+      context.id = result.data.user._id
+      context.token = result.data.token
 
-      // Save the user
-      await adminUser.save()
+      // Get the mongoDB entry
+      const user = await _this.User.findById(context.id)
 
-      // Write the user data to the JSON file
-      await _this.jsonFiles.writeJSON(context, JSON_PATH)
+      // Change the user type to admin
+      user.type = 'admin'
+      // console.log(`user created: ${JSON.stringify(user, null, 2)}`)
+
+      // Save the user model.
+      await user.save()
+
+      // console.log(`admin user created: ${JSON.stringify(result.body, null, 2)}`)
+      // console.log(`with password: ${context.password}`)
+
+      // Write out the system user information to a JSON file that external
+      // applications like the Task Manager and the test scripts can access.
+
+      await jsonFiles.writeJSON(context, JSON_PATH)
+      // console.log('context: ', context)
+      // console.log('JSON_PATH: ', JSON_PATH)
 
       return context
-    } catch (error) {
-      console.log('Error in admin.js/createSystemUser()')
-      throw error
+    } catch (err) {
+      // Handle existing system user.
+      if (err.response.status === 422) {
+        try {
+          // Delete the existing user
+          await _this.deleteExistingSystemUser()
+
+          // Call this function again.
+          return _this.createSystemUser()
+        } catch (err2) {
+          console.error(
+            'Error in admin.js/createSystemUser() while trying generate new system user.'
+          )
+          // process.end(1)
+          throw err2
+        }
+      } else {
+        console.log('Error in admin.js/createSystemUser: ')
+        // process.end(1)
+        throw err
+      }
     }
   }
 
@@ -97,7 +129,6 @@ class Admin {
       })
 
       await _this.User.deleteOne({ email: 'system@system.com' })
-      return true
     } catch (err) {
       console.log('Error in admin.js/deleteExistingSystemUser()')
       throw err
@@ -121,7 +152,7 @@ class Admin {
           Accept: 'application/json'
         },
         data: {
-          email: existingUser.email,
+          email: 'system@system.com',
           password: existingUser.password
         }
       }

src/adapters/index.js

@@ -9,21 +9,22 @@ import BCHJS from '@psf/bch-js'
 
 // Load individual adapter libraries.
 import IPFSAdapter from './ipfs/index.js'
+
 import LocalDB from './localdb/index.js'
 import LogsAPI from './logapi.js'
 import Passport from './passport.js'
 import Nodemailer from './nodemailer.js'
+
 // const { wlogger } = require('./wlogger')
 import JSONFiles from './json-files.js'
+
 import FullStackJWT from './fullstack-jwt.js'
 import config from '../../config/index.js'
-// import Wallet from './wallet.adapter.js'
 
 import BCHAdapter from './bch.js'
 import WalletAdapter from './wallet.js'
 import P2wdbAdapter from './p2wdb-adapter.js'
 import Webhook from './webhook.js'
-import NostrAdapter from './nostr.js'
 
 class Adapters {
   constructor (localConfig = {}) {
@@ -42,9 +43,6 @@ class Adapters {
     localConfig.bchWallet = this.wallet.bchWallet
     this.p2wdb = new P2wdbAdapter(localConfig)
     this.webhook = new Webhook()
-    this.nostr = new NostrAdapter(this.config)
-
-    // this.wallet = new Wallet(localConfig)
 
     // Get a valid JWT API key and instance bch-js.
     this.fullStackJwt = new FullStackJWT(config)
@@ -52,22 +50,14 @@ class Adapters {
 
   async start () {
     try {
-      // let apiToken
       if (this.config.getJwtAtStartup) {
         // Get a JWT token and instantiate bch-js with it. Then pass that instance
         // to all the rest of the apps controllers and adapters.
-        // apiToken = await this.fullStackJwt.getJWT()
+        await this.fullStackJwt.getJWT()
         // Instantiate bch-js with the JWT token, and overwrite the placeholder for bch-js.
         this.bchjs = await this.fullStackJwt.instanceBchjs()
       }
 
-      // Create a default instance of minimal-slp-wallet without initializing it
-      // (without retrieving the wallets UTXOs). This instance will be overwritten
-      // if the operator has configured BCH payments.
-      console.log('\nCreating default startup wallet. This wallet may be overwritten.')
-      // await this.wallet.instanceWalletWithoutInitialization({}, { apiToken })
-      this.bchjs = this.wallet.bchWallet.bchjs
-
       // Start the IPFS node.
       // Do not start these adapters if this is an e2e test.
       // if (this.config.env !== 'test') {
@@ -76,8 +66,6 @@ class Adapters {
 
       // Open the wallet file
       const walletData = await this.wallet.openWallet()
-      await this.nostr.start(walletData.privateKey)
-
       // console.log('walletData: ', walletData)
 
       if (this.config.env !== 'test') {
@@ -85,18 +73,11 @@ class Adapters {
         await this.wallet.instanceWallet(walletData, this.bchjs)
 
         // Wait until a webhook is established with the P2WDB
-        // await this.webhook.waitUntilSuccess(this.config.webhookTarget)
+        await this.webhook.waitUntilSuccess(this.config.webhookTarget)
 
         // Overwrite instances of wallet used by P2WDB lib.
         this.p2wdb.bchWallet = this.wallet.bchWallet
         this.p2wdb.bchjs = this.wallet.bchWallet.bchjs
-
-        if (this.config.useIpfs) {
-          await this.ipfs.start()
-        }
-      } else {
-        // These lines are here to ensure code coverage hits 100%.
-        console.log('Not starting IPFS node since this is an e2e test.')
       }
 
       console.log('Async Adapters have been started.')

src/adapters/ipfs/index.js

@@ -58,140 +58,6 @@ class IPFS {
       throw err
     }
   }
-
-  // Get the status of this IPFS node.
-  // Create an object with different metrics about this IPFS node, then return
-  // the object.
-  getStatus () {
-    try {
-      const statusObj = {
-        ipfsId: this.ipfsCoordAdapter.ipfsCoord.thisNode.ipfsId,
-        multiAddrs: this.ipfsCoordAdapter.ipfsCoord.thisNode.ipfsMultiaddrs,
-        bchAddr: this.ipfsCoordAdapter.ipfsCoord.thisNode.bchAddr,
-        slpAddr: this.ipfsCoordAdapter.ipfsCoord.thisNode.slpAddr,
-        pubKey: this.ipfsCoordAdapter.ipfsCoord.thisNode.pubKey,
-        peers: this.ipfsCoordAdapter.ipfsCoord.thisNode.peerList.length,
-        relays: this.ipfsCoordAdapter.ipfsCoord.thisNode.relayData.length
-      }
-
-      return statusObj
-    } catch (err) {
-      console.error('Error in ipfs-coord.js/getStatus()')
-      throw err
-    }
-  }
-
-  // Get details on the other peers this node is connected to.
-  async getPeers (showAll) {
-    try {
-      const peerData = this.ipfsCoordAdapter.ipfsCoord.thisNode.peerData
-      // console.log(`peerData: ${JSON.stringify(peerData, null, 2)}`)
-
-      let ipfsPeers =
-        await this.ipfsCoordAdapter.ipfsCoord.adapters.ipfs.getPeers()
-      // console.log('ipfsPeers: ', ipfsPeers)
-
-      ipfsPeers = this._removeDuplicatePeers(ipfsPeers)
-      // console.log('filtered ipfsPeers: ', ipfsPeers)
-
-      const peerDataOut = []
-
-      // Loop through each IPFS peer and hydrate it with data from the peerData.
-      for (let i = 0; i < ipfsPeers.length; i++) {
-        const thisPeer = {
-          peer: ipfsPeers[i]
-        }
-
-        // if (!showAll) {
-        //   // Delete properties that don't contain good info.
-        //   delete thisPeer.muxer
-        //   delete thisPeer.latency
-        //   delete thisPeer.streams
-        // }
-
-        // Get the ipfs-coord peer data for this peer.
-        let thisPeerData = peerData.filter((x) =>
-          x.from.includes(thisPeer.peer)
-        )
-        thisPeerData = thisPeerData[0]
-        // console.log('thisPeerData: ', thisPeerData)
-
-        // Skip if peerData for this IPFS peer could not be found.
-        // if (!thisPeerData) continue
-
-        try {
-          // console.log('thisPeerData: ', thisPeerData)
-
-          // Add data to the IPFS peer data.
-          thisPeer.name = thisPeerData.data.jsonLd.name
-          thisPeer.protocol = thisPeerData.data.jsonLd.protocol
-          thisPeer.version = thisPeerData.data.jsonLd.version
-          thisPeer.connectionAddr = thisPeerData.data.connectionAddr
-
-          if (showAll) {
-            // Add all the peer data.
-            thisPeer.peerData = thisPeerData
-          }
-        } catch (err) {
-          console.warn(
-            `warning: ${thisPeer.peer}: ${err.message}`
-          )
-        }
-
-        peerDataOut.push(thisPeer)
-      }
-
-      return peerDataOut
-    } catch (err) {
-      console.error('Error in getPeers(): ', err)
-      throw err
-    }
-  }
-
-  // Expects an array of peers and returns an array of peers with duplicates
-  // removed.
-  // This function is used by getPeers()
-  _removeDuplicatePeers (arr) {
-    // https://stackoverflow.com/questions/2218999/how-to-remove-all-duplicates-from-an-array-of-objects
-    return arr.filter((v, i, a) => a.findIndex((t) => t === v) === i)
-  }
-
-  // Get data about the known Circuit Relays. Hydrate with data from peers list.
-  getRelays () {
-    try {
-      const relayData = this.ipfsCoordAdapter.ipfsCoord.thisNode.relayData
-      const peerData = this.ipfsCoordAdapter.ipfsCoord.thisNode.peerData
-      // console.log(`relayData: ${JSON.stringify(relayData, null, 2)}`)
-      // console.log(`peerData: ${JSON.stringify(peerData, null, 2)}`)
-
-      for (let i = 0; i < relayData.length; i++) {
-        const thisRelay = relayData[i]
-
-        // Find the peer that corresponds to this relay.
-        const thisPeer = peerData.filter((x) =>
-          x.from.includes(thisRelay.ipfsId)
-        )
-        // console.log('thisPeer: ', thisPeer)
-
-        // If the peer couldn't be found, skip.
-        if (!thisPeer.length) {
-          thisRelay.name = ''
-          thisRelay.description = ''
-          continue
-        }
-
-        thisRelay.name = thisPeer[0].data.jsonLd.name
-        thisRelay.description = thisPeer[0].data.jsonLd.description
-      }
-
-      const v1Relays = this.config.v1Relays
-
-      return { v2Relays: relayData, v1Relays }
-    } catch (err) {
-      console.error('Error in getRelays(): ', err)
-      throw err
-    }
-  }
 }
 
 export default IPFS

src/adapters/ipfs/ipfs-coord.js

@@ -5,12 +5,11 @@
 */
 
 // Global npm libraries
-// import IpfsCoord from 'ipfs-coord-esm'
-import IpfsCoord from 'helia-coord'
+import IpfsCoord from 'ipfs-coord-esm'
 
 // import BCHJS from '@psf/bch-js';
 import SlpWallet from 'minimal-slp-wallet'
-import { publicIpv4 } from 'public-ip'
+import publicIp from 'public-ip'
 
 // Local libraries
 import config from '../../../config/index.js'
@@ -35,7 +34,7 @@ class IpfsCoordAdapter {
     // this.bchjs = new BCHJS()
     this.wallet = new SlpWallet()
     this.config = config
-    this.publicIp = publicIpv4
+    this.publicIp = publicIp
 
     // Properties of this class instance.
     this.isReady = false
@@ -52,7 +51,7 @@ class IpfsCoordAdapter {
     // If configured as a Circuit Relay, get the public IP addresses for this node.
     if (this.config.isCircuitRelay) {
       try {
-        const ip4 = await this.publicIp()
+        const ip4 = await this.publicIp.v4()
         // const ip6 = await publicIp.v6()
 
         circuitRelayInfo.ip4 = ip4
@@ -65,28 +64,23 @@ class IpfsCoordAdapter {
       }
     }
 
-    const nullLog = () => {}
-
     const ipfsCoordOptions = {
       ipfs: this.ipfs,
       type: 'node.js',
       // type: 'browser',
       wallet: this.wallet,
-      // privateLog: console.log, // Default to console.log
-      privateLog: nullLog,
+      privateLog: console.log, // Default to console.log
       isCircuitRelay: this.config.isCircuitRelay,
       circuitRelayInfo,
       apiInfo: this.config.apiInfo,
       announceJsonLd: this.config.announceJsonLd,
-      debugLevel: this.config.debugLevel,
-      v1Relays: this.config.v1Relays,
-      tcpPort: this.config.ipfsTcpPort
+      debugLevel: this.config.debugLevel
     }
 
     // Production env uses external go-ipfs node.
-    // if (this.config.isProduction) {
-    //   ipfsCoordOptions.nodeType = 'external'
-    // }
+    if (this.config.isProduction) {
+      ipfsCoordOptions.nodeType = 'external'
+    }
 
     this.ipfsCoord = new this.IpfsCoord(ipfsCoordOptions)
 
@@ -113,12 +107,9 @@ class IpfsCoordAdapter {
 
   // Subscribe to the chat pubsub channel
   async subscribeToChat () {
-    // TODO: Allow user to replace nullog with their own log handler at startup.
-    const nullLog = () => {}
-
     await this.ipfsCoord.adapters.pubsub.subscribeToPubsubChannel(
       this.config.chatPubSubChan,
-      nullLog,
+      console.log,
       this.ipfsCoord.thisNode
     )
   }

src/adapters/ipfs/ipfs.js

@@ -9,98 +9,95 @@
 */
 
 // Global npm libraries
-import { createHelia } from 'helia'
+// const IPFS = require('ipfs')
+// const IPFS = require('@chris.troutner/ipfs')
+// import IPFSembedded from 'ipfs';
+
+import { create } from 'ipfs-http-client'
 import fs from 'fs'
-import { FsBlockstore } from 'blockstore-fs'
-import { FsDatastore } from 'datastore-fs'
-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 { identifyService } from 'libp2p/identify'
-import { identify, identifyPush } from '@libp2p/identify'
-import { circuitRelayServer, circuitRelayTransport } from '@libp2p/circuit-relay-v2'
-// import { circuitRelayServer } from '@libp2p/circuit-relay-v2'
-import { gossipsub } from '@chainsafe/libp2p-gossipsub'
-import { webSockets } from '@libp2p/websockets'
-import { publicIpv4 } from 'public-ip'
-import { multiaddr } from '@multiformats/multiaddr'
-import { webRTC, webRTCDirect } from '@libp2p/webrtc'
-import { keychain } from '@libp2p/keychain'
-import { unixfs } from '@helia/unixfs'
-// import { generateKeyPairFromSeed } from '@libp2p/crypto/keys'
-// import crypto from 'crypto'
-import { ping } from '@libp2p/ping'
-import { loadOrCreateSelfKey } from '@libp2p/config'
+import http from 'http'
 
 // Local libraries
 import config from '../../../config/index.js'
-import JsonFiles from '../json-files.js'
 
-// Hack to get __dirname back.
-// https://blog.logrocket.com/alternatives-dirname-node-js-es-modules/
-import * as url from 'url'
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
-// console.log('__dirname: ', __dirname)
-
-const ROOT_DIR = `${__dirname}../../../`
-const IPFS_DIR = `${__dirname}../../../.ipfsdata/ipfs`
+const IPFS_DIR = './.ipfsdata/ipfs'
 
 class IpfsAdapter {
   constructor (localConfig) {
     // Encapsulate dependencies
     this.config = config
     this.fs = fs
-    this.createLibp2p = createLibp2p
-    this.publicIp = publicIpv4
-    this.multiaddr = multiaddr
-    this.jsonFiles = new JsonFiles()
-    this.keychain = keychain
-    this.createHelia = createHelia
+    this.create = create
+
+    // Choose the IPFS constructor based on the config settings.
+    // this.IPFS = IPFSembedded // default
+    // if (this.config.isProduction) {
+    //   this.IPFS = IPFSexternal
+    // }
 
     // Properties of this class instance.
     this.isReady = false
-
-    // Bind 'this' object to all subfunctions
-    this.start = this.start.bind(this)
-    this.createNode = this.createNode.bind(this)
-    this.stop = this.stop.bind(this)
-    this.ensureBlocksDir = this.ensureBlocksDir.bind(this)
-    // this.getPrivateKey = this.getPrivateKey.bind(this)
-    this.getSeed = this.getSeed.bind(this)
   }
 
   // Start an IPFS node.
   async start () {
     try {
-      // Ensure the directory structure exists that is needed by the IPFS node to store data.
-      this.ensureBlocksDir()
+      // Ipfs Options
+      const ipfsOptionsEmbedded = {
+        repo: IPFS_DIR,
+        start: true,
+        config: {
+          relay: {
+            enabled: true, // enable circuit relay dialer and listener
+            hop: {
+              enabled: config.isCircuitRelay // enable circuit relay HOP (make this node a relay)
+            }
+          },
+          pubsub: true, // enable pubsub
+          Swarm: {
+            ConnMgr: {
+              HighWater: 30,
+              LowWater: 10
+            }
+          },
+          Addresses: {
+            Swarm: [
+              `/ip4/0.0.0.0/tcp/${this.config.ipfsTcpPort}`,
+              `/ip4/0.0.0.0/tcp/${this.config.ipfsWsPort}/ws`
+            ]
+          },
+          Datastore: {
+            StorageMax: '2GB',
+            StorageGCWatermark: 50,
+            GCPeriod: '15m'
+          }
+        }
+      }
 
-      // Create an IPFS node
-      const ipfs = await this.createNode()
-      // console.log('ipfs: ', ipfs)
+      const ipfsOptionsExternal = {
+        host: this.config.ipfsHost,
+        port: this.config.ipfsApiPort,
+        agent: http.Agent({ keepAlive: true, maxSockets: 2000 })
+      }
 
-      this.id = ipfs.libp2p.peerId.toString()
-      console.log('IPFS ID: ', this.id)
+      let ipfsOptions = ipfsOptionsEmbedded
+      if (this.config.isProduction) {
+        ipfsOptions = ipfsOptionsExternal
+      }
 
-      // Attempt to guess our ip4 IP address.
-      const ip4 = await this.publicIp()
-      let detectedMultiaddr = `/ip4/${ip4}/tcp/${this.config.ipfsTcpPort}/p2p/${this.id}`
-      detectedMultiaddr = this.multiaddr(detectedMultiaddr)
+      // Create a new IPFS node.
+      this.ipfs = await this.create(ipfsOptions)
 
-      // Get the multiaddrs for the node.
-      const multiaddrs = ipfs.libp2p.getMultiaddrs()
-      multiaddrs.push(detectedMultiaddr)
-      console.log('Multiaddrs: ', multiaddrs)
+      // Set the 'server' profile so the node does not scan private networks.
+      await this.ipfs.config.profiles.apply('server')
 
-      this.multiaddrs = multiaddrs
+      // Debugging: Display IPFS config settings.
+      // const configSettings = await this.ipfs.config.getAll()
+      // console.log(`configSettings: ${JSON.stringify(configSettings, null, 2)}`)
 
       // Signal that this adapter is ready.
       this.isReady = true
 
-      this.ipfs = ipfs
-
       return this.ipfs
     } catch (err) {
       console.error('Error in ipfs.js/start()')
@@ -114,202 +111,30 @@ class IpfsAdapter {
     }
   }
 
-  // This function creates an IPFS node using Helia.
-  // It returns the node as an object.
-  async createNode () {
-    try {
-      // Create block and data stores.
-      const blockstore = new FsBlockstore(`${IPFS_DIR}/blockstore`)
-      const datastore = new FsDatastore(`${IPFS_DIR}/datastore`)
-
-      // Get the private key.
-      // const privateKey = await this.getPrivateKey()
-      // console.log('privateKey: ', privateKey)
-
-      // Create an identity
-      const keychainInit = {
-        selfKey: 'myKey',
-        pass: await this.getSeed()
-      }
-      const privateKey = await loadOrCreateSelfKey(datastore, keychainInit)
-
-      // Configure services
-      const services = {
-        identify: identify(),
-        identifyPush: identifyPush(),
-        pubsub: gossipsub({ allowPublishToZeroTopicPeers: true }),
-        ping: ping(),
-        keychain: keychain(keychainInit)
-      }
-      if (this.config.isCircuitRelay) {
-        console.log('Helia (IPFS) node IS configured as Circuit Relay')
-        services.relay = circuitRelayServer({ // makes the node function as a relay server
-          hopTimeout: 30 * 1000, // incoming relay requests must be resolved within this time limit
-          reservations: {
-            maxReservations: 15, // how many peers are allowed to reserve relay slots on this server
-            reservationClearInterval: 300 * 1000, // how often to reclaim stale reservations
-            applyDefaultLimit: true, // whether to apply default data/duration limits to each relayed connection
-            defaultDurationLimit: 2 * 60 * 1000, // the default maximum amount of time a relayed connection can be open for
-            defaultDataLimit: BigInt(2 << 7) // the default maximum number of bytes that can be transferred over a relayed connection
-          },
-          maxInboundHopStreams: 32, // how many inbound HOP streams are allow simultaneously
-          maxOutboundHopStreams: 64 // how many outbound HOP streams are allow simultaneously
-        })
-      } else {
-        console.log('Helia (IPFS) node IS NOT configured as Circuit Relay')
-      }
-
-      const transports = [
-        tcp(),
-        webSockets(),
-        circuitRelayTransport({
-          discoverRelays: 3,
-          reservationConcurrency: 3
-        }),
-        webRTC(),
-        webRTCDirect()
-      ]
-
-      // libp2p is the networking layer that underpins Helia
-      const libp2p = await this.createLibp2p({
-        // peerId,
-        privateKey,
-        datastore,
-        addresses: {
-          listen: [
-            '/ip4/127.0.0.1/tcp/0',
-            `/ip4/0.0.0.0/tcp/${this.config.ipfsTcpPort}`,
-            `/ip4/0.0.0.0/tcp/${this.config.ipfsWsPort}/ws`,
-            '/webrtc',
-            '/p2p-circuit'
-          ]
-        },
-        transports,
-        connectionEncrypters: [
-          noise()
-        ],
-        streamMuxers: [
-          yamux()
-        ],
-        services
-      })
-
-      // create a Helia node
-      const helia = await this.createHelia({
-        blockstore,
-        datastore,
-        libp2p
-      })
-
-      // Attach IPFS file system.
-      const fs = unixfs(helia)
-      helia.fs = fs
-
-      return helia
-    } catch (err) {
-      console.error('Error creating Helia node: ', err)
-
-      throw err
-    }
-  }
-
   async stop () {
     await this.ipfs.stop()
 
     return true
   }
 
-  // Ensure that the directories exist to store blocks from the IPFS network.
-  // This function is called at startup, before the IPFS node is started.
-  ensureBlocksDir () {
-    try {
-      !this.fs.existsSync(`${ROOT_DIR}.ipfsdata`) && this.fs.mkdirSync(`${ROOT_DIR}.ipfsdata`)
-
-      !this.fs.existsSync(`${IPFS_DIR}`) && this.fs.mkdirSync(`${IPFS_DIR}`)
-
-      !this.fs.existsSync(`${IPFS_DIR}/blockstore`) && this.fs.mkdirSync(`${IPFS_DIR}/blockstore`)
-
-      !this.fs.existsSync(`${IPFS_DIR}/datastore`) && this.fs.mkdirSync(`${IPFS_DIR}/datastore`)
-
-      !this.fs.existsSync(`${IPFS_DIR}/datastore/pkcs8`) && this.fs.mkdirSync(`${IPFS_DIR}/datastore/pkcs8`)
-
-      // !fs.existsSync(`${IPFS_DIR}/datastore/peers`) && fs.mkdirSync(`${IPFS_DIR}/datastore/peers`)
-
-      return true
-    } catch (err) {
-      console.error('Error in adapters/ipfs.js/ensureBlocksDir(): ', err)
-      throw err
-    }
-  }
-
-  // This function opens the seed used to generate the key for this IPFS peer.
-  // The seed is stored in a JSON file. If it doesn't exist, a new one is created.
-  async getSeed () {
-    try {
-      let seed
-
-      const filename = `${IPFS_DIR}/seed.json`
-
-      try {
-        // Try to read the JSON file containing the seed.
-        seed = await this.jsonFiles.readJSON(filename)
-      } catch (err) {
-        const seedNum = Math.floor(Math.random() * 1000000000000000000000)
-        seed = seedNum.toString()
-
-        // Save the newly generated seed
-        await this.jsonFiles.writeJSON(seed, filename)
-      }
-
-      // console.log('getSeed() seed: ', seed)
-
-      return seed
-    } catch (err) {
-      console.error('Error in adapters/ipfs/ipfs.js/getSeed()')
-      throw err
-    }
-  }
-
-  // Get the private key from disk, or generate a new one and save it,
-  // if it doesn't exist.
-  // async getPrivateKey () {
-  //   try {
-  //     const filename = `${IPFS_DIR}/privkey.json`
-
-  //     let privKeyHex
-  //     try {
-  //       // Try to read the JSON file containing the seed.
-  //       privKeyHex = await this.jsonFiles.readJSON(filename)
-  //       // console.log('saved privKeyHex: ', privKeyHex)
-  //     } catch (err) {
-  //       // Generate a new private key and save it to disk.
-
-  //       // Generate a new private key and save it to disk.
-  //       const randomBuffer = crypto.randomBytes(32)
-  //       // console.log('randomBuffer: ', randomBuffer)
-
-  //       privKeyHex = randomBuffer.toString('hex')
-  //       // console.log('new privKeyHex: ', privKeyHex)
-
-  //       // Save the newly generated seed
-  //       await this.jsonFiles.writeJSON(privKeyHex, filename)
-  //     }
-
-  //     // Convert the saved hex string to a buffer.
-  //     const privKeyBuf = Buffer.from(privKeyHex, 'hex')
-
-  //     // Convert the buffer to a Uint8Array 'seed'
-  //     const seed = new Uint8Array(privKeyBuf.buffer, privKeyBuf.byteOffset, privKeyBuf.byteLength)
-  //     // console.log('seed: ', seed)
-
-  //     // Generate a ED25519 key pair.
-  //     const privKey = await generateKeyPairFromSeed('Ed25519', seed)
-
-  //     return privKey
-  //   } catch (err) {
-  //     console.error('Error in adapters/ipfs/ipfs.js/getPrivateKey(): ', err)
-  //     throw err
-  //   }
+  // Remove the '/blocks' directory that is used to store IPFS data.
+  // Dev Note: It's assumed this node is not pinning any data and that
+  // everything in this directory is transient. This folder will regularly
+  // fill up and prevent IPFS from starting.
+  // rmBlocksDir () {
+  //  try {
+  //    const dir = `${IPFS_DIR}/blocks`
+  //    console.log(`Deleting ${dir} directory...`)
+  //
+  //    this.fs.rmdirSync(dir, { recursive: true })
+  //
+  //    console.log(`${dir} directory is deleted!`)
+  //
+  //    return true // Signal successful execution.
+  //  } catch (err) {
+  //    console.log('Error in rmBlocksDir()')
+  //    throw err
+  //  }
   // }
 }
 

src/adapters/localdb/models/offer.js

@@ -34,8 +34,7 @@ const Offer = new mongoose.Schema({
   // SWaP Protocol Properties
   lokadId: { type: String },
   messageType: { type: Number },
-  messageClass: { type: Number },
-  nostrEventId: { type: String } // Nostr Event Id.
+  messageClass: { type: Number }
 
 })
 

src/adapters/localdb/models/order.js

@@ -10,20 +10,20 @@ import mongoose from 'mongoose'
 
 const Order = new mongoose.Schema({
   // Token data
-  tokenId: { type: String, required: true },
-  utxoTxid: { type: String, required: true },
-  utxoVout: { type: Number, required: true },
-  ticker: { type: String, required: true },
-  tokenType: { type: Number, required: true },
+  tokenId: { type: String },
+  utxoTxid: { type: String },
+  utxoVout: { type: Number },
+  ticker: { type: String },
+  tokenType: { type: Number },
 
   // Trade data
-  buyOrSell: { type: String, required: true },
-  numTokens: { type: Number, required: true },
-  rateInBaseUnit: { type: String, required: true },
+  buyOrSell: { type: String },
+  numTokens: { type: Number },
+  rateInBaseUnit: { type: String },
   minUnitsToExchange: { type: String },
   p2wdbTxid: { type: String },
   p2wdbHash: { type: String },
-  makerAddr: { type: String, required: true },
+  makerAddr: { type: String },
 
   // Authentication data
   signature: { type: String },
@@ -32,16 +32,12 @@ const Order = new mongoose.Schema({
   offerPubKey: { type: String },
 
   // Wallet Data
-  hdIndex: { type: Number, required: true }, // HD index address holding the UTXO for this offer.
+  hdIndex: { type: Number }, // HD index address holding the UTXO for this offer.
 
   // SWaP Protocol Properties
   lokadId: { type: String },
   messageType: { type: Number },
-  messageClass: { type: Number },
-  nostrEventId: { type: String, required: true }, // Nostr Event Id.
-
-  // Additional properties found in createOrder
-  dataType: { type: String, required: true }
+  messageClass: { type: Number }
 })
 
 export default mongoose.model('order', Order)

src/adapters/localdb/models/users.js

@@ -11,7 +11,6 @@ const User = new mongoose.Schema({
   name: { type: String },
   username: { type: String },
   password: { type: String, required: true },
-  mnemonic: { type: String, required: true },
   email: {
     type: String,
     required: true,

src/adapters/nostr.js

@@ -1,136 +0,0 @@
-/*
-  Adapter library for working with Nostr.
-*/
-
-// Global npm libraries
-import BchNostr from 'bch-nostr'
-import { RelayPool } from 'nostr'
-import RetryQueue from '@chris.troutner/retry-queue'
-import * as nip19 from 'nostr-tools/nip19'
-
-class NostrAdapter {
-  constructor (localConfig = { nostrRelay: '', nostrTopic: '' }) {
-    this.relayWs = localConfig.nostrRelay //
-    this.topic = localConfig.nostrTopic
-
-    if (!this.relayWs) {
-      throw new Error(
-        '"nostrRelay" must be passed when instantiate NostrAdapter'
-      )
-    }
-
-    if (!this.topic) {
-      throw new Error(
-        '"nostrTopic" must be passed when instantiate NostrAdapter'
-      )
-    }
-
-    // Encapsulate dependencies
-    this.bchNostr = new BchNostr()
-    this.RelayPool = RelayPool
-    this.retryQueue = new RetryQueue({
-      concurrency: 1,
-      attempts: 5,
-      retryPeriod: 1000
-    })
-
-    // Bind the 'this' object
-    this.start = this.start.bind(this)
-    this.post = this.post.bind(this)
-    this.read = this.read.bind(this)
-    this.eventId2note = this.eventId2note.bind(this)
-  }
-
-  // Create nostr keys.
-  // NOTE:  WIF must be provided in this function instead the constructor function
-  // we can provide it after app wallet creation.
-  async start (WIF) {
-    try {
-      if (!WIF || typeof WIF !== 'string') {
-        throw new Error('WIF must be a string!')
-      }
-
-      const { privKeyBuf, nostrPubKey } =
-        this.bchNostr.keys.createNostrPubKeyFromWif({ wif: WIF })
-
-      this.privKeyBuf = privKeyBuf
-      this.nostrPubKey = nostrPubKey
-
-      console.log(`Nostr Pub Key : ${nostrPubKey}`)
-
-      return true
-    } catch (error) {
-      console.log(`Error in nostr.js/start() ${error.message} `)
-      throw error
-    }
-  }
-
-  // Post a message over the instance-topic.
-  async post (msg = '') {
-    try {
-      if (!msg || typeof msg !== 'string') {
-        throw new Error('msg must be a string!')
-      }
-
-      const inObj = {
-        kind: 867,
-        privKeyBuf: this.privKeyBuf,
-        nostrPubKey: this.nostrPubKey,
-        relayWs: this.relayWs,
-        msg,
-        tags: [['t', this.topic]]
-      }
-      const eventId = await this.retryQueue.addToQueue(this.bchNostr.post.uploadToNostr, inObj)
-      return eventId
-    } catch (error) {
-      console.log(`Error in nostr.js/post() ${error.message} `)
-      throw error
-    }
-  }
-
-  // Read a message over the instance-topic.
-  async read (limit = 10) {
-    try {
-      if (typeof limit !== 'number' || limit < 1) {
-        throw new Error('Limit must be greater than 0')
-      }
-
-      const relays = [this.relayWs]
-      const pool = this.RelayPool(relays)
-
-      const nostrData = new Promise((resolve, reject) => {
-        const messages = []
-
-        pool.on('open', (relay) => {
-          // relay.subscribe('REQ', { ids: [eventId] })
-          relay.subscribe('REQ', { limit, kinds: [867], '#t': [this.topic] })
-        })
-
-        pool.on('eose', (relay) => {
-          relay.close()
-          resolve(messages)
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          // console.log('ev: ', ev)
-          messages.push({ content: ev.content, eventId: ev.id })
-        })
-      })
-
-      const messages = await nostrData
-
-      return messages
-    } catch (error) {
-      console.log(`Error in nostr.js/read() ${error.message} `)
-      throw error
-    }
-  }
-
-  // Convert an Event ID into a `noteabc..` syntax that Astral expects.
-  // This can be used to generate a link to Astral to display the post.
-  eventId2note (eventId) {
-    return nip19.noteEncode(eventId)
-  }
-}
-
-export default NostrAdapter

src/adapters/wallet.adapter.js

@@ -1,251 +0,0 @@
-/*
-  Wallet adapter. This library instantiates minimal-slp-wallet based on different
-  configuration settings. That single instance of minimal-slp-wallet is then
-  easily passed around the rest of this application.
-*/
-
-// Global npm libraries
-import BchWallet from 'minimal-slp-wallet'
-
-// Local libraries
-import config from '../../config/index.js'
-import JsonFiles from './json-files.js'
-
-class Wallet {
-  constructor (localConfig = {}) {
-    // Encapsulate dependencies
-    this.config = config
-    this.BchWallet = BchWallet
-    this.jsonFiles = new JsonFiles()
-
-    // Bind 'this' object to all subfunctions
-    this.instanceWalletWithoutInitialization = this.instanceWalletWithoutInitialization.bind(this)
-    this._instanceWallet = this._instanceWallet.bind(this)
-    this.openWallet = this.openWallet.bind(this)
-    this.instanceWallet = this.instanceWallet.bind(this)
-    this.incrementNextAddress = this.incrementNextAddress.bind(this)
-    this.getKeyPair = this.getKeyPair.bind(this)
-    this.optimize = this.optimize.bind(this)
-    this.getBalance = this.getBalance.bind(this)
-  }
-
-  // This is used for initializing the wallet, without waiting to update the wallet
-  // UTXOs from the blockchain.
-  // This is useful when the wallet is simply needed to make calls to the blockchain,
-  // and there is no need to hydrate it with UTXO data.
-  async instanceWalletWithoutInitialization (walletData = {}, advancedConfig = {}) {
-    try {
-      // Use the apiToken from the config settings, if one is not passed-in at
-      // run-time.
-      if (!advancedConfig.apiToken) {
-        advancedConfig.apiToken = this.config.apiToken
-      }
-
-      // If an authentication password is passed in the config, add it.
-      if (this.config.authPass) {
-        advancedConfig.authPass = this.config.authPass
-      }
-
-      // Detect and configure different blockchain infrastructure settings.
-      if (this.config.walletInterface === 'web2') {
-        advancedConfig.interface = 'rest-api'
-        advancedConfig.restURL = this.config.apiServer
-      } else {
-        // By default use the web3 Cash Stack (https://cashstack.info)
-        advancedConfig.interface = 'consumer-api'
-        advancedConfig.restURL = this.config.apiServer
-      }
-
-      // console.log('advancedConfig setting when creating wallet: ', advancedConfig)
-
-      // Instantiate minimal-slp-wallet.
-      if (walletData.mnemonic) {
-        // Instance the wallet using the mnemonic passed in to this function.
-        console.log('Mnemonic provided to wallet library from calling function.')
-        this.bchWallet = await this._instanceWallet(walletData.mnemonic, advancedConfig)
-      } else if (this.config.mnemonic) {
-        // Otherwise use the mnemonic in the config setting or passed as an environment variable.
-        console.log('Mnemonic retrieved from config file or environment variable.')
-        this.bchWallet = await this._instanceWallet(this.config.mnemonic, advancedConfig)
-      } else {
-        // If no mnemonic is provided, then generate a new mnemonic to create the wallet.
-        console.log('New mnemonic generated.')
-        this.bchWallet = await this._instanceWallet(undefined, advancedConfig)
-      }
-
-      // Wait for wallet to initialize.
-      await this.bchWallet.walletInfoPromise
-      console.log('BCH wallet initialized.')
-      console.log(`Wallet address: ${this.bchWallet.walletInfo.cashAddress}`)
-      console.log(`Wallet mnemonic: ${this.bchWallet.walletInfo.mnemonic}`)
-
-      return this.bchWallet
-    } catch (err) {
-      console.error('Error in instanceWalletWithoutInitialization()')
-      throw err
-    }
-  }
-
-  // This function is used for easier mocking of unit tests.
-  async _instanceWallet (mnemonic, config) {
-    const wallet = new this.BchWallet(mnemonic, config)
-    await wallet.walletInfoPromise
-
-    return wallet
-  }
-
-  // Open the wallet file, or create one if the file doesn't exist.
-  // Does not instance the wallet. The output of this function is expected to
-  // be passed to instanceWallet().
-  async openWallet (advancedConfig = {}) {
-    try {
-      let walletData
-
-      // Try to open the wallet.json file.
-      try {
-        walletData = await this.jsonFiles.readJSON(this.config.walletFile)
-        walletData = walletData.wallet
-      } catch (err) {
-        // Create a new wallet file if one does not already exist.
-        console.log('Wallet file not found. Creating new wallet.json file.')
-
-        // Create a new wallet.
-        // No-Update flag creates wallet without making any network calls.
-        const walletInstance = await this.instanceWalletWithoutInitialization({}, advancedConfig)
-
-        walletData = walletInstance.walletInfo
-
-        // Add the nextAddress property
-        walletData.nextAddress = 1
-
-        // Write the wallet data to the JSON file.
-        await this.jsonFiles.writeJSON({ wallet: walletData }, this.config.walletFile)
-      }
-
-      // console.log('walletData: ', walletData)
-      return walletData
-    } catch (err) {
-      console.error('Error in openWallet()')
-      throw err
-    }
-  }
-
-  // Create an instance of minimal-slp-wallet. Same as
-  // instanceWalletWithoutInitialization(), but waits for the wallet to initialize
-  // its UTXOs (wallet balance and tokens).
-  async instanceWallet (walletData = {}, advancedConfig = {}) {
-    try {
-      // Instance the wallet without initialization.
-      await this.instanceWalletWithoutInitialization(walletData, advancedConfig)
-
-      // Initialize the wallet
-      await this.bchWallet.initialize()
-
-      return this.bchWallet
-    } catch (err) {
-      console.error('Error in wallet.js/instanceWallet()')
-      throw err
-    }
-  }
-
-  // Increments the 'nextAddress' property in the wallet file. This property
-  // indicates the HD index that should be used to generate a key pair for
-  // storing funds for Offers.
-  // This function opens the wallet file, increments the nextAddress property,
-  // then saves the change to the wallet file.
-  async incrementNextAddress () {
-    try {
-      const walletData = await this.openWallet()
-
-      await this.instanceWalletWithoutInitialization(walletData)
-
-      walletData.nextAddress++
-      // console.log('walletData finish: ', walletData)
-
-      await this.jsonFiles.writeJSON({ wallet: walletData }, this.config.walletFile)
-
-      // Update the working instance of the wallet.
-      this.bchWallet.walletInfo.nextAddress++
-      // console.log('this.bchWallet.walletInfo: ', this.bchWallet.walletInfo)
-
-      return walletData.nextAddress
-    } catch (err) {
-      console.error('Error in incrementNextAddress()')
-      throw err
-    }
-  }
-
-  // This method returns an object that contains a private key WIF, public address,
-  // and the index of the HD wallet that the key pair was generated from.
-  // TODO: Allow input integer. If input is used, use that as the index. If no
-  // input is provided, then call incrementNextAddress().
-  async getKeyPair (hdIndex = 0) {
-    try {
-      if (!hdIndex) {
-        // Increment the HD index and generate a new key pair.
-        hdIndex = await this.incrementNextAddress()
-      }
-
-      const mnemonic = this.bchWallet.walletInfo.mnemonic
-
-      // root seed buffer
-      const rootSeed = await this.bchWallet.bchjs.Mnemonic.toSeed(mnemonic)
-      const masterHDNode = this.bchWallet.bchjs.HDNode.fromSeed(rootSeed)
-
-      // HDNode of BIP44 account
-      // const account = this.bchWallet.bchjs.HDNode.derivePath(masterHDNode, "m/44'/245'/0'")
-      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
-      const cashAddress = this.bchWallet.bchjs.HDNode.toCashAddress(childNode)
-      console.log('Generating a new key pair for cashAddress: ', cashAddress)
-
-      const wif = this.bchWallet.bchjs.HDNode.toWIF(childNode)
-
-      const outObj = {
-        cashAddress,
-        wif,
-        hdIndex
-      }
-      return outObj
-    } catch (err) {
-      console.error('Error in getKeyPair()')
-      throw err
-    }
-  }
-
-  // Optimize the wallet by consolidating the UTXOs.
-  async optimize () {
-    const UTXO_THREASHOLD = 7
-    // Do a dry-run first to see if there are enough UTXOs worth consolidating.
-    const dryRunOut = await this.bchWallet.optimize(true)
-    if (dryRunOut.bchUtxoCnt > UTXO_THREASHOLD) {
-      // Consolidate BCH UTXOs if the count is above the threashold.
-      const txids = await this.bchWallet.optimize()
-      console.log(`Wallet optimized with these return values: ${JSON.stringify(txids, null, 2)}`)
-    }
-    return true
-  }
-
-  // Get the balance of the wallet in sats and PSF tokens.
-  // This function is called by the GET /entry/balance controller.
-  async getBalance () {
-    const balance = await this.bchWallet.getBalance()
-    // console.log('balance: ', balance)
-    const tokens = await this.bchWallet.listTokens()
-    // console.log('tokens: ', tokens)
-    // Find the array entry for the PSF token
-    const psfTokens = tokens.find(x => x.tokenId === '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0')
-    // console.log('psfTokens: ', psfTokens)
-    let psfBalance = 0
-    if (psfTokens) {
-      psfBalance = psfTokens.qty
-    }
-    const outObj = {
-      satBalance: balance,
-      psfBalance,
-      success: true
-    }
-    return outObj
-  }
-}
-
-export default Wallet

src/adapters/wallet.js

@@ -1,17 +1,15 @@
 /*
   Adapter library for working with a wallet.
-  This library is specific to bch-dex. The other wallet adapter library is
-  inherited from ipfs-service-provider.
 */
 
 // Public npm libraries
 import BchWallet from 'minimal-slp-wallet'
-import BchTokenSweep from 'bch-token-sweep/index.js'
+
 import bitcoinJs from 'bitcoincashjs-lib'
-import RetryQueue from '@chris.troutner/retry-queue'
 
 // Local libraries
 import JsonFiles from './json-files.js'
+
 import config from '../../config/index.js'
 
 // Hack to get __dirname back.
@@ -24,8 +22,6 @@ const WALLET_FILE = `${__dirname.toString()}/../../wallet.json`
 // const P2WDB_TOKEN_ID =
 // '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0'
 
-const advancedConfig = {}
-
 class WalletAdapter {
   constructor (localConfig = {}) {
     // Encapsulate dependencies
@@ -35,26 +31,9 @@ class WalletAdapter {
     this.bitcoinJs = bitcoinJs
     this.BchWallet = BchWallet
     this.bchWallet = {} // Will be replaced when initialized.
-    // this.advancedConfig = localConfig.advancedConfig
-    this.retryQueue = new RetryQueue({
-      concurrency: 1,
-      attempts: 5,
-      retryPeriod: 5000
-    })
 
     // Bind the 'this' object
-    this.openWallet = this.openWallet.bind(this)
-    this.instanceWallet = this.instanceWallet.bind(this)
-    this.incrementNextAddress = this.incrementNextAddress.bind(this)
-    this.getKeyPair = this.getKeyPair.bind(this)
-    this.generateSignature = this.generateSignature.bind(this)
-    this.generatePartialTx = this.generatePartialTx.bind(this)
     this.moveTokens = this.moveTokens.bind(this)
-    this.moveBch = this.moveBch.bind(this)
-    this.deseralizeTx = this.deseralizeTx.bind(this)
-    this.completeTx = this.completeTx.bind(this)
-    this.reclaimTokens = this.reclaimTokens.bind(this)
-    this.moveTokensFromCustomWallet = this.moveTokensFromCustomWallet.bind(this)
   }
 
   // Open the wallet file, or create one if the file doesn't exist.
@@ -108,7 +87,7 @@ class WalletAdapter {
         throw new Error('Wallet data is not formatted correctly. Can not read mnemonic in wallet file!')
       }
 
-      // const advancedConfig = {}
+      const advancedConfig = {}
       console.log(`Using FullStack.cash: ${this.config.useFullStackCash}`)
       if (this.config.useFullStackCash) {
         advancedConfig.interface = 'rest-api'
@@ -362,7 +341,7 @@ class WalletAdapter {
       throw err
     }
 
-    // return true
+  // return true
   }
 
   // Move tokens to an address controlled by the HD wallet, to generate a
@@ -458,7 +437,7 @@ class WalletAdapter {
 
       return txObj2
     } catch (err) {
-      console.error('Error in wallet.js/deserializeTx()')
+      console.error('Error in wallet.js/deserializePartialTx()')
       throw err
     }
   }
@@ -467,15 +446,7 @@ class WalletAdapter {
   // then broadcasting the transaction to the network.
   async completeTx (hex, hdIndex) {
     try {
-      // Input validation
-      if (!hex || typeof hex !== 'string') {
-        throw new Error('hex must be a string!')
-      }
-      if (typeof hdIndex !== 'number' || hdIndex < 0) {
-        throw new Error('hdIndex must be a non-negative number!')
-      }
       // console.log('hex: ', hex)
-      console.log('completeTx() hdIndex: ', hdIndex)
 
       const bchjs = this.bchWallet.bchjs
 
@@ -500,8 +471,6 @@ class WalletAdapter {
       //   'mainnet'
       // )
 
-      console.log('completeTx() this.walletInfo: ', this.walletInfo)
-
       // Get the keypair for the address used in the Order
       const keyPair = await this.getKeyPair(hdIndex)
       console.log(`maker keyPair: ${JSON.stringify(keyPair, null, 2)}`)
@@ -535,9 +504,7 @@ class WalletAdapter {
       // return csTxHex
 
       // Broadcast transaction to the network
-      // const txid = await this.bchWallet.ar.sendTx(csTxHex)
-      const txid = await this.retryQueue.addToQueue(this.bchWallet.broadcast, { hex: csTxHex })
-      console.log('completeTx() txid: ', txid)
+      const txid = await this.bchWallet.ar.sendTx(csTxHex)
 
       return txid
     } catch (err) {
@@ -545,98 +512,6 @@ class WalletAdapter {
       throw err
     }
   }
-
-  // Given an Order database object, this function sends the tokens from the
-  // HD index where they are stored, back to the root address of the wallet.
-  async reclaimTokens (orderData) {
-    try {
-      // Get the key pair from the Order.
-      const keyPair = await this.getKeyPair(orderData.hdIndex)
-      console.log('keyPair: ', keyPair)
-
-      // Instantiate the wallet using the private key of the Order.
-      // const tempWallet = new this.BchWallet(keyPair.wif, advancedConfig)
-      // await tempWallet.initialize()
-
-      // Send the tokens from the Order to the root address.
-      // const receiver = {
-      //   address: this.bchWallet.walletInfo.address,
-      //   tokenId: orderData.tokenId,
-      //   qty: orderData.numTokens
-      // }
-      // console.log('receiver: ', receiver)
-      //
-      // const txid = await tempWallet.sendTokens(receiver)
-
-      // Sweep the tokens to the root address.
-      const sweeper = new BchTokenSweep(
-        keyPair.wif,
-        this.bchWallet.walletInfo.privateKey,
-        this.bchWallet,
-        550,
-        this.bchWallet.walletInfo.cashAddress
-      )
-      await sweeper.populateObjectFromNetwork()
-      const hex = await sweeper.sweepTo(this.bchWallet.walletInfo.cashAddress)
-      const txid = await this.bchWallet.ar.sendTx(hex)
-
-      return txid
-    } catch (err) {
-      console.error('Error in wallet.js/reclaimTokens()')
-      throw err
-    }
-  }
-
-  async moveTokensFromCustomWallet (inObj = {}) {
-    try {
-      const { tokenId, qty, wallet } = inObj
-      // Input validation
-      if (!tokenId || typeof tokenId !== 'string') {
-        throw new Error('tokenId must be a string!')
-      }
-      if (!qty) {
-        throw new Error('qty must be a number!')
-      }
-      if (!wallet) {
-        throw new Error('wallet is required!')
-      }
-
-      const keyPair = await this.getKeyPair()
-      console.log('keyPair: ', keyPair)
-
-      const receiver = {
-        address: keyPair.cashAddress,
-        tokenId,
-        qty
-      }
-      console.log('receiver: ', receiver)
-
-      // Update the UTXO store of the wallet.
-      await wallet.initialize()
-
-      // Get the token type of the token being moved.
-      // Combine Fungible and NFT token UTXOs.
-      let tokenUtxos = wallet.utxos.utxoStore.slpUtxos.type1.tokens.concat(
-        wallet.utxos.utxoStore.slpUtxos.nft.tokens)
-      // Get token UTXOs that match the token in the order.
-      tokenUtxos = tokenUtxos.filter(
-        x => x.tokenId === tokenId
-      )
-
-      const txid = await wallet.sendTokens(receiver, 3)
-      const utxoInfo = {
-        txid,
-        vout: 1,
-        hdIndex: keyPair.hdIndex,
-        tokenType: tokenUtxos[0].tokenType
-      }
-
-      return utxoInfo
-    } catch (err) {
-      console.error('Error in wallet.js/moveTokensFromCustomWallet()')
-      throw err
-    }
-  }
 }
 
 export default WalletAdapter

src/controllers/index.js

@@ -6,28 +6,28 @@
 
 // Public npm libraries.
 
-// Local libraries
+// Load the Clean Architecture Adapters library
 import Adapters from '../adapters/index.js'
+
+// Load the JSON RPC Controller.
 import JSONRPC from './json-rpc/index.js'
+
+// Load the Clean Architecture Use Case libraries.
 import UseCases from '../use-cases/index.js'
+
+// const useCases = new UseCases({ adapters })
+
+// Load the REST API Controllers.
 import RESTControllers from './rest-api/index.js'
+
 import TimerControllers from './timer-controllers.js'
-import config from '../../config/index.js'
 
 class Controllers {
   constructor (localConfig = {}) {
-    // Encapsulate dependencies
     this.adapters = new Adapters()
     this.useCases = new UseCases({ adapters: this.adapters })
-    this.timerControllers = new TimerControllers({ adapters: this.adapters, useCases: this.useCases })
-    this.config = config
 
-    // Bind 'this' object to all subfunction
-    this.initAdapters = this.initAdapters.bind(this)
-    this.initUseCases = this.initUseCases.bind(this)
-    this.attachRESTControllers = this.attachRESTControllers.bind(this)
-    this.attachControllers = this.attachControllers.bind(this)
-    this.attachRPCControllers = this.attachRPCControllers.bind(this)
+    this.timerControllers = new TimerControllers({ adapters: this.adapters, useCases: this.useCases })
   }
 
   // Spin up any adapter libraries that have async startup needs.
@@ -54,13 +54,8 @@ class Controllers {
 
   // Attach any other controllers other than REST API controllers.
   async attachControllers (app) {
-    if (this.config.useIpfs) {
-      // Attach JSON RPC controllers
-      this.attachRPCControllers()
-    }
 
-    // Attach and start the timer controllers
-    this.timerControllers.startTimers()
+    // this.attachRPCControllers()
   }
 
   // Add the JSON RPC router to the ipfs-coord adapter.

src/controllers/rest-api/index.js

@@ -11,13 +11,10 @@ import AuthRESTController from './auth/index.js'
 import UserRouter from './users/index.js'
 import ContactRESTController from './contact/index.js'
 import LogsRESTController from './logs/index.js'
-import IpfsRESTController from './ipfs/index.js'
-import config from '../../../config/index.js'
 import EntryRouter from './entry/index.js'
 import OfferRouter from './offer/index.js'
 import OrderRouter from './order/index.js'
 import P2WDBRouter from './p2wdb/index.js'
-import UsageRESTController from './usage/index.js'
 
 class RESTControllers {
   constructor (localConfig = {}) {
@@ -35,11 +32,7 @@ class RESTControllers {
       )
     }
 
-    // Bind 'this' object to all subfunctions.
-    this.attachRESTControllers = this.attachRESTControllers.bind(this)
-
-    // Encapsulate dependencies
-    this.config = config
+    // console.log('Controllers localConfig: ', localConfig)
   }
 
   attachRESTControllers (app) {
@@ -48,15 +41,13 @@ class RESTControllers {
       useCases: this.useCases
     }
 
-    if (!this.config.noMongo) {
-      // Attach the REST API Controllers associated with the /auth route
-      const authRESTController = new AuthRESTController(dependencies)
-      authRESTController.attach(app)
+    // Attach the REST API Controllers associated with the /auth route
+    const authRESTController = new AuthRESTController(dependencies)
+    authRESTController.attach(app)
 
-      // Attach the REST API Controllers associated with the /user route
-      const userRouter = new UserRouter(dependencies)
-      userRouter.attach(app)
-    }
+    // Attach the REST API Controllers associated with the /user route
+    const userRouter = new UserRouter(dependencies)
+    userRouter.attach(app)
 
     // Attach the REST API Controllers associated with the /contact route
     const contactRESTController = new ContactRESTController(dependencies)
@@ -66,10 +57,6 @@ class RESTControllers {
     const logsRESTController = new LogsRESTController(dependencies)
     logsRESTController.attach(app)
 
-    // Attach the REST API Controllers associated with the /ipfs route
-    const ipfsRESTController = new IpfsRESTController(dependencies)
-    ipfsRESTController.attach(app)
-
     // Attach the REST API Controllers associated with the /entry route
     const entryRouter = new EntryRouter(dependencies)
     entryRouter.attach(app)
@@ -82,10 +69,6 @@ class RESTControllers {
 
     const p2wdbRouter = new P2WDBRouter(dependencies)
     p2wdbRouter.attach(app)
-
-    // Attach the REST API Controllers associated with the /usage route
-    const usageRESTController = new UsageRESTController(dependencies)
-    usageRESTController.attach(app)
   }
 }
 

src/controllers/rest-api/ipfs/controller.js

@@ -1,145 +0,0 @@
-/*
-  REST API Controller library for the /ipfs route
-*/
-
-// Global npm libraries
-
-// Local libraries
-import wlogger from '../../../adapters/wlogger.js'
-
-class IpfsRESTControllerLib {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating /ipfs REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating /ipfs REST Controller.'
-      )
-    }
-
-    // Encapsulate dependencies
-    // this.UserModel = this.adapters.localdb.Users
-    // this.userUseCases = this.useCases.user
-
-    // Bind 'this' object to all subfunctions
-    this.getStatus = this.getStatus.bind(this)
-    this.getPeers = this.getPeers.bind(this)
-    this.getRelays = this.getRelays.bind(this)
-    this.handleError = this.handleError.bind(this)
-    this.connect = this.connect.bind(this)
-    this.getThisNode = this.getThisNode.bind(this)
-  }
-
-  /**
-   * @api {get} /ipfs Get status on IPFS infrastructure
-   * @apiPermission public
-   * @apiName GetIpfsStatus
-   * @apiGroup REST BCH
-   *
-   * @apiExample Example usage:
-   * curl -H "Content-Type: application/json" -X GET localhost:5001/ipfs
-   *
-   */
-  async getStatus (ctx) {
-    try {
-      const status = await this.adapters.ipfs.getStatus()
-
-      ctx.body = { status }
-    } catch (err) {
-      wlogger.error('Error in ipfs/controller.js/getStatus(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  // Return information on IPFS peers this node is connected to.
-  async getPeers (ctx) {
-    try {
-      const showAll = ctx.request.body.showAll
-
-      const peers = await this.adapters.ipfs.getPeers(showAll)
-
-      ctx.body = { peers }
-    } catch (err) {
-      wlogger.error('Error in ipfs/controller.js/getPeers(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  // Get data about the known Circuit Relays. Hydrate with data from peers list.
-  async getRelays (ctx) {
-    try {
-      const relays = await this.adapters.ipfs.getRelays()
-
-      ctx.body = { relays }
-    } catch (err) {
-      wlogger.error('Error in ipfs/controller.js/getRelays(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  async connect (ctx) {
-    try {
-      const multiaddr = ctx.request.body.multiaddr
-      const getDetails = ctx.request.body.getDetails
-
-      // console.log('this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs: ', this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs)
-      const result = await this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs.connectToPeer({ multiaddr, getDetails })
-      // console.log('result: ', result)
-
-      ctx.body = result
-    } catch (err) {
-      wlogger.error('Error in ipfs/controller.js/connect():', err)
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  /**
-   * @api {get} /ipfs/node Get a copy of the thisNode object from helia-coord
-   * @apiPermission public
-   * @apiName GetThisNode
-   * @apiGroup REST BCH
-   *
-   * @apiExample Example usage:
-   * curl -H "Content-Type: application/json" -X GET localhost:5001/ipfs/node
-   *
-   */
-  async getThisNode (ctx) {
-    try {
-      const thisNode = this.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.thisNode
-
-      ctx.body = { thisNode }
-    } catch (err) {
-      wlogger.error('Error in ipfs/controller.js/getThisNode(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  // DRY error handler
-  handleError (ctx, err) {
-    // If an HTTP status is specified by the buisiness logic, use that.
-    if (err.status) {
-      if (err.message) {
-        ctx.throw(err.status, err.message)
-      } else {
-        ctx.throw(err.status)
-      }
-    } else {
-      // By default use a 422 error if the HTTP status is not specified.
-      ctx.throw(422, err.message)
-    }
-  }
-}
-
-// module.exports = IpfsRESTControllerLib
-export default IpfsRESTControllerLib

src/controllers/rest-api/ipfs/index.js

@@ -1,67 +0,0 @@
-/*
-  REST API library for the /ipfs route.
-*/
-
-// Public npm libraries.
-import Router from 'koa-router'
-
-// Local libraries.
-import IPFSRESTControllerLib from './controller.js'
-import Validators from '../middleware/validators.js'
-
-// let _this
-
-class IpfsRouter {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating IPFS REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating IPFS REST Controller.'
-      )
-    }
-
-    const dependencies = {
-      adapters: this.adapters,
-      useCases: this.useCases
-    }
-
-    // Encapsulate dependencies.
-    this.ipfsRESTController = new IPFSRESTControllerLib(dependencies)
-    this.validators = new Validators()
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/ipfs'
-    this.router = new Router({ prefix: baseUrl })
-
-    // _this = this
-  }
-
-  attach (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attaching REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.get('/', this.ipfsRESTController.getStatus)
-    this.router.post('/peers', this.ipfsRESTController.getPeers)
-    this.router.post('/relays', this.ipfsRESTController.getRelays)
-    this.router.post('/connect', this.ipfsRESTController.connect)
-    this.router.get('/node', this.ipfsRESTController.getThisNode)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-}
-
-// module.exports = BchRouter
-export default IpfsRouter

src/controllers/rest-api/offer/controller.js

@@ -4,6 +4,8 @@
 
 import wlogger from '../../../adapters/wlogger.js'
 
+let _this
+
 class OfferRESTControllerLib {
   constructor (localConfig = {}) {
     // Dependency Injection.
@@ -24,13 +26,7 @@ class OfferRESTControllerLib {
     this.OfferModel = this.adapters.localdb.Offer
     // this.userUseCases = this.useCases.user
 
-    // Bind 'this' object to all subfunctions.
-    this.createOffer = this.createOffer.bind(this)
-    this.listOffers = this.listOffers.bind(this)
-    this.listNftOffers = this.listNftOffers.bind(this)
-    this.listFungibleOffers = this.listFungibleOffers.bind(this)
-    this.takeOffer = this.takeOffer.bind(this)
-    this.handleError = this.handleError.bind(this)
+    _this = this
   }
 
   // No api-doc documentation because this wont be a public endpoint
@@ -40,7 +36,7 @@ class OfferRESTControllerLib {
 
       const offerObj = ctx.request.body
 
-      await this.useCases.offer.createOffer(offerObj)
+      await _this.useCases.offer.createOffer(offerObj)
 
       ctx.body = {
         success: true
@@ -49,7 +45,7 @@ class OfferRESTControllerLib {
       // console.log(`err.message: ${err.message}`)
       // console.log('err: ', err)
       // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
+      _this.handleError(ctx, err)
     }
   }
 
@@ -59,12 +55,12 @@ class OfferRESTControllerLib {
       let page = ctx.params.page
       if (!page) page = 0
 
-      const offers = await this.useCases.offer.listOffers(page)
+      const offers = await _this.useCases.offer.listOffers(page)
 
       ctx.body = offers
     } catch (err) {
       console.log('Error in listOffers REST API handler: ', err)
-      this.handleError(ctx, err)
+      _this.handleError(ctx, err)
     }
   }
 
@@ -74,12 +70,12 @@ class OfferRESTControllerLib {
       let page = ctx.params.page
       if (!page) page = 0
 
-      const offers = await this.useCases.offer.listNftOffers(page)
+      const offers = await _this.useCases.offer.listNftOffers(page)
 
       ctx.body = offers
     } catch (err) {
       console.log('Error in listNftOffers REST API handler: ', err)
-      this.handleError(ctx, err)
+      _this.handleError(ctx, err)
     }
   }
 
@@ -89,12 +85,12 @@ class OfferRESTControllerLib {
       let page = ctx.params.page
       if (!page) page = 0
 
-      const offers = await this.useCases.offer.listFungibleOffers(page)
+      const offers = await _this.useCases.offer.listFungibleOffers(page)
 
       ctx.body = offers
     } catch (err) {
       console.log('Error in Fungible REST API handler: ', err)
-      this.handleError(ctx, err)
+      _this.handleError(ctx, err)
     }
   }
 
@@ -104,14 +100,14 @@ class OfferRESTControllerLib {
     try {
       console.log('REST API controller, body: ', ctx.request.body)
 
-      const nostrEventId = ctx.request.body.nostrEventId
+      const offerCid = ctx.request.body.offerCid
 
-      const { eventId, noteId } = await this.useCases.offer.takeOffer(nostrEventId)
+      const hash = await _this.useCases.offer.takeOffer(offerCid)
 
-      ctx.body = { eventId, noteId }
+      ctx.body = { hash }
     } catch (err) {
       wlogger.error('Error in takeOffer() REST API handler.')
-      this.handleError(ctx, err)
+      _this.handleError(ctx, err)
     }
   }
 

src/controllers/rest-api/offer/index.js

@@ -48,13 +48,8 @@ class OfferRouter {
       )
     }
 
-    // 12/3/24 CT:
-    // Note: The createOffer() path was used by a P2WDB webhook to generate an
-    // Offer from and Order. This has been deprecated and Offers are now created
-    // by a Timer Controller monitoring a Nostr topic.
-
     // Define the routes and attach the controller.
-    // this.router.post('/', _this.offerRESTController.createOffer) // Deprecated.
+    this.router.post('/', _this.offerRESTController.createOffer)
     this.router.post('/take', _this.offerRESTController.takeOffer)
     this.router.get('/list/all/:page', _this.offerRESTController.listOffers)
     this.router.get('/list/nft/:page', _this.offerRESTController.listNftOffers)

src/controllers/rest-api/order/controller.js

@@ -35,48 +35,10 @@ class OrderRESTControllerLib {
       // console.log('body: ', ctx.request.body)
 
       const orderObj = ctx.request.body.order
-      const user = ctx.state.user
-      orderObj.userId = user._id
-      console.log('orderObj: ', orderObj)
 
-      const { eventId, noteId } = await _this.useCases.order.createOrder(orderObj)
+      const hash = await _this.useCases.order.createOrder(orderObj)
 
-      ctx.body = { eventId, noteId }
-    } catch (err) {
-      // console.log(`err.message: ${err.message}`)
-      // console.log('err: ', err)
-      // ctx.throw(422, err.message)
-      _this.handleError(ctx, err)
-    }
-  }
-
-  // curl -X GET http://localhost:5700/order/list/all/0
-  async listOrders (ctx) {
-    try {
-      let page = ctx.params.page
-      if (!page) page = 0
-
-      const offers = await _this.useCases.order.listOrders(page)
-
-      ctx.body = offers
-    } catch (err) {
-      console.log('Error in listOrders REST API handler: ', err)
-      _this.handleError(ctx, err)
-    }
-  }
-
-  // Delete an existing order by returning the token to the root address of
-  // the DEX wallet.
-  async deleteOrder (ctx) {
-    try {
-      // console.log('body: ', ctx.request.body)
-
-      const nostrEventId = ctx.request.body.nostrEventId
-      // console.log('p2wdbHash: ', p2wdbHash)
-
-      const txid = await _this.useCases.order.deleteOrder(nostrEventId)
-
-      ctx.body = { txid }
+      ctx.body = { hash }
     } catch (err) {
       // console.log(`err.message: ${err.message}`)
       // console.log('err: ', err)

src/controllers/rest-api/order/index.js

@@ -7,7 +7,6 @@ import Router from 'koa-router'
 
 // Local libraries.
 import OrderRESTControllerLib from './controller.js'
-import Validators from '../middleware/validators.js'
 
 let _this
 
@@ -33,14 +32,12 @@ class OrderRouter {
     }
 
     // Encapsulate dependencies.
-    this.validators = new Validators()
     this.orderRESTController = new OrderRESTControllerLib(dependencies)
 
     // Instantiate the router and set the base route.
     const baseUrl = '/order'
     this.router = new Router({ prefix: baseUrl })
 
-    this.createOrder = this.createOrder.bind(this)
     _this = this
   }
 
@@ -52,19 +49,12 @@ class OrderRouter {
     }
 
     // Define the routes and attach the controller.
-    this.router.post('/', this.createOrder)
-    this.router.get('/list/all/:page', _this.orderRESTController.listOrders)
-    this.router.post('/delete', _this.orderRESTController.deleteOrder)
+    this.router.post('/', _this.orderRESTController.createOrder)
 
     // Attach the Controller routes to the Koa app.
     app.use(_this.router.routes())
     app.use(_this.router.allowedMethods())
   }
-
-  async createOrder (ctx, next) {
-    await _this.validators.ensureUser(ctx, next)
-    await _this.orderRESTController.createOrder(ctx, next)
-  }
 }
 
 export default OrderRouter

src/controllers/rest-api/usage/controller.js

@@ -1,119 +0,0 @@
-/*
-  REST API Controller library for the /usage route
-*/
-
-// Global npm libraries
-
-// Local libraries
-import wlogger from '../../../adapters/wlogger.js'
-
-class UsageRESTControllerLib {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating /usage REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating /usage REST Controller.'
-      )
-    }
-
-    // Encapsulate dependencies
-
-    // Bind 'this' object to all subfunctions
-    this.getStatus = this.getStatus.bind(this)
-    this.getTopIps = this.getTopIps.bind(this)
-    this.getTopEndpoints = this.getTopEndpoints.bind(this)
-    this.handleError = this.handleError.bind(this)
-  }
-
-  /**
-   * @api {get} /usage Get status on IPFS infrastructure
-   * @apiPermission public
-   * @apiName GetUsageStatus
-   * @apiGroup REST Usage
-   *
-   * @apiExample Example usage:
-   * curl -H "Content-Type: application/json" -X GET localhost:5020/usage
-   *
-   */
-  getStatus (ctx) {
-    try {
-      // const status = await this.adapters.ipfs.getStatus()
-      const status = this.useCases.usage.getRestSummary()
-
-      ctx.body = { status }
-    } catch (err) {
-      wlogger.error('Error in usage/controller.js/getStatus(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  /**
-   * @api {get} /usage/ips Get top IP addresses consuming the REST API
-   * @apiPermission public
-   * @apiName GetUsageIPs
-   * @apiGroup REST Usage
-   *
-   * @apiExample Example usage:
-   * curl -H "Content-Type: application/json" -X GET localhost:5020/usage/ips
-   *
-   */
-  getTopIps (ctx) {
-    try {
-      const ips = this.useCases.usage.getTopIps()
-
-      ctx.body = { ips }
-    } catch (err) {
-      wlogger.error('Error in usage/controller.js/getTopIps(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  /**
-   * @api {get} /usage/endpoints Get top endpoints consumed from the REST API
-   * @apiPermission public
-   * @apiName GetUsageEndpoints
-   * @apiGroup REST Usage
-   *
-   * @apiExample Example usage:
-   * curl -H "Content-Type: application/json" -X GET localhost:5020/usage/endpoints
-   *
-   */
-  getTopEndpoints (ctx) {
-    try {
-      const endpoints = this.useCases.usage.getTopEndpoints()
-
-      ctx.body = { endpoints }
-    } catch (err) {
-      wlogger.error('Error in usage/controller.js/getTopEndpoints(): ')
-      // ctx.throw(422, err.message)
-      this.handleError(ctx, err)
-    }
-  }
-
-  // DRY error handler
-  handleError (ctx, err) {
-    // If an HTTP status is specified by the buisiness logic, use that.
-    if (err.status) {
-      if (err.message) {
-        ctx.throw(err.status, err.message)
-      } else {
-        ctx.throw(err.status)
-      }
-    } else {
-      // By default use a 422 error if the HTTP status is not specified.
-      ctx.throw(422, err.message)
-    }
-  }
-}
-
-// module.exports = IpfsRESTControllerLib
-export default UsageRESTControllerLib

src/controllers/rest-api/usage/index.js

@@ -1,65 +0,0 @@
-/*
-  REST API library for the /usage route.
-*/
-
-// Public npm libraries.
-import Router from 'koa-router'
-
-// Local libraries.
-import UsageRESTControllerLib from './controller.js'
-import Validators from '../middleware/validators.js'
-
-// let _this
-
-class UsageRouter {
-  constructor (localConfig = {}) {
-    // Dependency Injection.
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of Adapters library required when instantiating IPFS REST Controller.'
-      )
-    }
-    this.useCases = localConfig.useCases
-    if (!this.useCases) {
-      throw new Error(
-        'Instance of Use Cases library required when instantiating IPFS REST Controller.'
-      )
-    }
-
-    const dependencies = {
-      adapters: this.adapters,
-      useCases: this.useCases
-    }
-
-    // Encapsulate dependencies.
-    this.usageRESTController = new UsageRESTControllerLib(dependencies)
-    this.validators = new Validators()
-
-    // Instantiate the router and set the base route.
-    const baseUrl = '/usage'
-    this.router = new Router({ prefix: baseUrl })
-
-    // _this = this
-  }
-
-  attach (app) {
-    if (!app) {
-      throw new Error(
-        'Must pass app object when attaching REST API controllers.'
-      )
-    }
-
-    // Define the routes and attach the controller.
-    this.router.get('/', this.usageRESTController.getStatus)
-    this.router.get('/ips', this.usageRESTController.getTopIps)
-    this.router.get('/endpoints', this.usageRESTController.getTopEndpoints)
-
-    // Attach the Controller routes to the Koa app.
-    app.use(this.router.routes())
-    app.use(this.router.allowedMethods())
-  }
-}
-
-// module.exports = BchRouter
-export default UsageRouter

src/controllers/rest-api/users/controller.js

@@ -124,7 +124,7 @@ class UserRESTControllerLib {
 
       ctx.body = { users }
     } catch (err) {
-      wlogger.error('Error in users/controller.js/getUsers(): ', err)
+      wlogger.error('Error in users/controller.js/getUsers(): '.err)
       ctx.throw(422, err.message)
     }
   }

src/controllers/rest-api/users/index.js

@@ -10,8 +10,6 @@ import UserRESTControllerLib from './controller.js'
 
 import Validators from '../middleware/validators.js'
 
-import config from '../../../../config/index.js'
-
 let _this
 
 class UserRouter {
@@ -36,7 +34,6 @@ class UserRouter {
     }
 
     // Encapsulate dependencies.
-    this.config = config
     this.userRESTController = new UserRESTControllerLib(dependencies)
     this.validators = new Validators()
 
@@ -55,7 +52,7 @@ class UserRouter {
     }
 
     // Define the routes and attach the controller.
-    this.router.post('/', this.createUser)
+    this.router.post('/', this.userRESTController.createUser)
     this.router.get('/', this.getAll)
     this.router.get('/:id', this.getById)
     this.router.put('/:id', this.updateUser)
@@ -66,14 +63,6 @@ class UserRouter {
     app.use(this.router.allowedMethods())
   }
 
-  async createUser (ctx, next) {
-    if (process.env.DISABLE_NEW_ACCOUNTS) {
-      await _this.validators.ensureAdmin(ctx, next)
-    }
-    await _this.userRESTController.createUser(ctx, next)
-    return true
-  }
-
   async getAll (ctx, next) {
     await _this.validators.ensureUser(ctx, next)
     await _this.userRESTController.getUsers(ctx, next)

src/controllers/timer-controllers.js

@@ -1,9 +1,10 @@
 /*
   This Controller library is concerned with timer-based functions that are
-  kicked off periodically.
+  kicked off periodicially.
 */
 
-import config from '../../config/index.js'
+// Used to retain scope of 'this', when the scope is lost.
+let _this
 
 class TimerControllers {
   constructor (localConfig = {}) {
@@ -22,109 +23,46 @@ class TimerControllers {
     }
 
     this.debugLevel = localConfig.debugLevel
-    this.config = config
 
-    // Bind 'this' object to all subfunctions
-    this.startTimers = this.startTimers.bind(this)
-    this.gcOrders = this.gcOrders.bind(this)
-    this.gcOffers = this.gcOffers.bind(this)
-    this.checkDupOffers = this.checkDupOffers.bind(this)
-    this.loadOffers = this.loadOffers.bind(this)
-    // Bind 'this' object to all subfunctions.
-    // this.exampleTimerFunc = this.exampleTimerFunc.bind(this)
-    this.cleanUsage = this.cleanUsage.bind(this)
+    _this = this
 
-    // State
-    this.gcOrdersInt = null
-    this.gcOffersInt = null
-    this.checkDupOffersInt = null
-    this.loadOffersInt = null
+    this.startTimers()
   }
 
   // Start all the time-based controllers.
   startTimers () {
-    this.gcOrdersInt = setInterval(this.gcOrders, 60000 * 5)
-    this.gcOffersInt = setInterval(this.gcOffers, 60000 * 5)
-    // this.checkDupOffersInt = setInterval(this.checkDupOffers, 60000 * 4.5)
-    this.loadOffersInt = setInterval(this.loadOffers, 60000 * 2)
-    // Any new timer control functions can be added here. They will be started
-    // when the server starts.
-    // this.optimizeWalletHandle = setInterval(this.exampleTimerFunc, 60000 * 60)
-    this.cleanUsageHandle = setInterval(this.cleanUsage, 60000 * 60) // 1 hour
-
-    return true
-  }
-
-  stopTimers () {
-    clearInterval(this.gcOrdersInt)
-    clearInterval(this.gcOffersInt)
-    // clearInterval(this.checkDupOffers)
-    clearInterval(this.optimizeWalletHandle)
-    clearInterval(this.cleanUsageHandle)
+    setInterval(this.gcOrders, 60000 * 5)
+    setInterval(this.gcOffers, 60000 * 5)
+    setInterval(this.checkDupOffers, 60000 * 4.5)
   }
 
   // Garbage Collect the Orders.
   gcOrders () {
     try {
-      this.useCases.order.removeStaleOrders()
-      return true
+      _this.useCases.order.removeStaleOrders()
     } catch (err) {
       // Do not throw an error. This is a top-level function.
       console.log('Error in timer-controllers.js/gcOrders(): ', err)
-      return false
     }
   }
 
   // Garbage Collect the Offers.
   gcOffers () {
     try {
-      this.useCases.offer.removeStaleOffers()
-      return true
+      _this.useCases.offer.removeStaleOffers()
     } catch (err) {
       // Do not throw an error. This is a top-level function.
       console.log('Error in timer-controllers.js/gcOffers(): ', err)
-      return false
     }
   }
 
   // Remove duplicate Offers
   checkDupOffers () {
     try {
-      this.useCases.offer.removeDuplicateOffers()
-      return true
+      _this.useCases.offer.removeDuplicateOffers()
     } catch (err) {
       // Do not throw an error. This is a top-level function.
       console.log('Error in timer-controllers.js/checkDupOffers(): ', err)
-      return false
-    }
-  }
-
-  // Load offers From nostr .
-  async loadOffers () {
-    try {
-      await this.useCases.offer.loadOffers()
-      return true
-    } catch (err) {
-      // Do not throw an error. This is a top-level function.
-      console.log('Error in timer-controllers.js/loadOffers(): ', err)
-      return false
-    }
-  }
-
-  // Clean the usage state so that stats reflect the last 24 hours.
-  cleanUsage () {
-    try {
-      const now = new Date()
-      console.log(`cleanUsage() Timer Controller executing at ${now.toLocaleString()}`)
-
-      this.useCases.usage.cleanUsage()
-
-      return true
-    } catch (err) {
-      console.error('Error in time-controller.js/cleanUsage(): ', err)
-
-      // Note: Do not throw an error. This is a top-level function.
-      return false
     }
   }
 }

src/entities/offer.js

@@ -17,8 +17,6 @@ class OfferEntity {
       )
     }
 
-    // console.log('offer entity validate() offerData: ', offerData)
-
     const {
       messageType,
       messageClass,
@@ -32,8 +30,7 @@ class OfferEntity {
       offerStatus,
       makerAddr,
       ticker,
-      tokenType,
-      nostrEventId
+      tokenType
     } = offerData.data
 
     // Input Validation
@@ -76,9 +73,6 @@ class OfferEntity {
     if (!tokenType || typeof tokenType !== 'number') {
       throw new Error("Property 'tokenType' must be a number.")
     }
-    if (!nostrEventId || typeof nostrEventId !== 'string') {
-      throw new Error("Property 'nostrEventId' must be a string.")
-    }
 
     // Convert the timestamp to a number.
     let timestamp = new Date(offerData.timestamp)
@@ -102,10 +96,8 @@ class OfferEntity {
       offerStatus: offerStatus || this.offerStatus[0],
       makerAddr,
       ticker,
-      tokenType,
-      nostrEventId
+      tokenType
     }
-    // console.log('offer entity validatedOfferData: ', validatedOfferData)
 
     return validatedOfferData
   }

src/use-cases/index.js

@@ -4,12 +4,10 @@
   https://troutsblog.com/blog/clean-architecture
 */
 
-// Local libraries
 import UserUseCases from './user.js'
 import EntryUseCases from './entry.js'
 import OfferUseCases from './offer/index.js'
 import OrderUseCases from './order.js'
-import { UsageUseCases } from './usage-use-cases.js'
 
 class UseCases {
   constructor (localConfig = {}) {
@@ -26,14 +24,19 @@ class UseCases {
     this.order = new OrderUseCases(localConfig)
     localConfig.order = this.order
     this.offer = new OfferUseCases(localConfig)
-    this.usage = new UsageUseCases(localConfig)
   }
 
   // Run any startup Use Cases at the start of the app.
   async start () {
+    // try {
     console.log('Async Use Cases have been started.')
 
     return true
+    // } catch (err) {
+    //   console.error('Error in use-cases/index.js/start()')
+    //   // console.log(err)
+    //   throw err
+    // }
   }
 }
 

src/use-cases/offer/index.js

@@ -37,7 +37,7 @@ class OfferUseCases {
     this.orderUseCase = localConfig.order
     if (!this.orderUseCase) {
       throw new Error(
-        'Instance of Order Use Cases must be passed in when instantiating Offer Use Cases library.'
+        'Instance of Offer Use Cases must be passed in when instantiating Offer Use Cases library.'
       )
     }
 
@@ -49,37 +49,20 @@ class OfferUseCases {
     this.retryQueue = new RetryQueue({ retryPeriod: 1000, attempts: 3 })
 
     // Bind 'this' object to functions
-    this.createOffer = this.createOffer.bind(this)
     this.detectNsfw = this.detectNsfw.bind(this)
-    this.categorizeToken = this.categorizeToken.bind(this)
-    this.listOffers = this.listOffers.bind(this)
-    this.listNftOffers = this.listNftOffers.bind(this)
-    this.listFungibleOffers = this.listFungibleOffers.bind(this)
-    this.takeOffer = this.takeOffer.bind(this)
-    this.ensureFunds = this.ensureFunds.bind(this)
-    this.findOfferByEvent = this.findOfferByEvent.bind(this)
-    this.findOfferByTxid = this.findOfferByTxid.bind(this)
-    this.acceptCounterOffer = this.acceptCounterOffer.bind(this)
-    this.removeDuplicateOffers = this.removeDuplicateOffers.bind(this)
-    this.removeStaleOffers = this.removeStaleOffers.bind(this)
-    this.flagOffer = this.flagOffer.bind(this)
-    this.loadOffers = this.loadOffers.bind(this)
-
-    // State
-    this.seenOffers = []
-    this.seenCounterOffers = []
   }
 
-  // This method is called by timer controller to load offers from a Nostr topic.
+  // This method is called by the POST /offer REST API controller, which is
+  // triggered by a P2WDB webhook.
   async createOffer (offerObj) {
     try {
-      // console.log('Use Case createOffer(offerObj): ', offerObj)
+      console.log('Use Case createOffer(offerObj): ', offerObj)
 
-      // Return if Offer already exists in database with the same utxo transaction id.
+      // Return if Offer already exists in database with the same P2WDB CID.
       try {
-        await this.findOfferByTxid(offerObj.data.utxoTxid)
+        await this.findOfferByHash(offerObj.hash)
 
-        // console.log('Offer already found in local database.')
+        console.log('Offer already found in local database.')
         return false
       } catch (err) { /* exit quietly */ }
 
@@ -88,17 +71,9 @@ class OfferUseCases {
       // Input Validation
       // TODO: This is a hack. Find a better way to protect against the corner-
       // case of counter-offers getting routed here.
-      // if (offerObj.data.dataType === 'counter-offer') {
-      //   console.log('WARN: Counter Offer innappropriately routed to createOffer()')
-      // }
-
-      // Quickly skip over offers that have already been processed.
-      const eventId = offerObj.data.nostrEventId
-      if (this.seenOffers.includes(eventId)) {
-        // console.log(`Offer with event ID ${eventId} already processed. Skipping.`)
-        return false
+      if (offerObj.data.dataType === 'counter-offer') {
+        console.log('WARN: Counter Offer innappropriately routed to createOffer()')
       }
-      this.seenOffers.push(eventId)
 
       // Verify that UTXO in offer is unspent. If it is spent, then ignore the
       // offer.
@@ -108,26 +83,21 @@ class OfferUseCases {
       }
       // const utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
       const utxoStatus = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.utxoIsValid, utxo)
-      // console.log('utxoStatus: ', utxoStatus)
+      console.log('utxoStatus: ', utxoStatus)
       // if (utxoStatus === null) return false
       if (!utxoStatus) return false
 
       // A new offer gets a status of 'posted'
       offerObj.data.offerStatus = 'posted'
 
-      // Set timestamp
-      offerObj.timestamp = new Date().getTime()
-
       const offerEntity = this.offerEntity.validate(offerObj)
-      // console.log('offerEntity: ', offerEntity)
-
-      console.log(`New Offer for token ID ${offerEntity.tokenId} detected from Nostr post ${eventId}`)
+      console.log('offerEntity: ', offerEntity)
 
       // Get data about the token.
       const tokenId = offerEntity.tokenId
       // const tokenData = await this.adapters.wallet.bchWallet.getTokenData(tokenId)
       const tokenData = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.getTokenData, tokenId)
-      // console.log(`tokenData: ${JSON.stringify(tokenData, null, 2)}`)
+      console.log(`tokenData: ${JSON.stringify(tokenData, null, 2)}`)
 
       // Generate a 'display category' for the token. This will allow the
       // front end UI to figure out how to display the token.
@@ -136,9 +106,10 @@ class OfferUseCases {
       offerEntity.displayCategory = displayCategory
 
       // Detect if user set the NSFW flag.
-      // const nsfw = false
-      // nsfw = await this.retryQueue.addToQueue(this.detectNsfw, tokenData)
-      // offerEntity.nsfw = nsfw
+      let nsfw = false
+      // nsfw = await this.detectNsfw(tokenData)
+      nsfw = await this.retryQueue.addToQueue(this.detectNsfw, tokenData)
+      offerEntity.nsfw = nsfw
 
       // Add offer to the local database.
       const offerModel = new this.OfferModel(offerEntity)
@@ -146,7 +117,7 @@ class OfferUseCases {
 
       return true
     } catch (err) {
-      console.error('Error in createOffer()', err.message)
+      console.error('Error in createOffer()')
       throw err
     }
   }
@@ -168,29 +139,16 @@ class OfferUseCases {
 
       // Retrieve the mutable data from Filecoin/IPFS.
       // const url = `https://${cid}.ipfs.w3s.link/data.json`
-      let mutableData = {}
-
-      try {
-        // Try the conventional data URL.
-        const url = `${this.config.ipfsGateway}${cid}/data.json`
-        const result = await this.axios.get(url)
-        mutableData = result.data
-        // console.log(`mutableData: ${JSON.stringify(mutableData, null, 2)}`)
-      } catch (err) {
-        // Try the newer data URL.
-        const url = `${this.config.ipfsGateway}${cid}`
-        const result = await this.axios.get(url)
-        mutableData = result.data
-        // console.log(`mutableData: ${JSON.stringify(mutableData, null, 2)}`)
-      }
-      console.log('mutableData: ', mutableData)
+      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)}`)
 
       // Logical tests
       const hasNsfw = !!mutableData.nsfw
       const nsfwSetTrue = mutableData.nsfw === true
       const nsfwStringTrue = mutableData.nsfw === 'true'
       const nsfwDetected = hasNsfw && (nsfwSetTrue || nsfwStringTrue)
-      // console.log(`hasNsfw: ${hasNsfw}, nsfwSetTrue: ${nsfwSetTrue}, nsfwStringTrue: ${nsfwStringTrue}, nsfwDetected: ${nsfwDetected}`)
 
       if (nsfwDetected) {
         console.log('NSFW flag set as true')
@@ -249,11 +207,11 @@ class OfferUseCases {
   async listOffers (page = 0) {
     try {
       const data = await this.OfferModel.find({})
-        // Sort entries so newest entries show first.
+      // Sort entries so newest entries show first.
         .sort('-timestamp')
-        // Skip to the start of the selected page.
+      // Skip to the start of the selected page.
         .skip(page * DEFAULT_ENTRIES_PER_PAGE)
-        // Only return 20 results.
+      // Only return 20 results.
         .limit(DEFAULT_ENTRIES_PER_PAGE)
 
       return data
@@ -269,11 +227,11 @@ class OfferUseCases {
         displayCategory: { $ne: 'fungible' },
         nsfw
       })
-        // Sort entries so newest entries show first.
+      // Sort entries so newest entries show first.
         .sort('-timestamp')
-        // Skip to the start of the selected page.
+      // Skip to the start of the selected page.
         .skip(page * NFT_ENTRIES_PER_PAGE)
-        // Only return 20 results.
+      // Only return 20 results.
         .limit(NFT_ENTRIES_PER_PAGE)
 
       // console.log('listNftOffers() returning this data: ', data)
@@ -288,11 +246,11 @@ class OfferUseCases {
   async listFungibleOffers (page = 0) {
     try {
       const data = await this.OfferModel.find({ displayCategory: 'fungible' })
-        // Sort entries so newest entries show first.
+      // Sort entries so newest entries show first.
         .sort('-timestamp')
-        // Skip to the start of the selected page.
+      // Skip to the start of the selected page.
         .skip(page * FUNGIBLE_ENTRIES_PER_PAGE)
-        // Only return 20 results.
+      // Only return 20 results.
         .limit(FUNGIBLE_ENTRIES_PER_PAGE)
 
       // console.log('listFungibleOffers() returning this data: ', data)
@@ -312,12 +270,12 @@ class OfferUseCases {
   // provide functionality to take less than the total amount of tokens offered
   // (offerInfo.numTokens). Taking less than the offered amount will be added
   // in the future.
-  async takeOffer (eventId) {
+  async takeOffer (offerCid) {
     try {
-      if (!eventId || typeof eventId !== 'string') throw new Error('eventId must be a string')
+      console.log('offerCid: ', offerCid)
 
       // Get the Offer information
-      const offerInfo = await this.findOfferByEvent(eventId)
+      const offerInfo = await this.findOfferByHash(offerCid)
       console.log(`offerInfo: ${JSON.stringify(offerInfo, null, 2)}`)
 
       // Ensure the offer is in a 'posted' state and not already 'taken'
@@ -330,10 +288,8 @@ class OfferUseCases {
         tx_hash: offerInfo.utxoTxid,
         tx_pos: offerInfo.utxoVout
       }
-
-      // Note : should be added to retry-queue?
       const utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
-      // console.log('utxoStatus: ', utxoStatus)
+      console.log('utxoStatus: ', utxoStatus)
       if (!utxoStatus) {
         console.log(`utxo txid: ${offerInfo.utxoTxid}, vout: ${offerInfo.utxoVout}`)
 
@@ -346,12 +302,11 @@ class OfferUseCases {
       await this.ensureFunds(offerInfo)
 
       // Get UTXOs.
-      // const utxos = this.adapters.wallet.bchWallet.utxos.utxoStore
-      // console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
+      const utxos = this.adapters.wallet.bchWallet.utxos.utxoStore
+      console.log(`utxos: ${JSON.stringify(utxos, null, 2)}`)
 
       // Calculate amount of sats to generate a counter offer.
-      let satsToMove = Math.ceil(offerInfo.numTokens * parseInt(offerInfo.rateInBaseUnit))
-      console.log('satsToMove', satsToMove, offerInfo)
+      let satsToMove = offerInfo.numTokens * parseInt(offerInfo.rateInBaseUnit)
       if (isNaN(satsToMove)) {
         throw new Error('Could not calculate the amount of BCH to generate counter offer')
       }
@@ -377,9 +332,9 @@ class OfferUseCases {
       // Create valid Offer object
       const takenOfferInfo = Object.assign({}, offerInfo)
       takenOfferInfo.partialTxHex = partialTxHex
-      delete takenOfferInfo.nostrEventId
+      delete takenOfferInfo.p2wdbHash
       delete takenOfferInfo._id
-      takenOfferInfo.offerHash = offerInfo.nostrEventId
+      takenOfferInfo.offerHash = offerInfo.p2wdbHash
 
       // Add P2WDB specific flag for signaling that this is a new offer.
       takenOfferInfo.dataType = 'counter-offer'
@@ -387,21 +342,19 @@ class OfferUseCases {
       // Write offer info to the P2WDB
       // TODO: This will trigger the webhook. Find some way of triggering the
       // webhook on new offers, but not on counteroffers
-      const nostrData = {
-        // wif: this.adapters.wallet.bchWallet.walletInfo.privateKey,
-        data: takenOfferInfo
-        // appId: this.config.p2wdbAppId
+      const p2wdbObj = {
+        wif: this.adapters.wallet.bchWallet.walletInfo.privateKey,
+        data: takenOfferInfo,
+        appId: this.config.p2wdbAppId
       }
-      const resultEventId = await this.adapters.nostr.post(JSON.stringify(nostrData))
-
-      const noteId = this.adapters.nostr.eventId2note(resultEventId)
+      const hash = await this.adapters.p2wdb.write(p2wdbObj)
 
       // Delete the Offer from the database, so that the user doesn't attempt
       // to take the offer more than once.
-      // offerInfo.remove()
+      offerInfo.remove()
 
       // Return the P2WDB CID
-      return { eventId: resultEventId, noteId }
+      return hash
 
       // return 'fake-hash'
     } catch (err) {
@@ -424,16 +377,15 @@ class OfferUseCases {
       await this.adapters.wallet.bchWallet.initialize()
 
       // Ensure the app wallet has enough funds to write to the P2WDB.
-      // Note :  this validation should be deprecated for nostr functionality?
-      // const wif = this.adapters.wallet.bchWallet.walletInfo.privateKey
-      // const canWriteToP2WDB = await this.adapters.p2wdb.checkForSufficientFunds(wif)
-      // if (!canWriteToP2WDB) throw new Error('App wallet does not have funds for writing to the P2WDB.')
+      const wif = this.adapters.wallet.bchWallet.walletInfo.privateKey
+      const canWriteToP2WDB = await this.adapters.p2wdb.checkForSufficientFunds(wif)
+      if (!canWriteToP2WDB) throw new Error('App wallet does not have funds for writing to the P2WDB.')
 
       if (offerEntity.buyOrSell.includes('sell')) {
         // Sell Offer
 
         // Calculate the sats needed
-        const satsNeeded = Math.ceil(offerEntity.numTokens * parseInt(offerEntity.rateInBaseUnit))
+        const satsNeeded = offerEntity.numTokens * parseInt(offerEntity.rateInBaseUnit)
         if (isNaN(satsNeeded)) {
           throw new Error('Could not calculate sats needed!')
         }
@@ -446,7 +398,7 @@ class OfferUseCases {
           throw new Error('App wallet does not control enough BCH to purchase the tokens.')
         }
 
-        //
+      //
       } else {
         // Buy Offer
         throw new Error('Buy offers are not supported yet.')
@@ -465,130 +417,57 @@ class OfferUseCases {
     }
   }
 
-  // Retrieve an Order model from the database. Find it by its event Id.
-  async findOfferByEvent (nostrEventId) {
-    try {
-      if (typeof nostrEventId !== 'string' || !nostrEventId) {
-        throw new Error('nostrEventId must be a string')
-      }
-
-      const order = await this.OfferModel.findOne({ nostrEventId })
-
-      if (!order) {
-        throw new Error('offer not found')
-      }
-
-      const orderObject = order.toObject()
-      // return this.offerEntity.validateFromModel(offerObject)
-
-      return orderObject
-    } catch (err) {
-      console.error('Error in findOfferByEvent()')
-      throw err
-    }
-  }
-
-  async findOfferByTxid (utxoTxid) {
+  async findOfferByHash (p2wdbHash) {
     // try {
-    // try {
-    if (typeof utxoTxid !== 'string' || !utxoTxid) {
-      throw new Error('utxoTxid must be a string')
+    if (typeof p2wdbHash !== 'string' || !p2wdbHash) {
+      throw new Error('p2wdbHash must be a string')
     }
 
-    const offer = await this.OfferModel.findOne({ utxoTxid })
-
-    // TODO: Offer should be found by TXID, then if there is more than one
-    // result, they should be filtered by the vout property. That will leave
-    // one remaining UTXO.
+    const offer = await this.OfferModel.findOne({ p2wdbHash })
 
     if (!offer) {
       throw new Error('offer not found')
     }
 
     return offer
-    // } catch (error) {
-    //   // console.error('Error in use-cases/offer/findOfferByTxid(): ', error.message)
-    //   throw error
+
+    // const offerObject = offer.toObject()
+    // return this.offerEntity.validateFromModel(offerObject)
+
+    // return offerObject
+    // } catch (err) {
+    //   // console.error('Error in findOffer(): ', err)
+    //   throw err
     // }
   }
 
   // This function is called by the P2WDB webhook REST API handler. When a
   // Counter Offer is passed to bch-dex by the P2WDB, the data is then passed
-  // to this function. It does due diligence on the Counter Offer, then signs
+  // to this function. It does due dilligence on the Counter Offer, then signs
   // and broadcasts the transaction to accept the Counter Offer.
-  async acceptCounterOffer (offerData) {
+  async acceptCounterOffer (p2wdbData) {
     try {
-      // console.log(`acceptCounterOffer() offerData: ${JSON.stringify(offerData, null, 2)}`)
-
-      // Quickly skip over offers that have already been processed.
-      const eventId = offerData.data.nostrEventId
-      if (this.seenOffers.includes(eventId)) {
-        // console.log(`Offer with event ID ${eventId} already processed. Skipping.`)
-        return false
-      }
+      console.log(`acceptCounterOffer() p2wdbData: ${JSON.stringify(p2wdbData, null, 2)}`)
 
       // See if this instance of bch-dex is managing the Order associated with
       // the incoming Counter Offer.
-
-      // Note : this should be handled by nostrEvent id or UtxoId?
-      // const orderHash = offerData.data.nostrEventId
+      const orderHash = p2wdbData.data.offerHash
       let orderData = {}
       try {
-        orderData = await this.orderUseCase.findOrderByUtxo(offerData)
+        orderData = await this.orderUseCase.findOrderByHash(orderHash)
         console.log(`orderData: ${JSON.stringify(orderData, null, 2)}`)
       } catch (err) {
-        console.log('Order matching this Counter Offer is not managed by this instance of bch-dex. Skipping.')
-
-        // Add order to list of seen orders, so that we don't spent time trying to validate it again.
-        this.seenOffers.push(eventId)
-
-        return 'N/A'
-      }
-
-      // Verify that the UTXO for sale is valid.
-      let utxoStatus = null
-      try {
-        // Get the status of the UTXO associate with this Offer.
-        const utxo = {
-          tx_hash: offerData.data.utxoTxid,
-          tx_pos: offerData.data.utxoVout
-        }
-        // console.log(`Checking this UTXO: ${JSON.stringify(utxo, null, 2)}`)
-
-        // utxoStatus = await this.adapters.wallet.bchWallet.utxoIsValid(utxo)
-        utxoStatus = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.utxoIsValid, utxo)
-        console.log('utxoStatus: ', utxoStatus)
-      } catch (err) {
-        console.log('acceptCounterOffer() err validating UTXO: ', err)
-
-        // Handle corner case of bad-data in the Offer model.
-        if (err.isAxiosError) {
-          console.log('Error trying to contact wallet service: ', err)
-          return 'N/A'
-        } else {
-          return 'N/A'
-        }
-      }
-
-      // If the Offer UTXO is spent, exit.
-      if (utxoStatus === false) {
-        // Add order to list of seen orders, so that we don't spent time trying to validate it again.
-        this.seenOffers.push(eventId)
-
-        console.log(`Aborting Counter Offer from Event ID ${eventId}`)
-        console.log(`https://astral.psfoundation.info/${this.adapters.nostr.eventId2note(eventId)}`)
-
+        console.log('Order matching this Counter Offer is not managed by this instance of bch-dex. Exiting.')
         return 'N/A'
       }
 
       // Deserialize the partially signed transaction.
-      const txHex = offerData.data.partialTxHex
+      const txHex = p2wdbData.data.partialTxHex
       const txObj = await this.adapters.wallet.deseralizeTx(txHex)
       console.log(`txObj: ${JSON.stringify(txObj, null, 2)}`)
 
       // Ensure the 3rd output (vout=2) contains the required amount of BCH.
-      const satsToReceive = Math.ceil(orderData.numTokens * parseInt(orderData.rateInBaseUnit))
-      console.log('Ceil', satsToReceive)
+      const satsToReceive = orderData.numTokens * parseInt(orderData.rateInBaseUnit)
       if (isNaN(satsToReceive)) {
         throw new Error('Could not calculate the amount of BCH offered in the Counter Offer')
       }
@@ -613,7 +492,7 @@ class OfferUseCases {
 
       return txid
     } catch (err) {
-      console.error('Error in acceptCounterOffer(): ', err)
+      console.error('Error in acceptCounterOffer()')
       throw err
     }
   }
@@ -700,8 +579,7 @@ class OfferUseCases {
         }
 
         // If the Offer UTXO is spent, delete the Offer model.
-        if (utxoStatus === false) {
-          // console.log('utxoStatus: ', utxoStatus)
+        if (!utxoStatus) {
           console.log(`Spent UTXO detected. Deleting this Offer: ${JSON.stringify(thisOffer, null, 2)}`)
           await thisOffer.remove()
         }
@@ -721,81 +599,32 @@ class OfferUseCases {
     }
   }
 
-  // Flag offers as NSFW.
-  async flagOffer (flagData = {}) {
-    try {
-      if (!flagData.data) throw new Error('"data" property is required')
+  async flagOffer (flagData) {
+    console.log(`flagData: ${JSON.stringify(flagData, null, 2)}`)
 
-      console.log(`flagData: ${JSON.stringify(flagData, null, 2)}`)
+    const p2wdbHash = flagData.data.p2wdbHash
 
-      const eventId = flagData.data.nostrEventId
+    // Get the offer from the database.
+    const offer = await this.findOfferByHash(p2wdbHash)
+    console.log(`Flagging this offer: ${JSON.stringify(offer, null, 2)}`)
 
-      // Get the offer from the database.
-      const offer = await this.findOfferByEvent(eventId)
-      console.log(`Flagging this offer: ${JSON.stringify(offer, null, 2)}`)
-
-      if (!offer) {
-        throw new Error(`Offer ${eventId} not found in the database.`)
-      }
-
-      // Add the raw flag data to the database model.
-      offer.flags.push(flagData)
-
-      // If flag count is 3 or more, mark the Offer as NSFW
-      const flagCnt = offer.flags.length
-      if (flagCnt >= 3) {
-        offer.nsfw = true
-      }
-
-      // Save the updated offer data to the database.
-      await offer.save()
-
-      return true
-    } catch (error) {
-      console.error('Error in flagOffer(): ', error)
-      throw error
+    if (!offer) {
+      throw new Error(`Offer ${p2wdbHash} not found in the database.`)
     }
-  }
 
-  // Get offers data from nostr.
-  async loadOffers () {
-    try {
-      // Retrieve offers array.
-      const offers = await this.adapters.nostr.read()
-      // console.log('offers: ', offers)
+    // Add the raw flag data to the database model.
+    offer.flags.push(flagData)
 
-      for (let i = 0; i < offers.length; i++) {
-        try {
-          const offer = offers[i]
-
-          // offer data
-          const offerObj = JSON.parse(offer.content)
-
-          // Append the Nostr Event ID to the offer object
-          offerObj.data.nostrEventId = offer.eventId
-          // console.log('loadOffers() offerObj: ', offerObj)
-
-          if (offerObj.data.dataType === 'offer') {
-            // Try to create new offer
-            await this.createOffer(offerObj)
-          }
-
-          if (offerObj.data.dataType === 'counter-offer') {
-            // console.log('Counter offer detected: ', offerObj)
-            // console.log('Counter offer detected: ', offerObj.data.nostrEventId)
-            console.log(`Counter offer detected: https://astral.psfoundation.info/${this.adapters.nostr.eventId2note(offerObj.data.nostrEventId)}`)
-            await this.acceptCounterOffer(offerObj)
-          }
-
-          // Ignore the post if it doesn't fit the above filters.
-        } catch (error) {
-          /* exit quietly */
-        }
-      }
-    } catch (error) {
-      console.error('Error in loadOffers(): ', error)
-      throw error
+    // If flag count is 3 or more, mark the Offer as NSFW
+    const flagCnt = offer.flags.length
+    if (flagCnt >= 3) {
+      offer.nsfw = true
     }
+
+    // Save the updated offer data to the database.
+    await offer.save()
+
+    return true
   }
 }
 

src/use-cases/order.js

@@ -10,8 +10,6 @@ import wlogger from '../adapters/wlogger.js'
 import OrderEntity from '../entities/order.js'
 import config from '../../config/index.js'
 
-const DEFAULT_ENTRIES_PER_PAGE = 20
-
 class OrderLib {
   constructor (localConfig = {}) {
     // console.log('User localConfig: ', localConfig)
@@ -25,88 +23,54 @@ class OrderLib {
     // Encapsulate dependencies
     this.orderEntity = new OrderEntity()
     this.OrderModel = this.adapters.localdb.Order
-    this.UserModel = this.adapters.localdb.Users
     this.bch = this.adapters.bch
     this.config = config
     this.retryQueue = new RetryQueue({ retryPeriod: 1000, attempts: 3 })
 
     // Bind subfunctions to the 'this' object.
     this.ensureFunds = this.ensureFunds.bind(this)
-    this.createOrder = this.createOrder.bind(this)
-    this.findOrderByUtxo = this.findOrderByUtxo.bind(this)
   }
 
   // Create a new order model and add it to the Mongo database.
   async createOrder (entryObj) {
     try {
-      // console.log('createOrder(entryObj): ', entryObj)
+      console.log('createOrder(entryObj): ', entryObj)
       if (!entryObj) return false
 
       if (!entryObj.tokenId) throw new Error('entry does not contain required properties')
 
-      const user = await this.UserModel.findById(entryObj.userId)
-      if (!user) throw new Error('user not found')
-
-      console.log(`Using FullStack.cash: ${this.config.useFullStackCash}`)
-      const advancedConfig = {}
-      if (this.config.useFullStackCash) {
-        advancedConfig.interface = 'rest-api'
-        advancedConfig.restURL = this.config.apiServer
-        advancedConfig.apiToken = this.config.apiToken
-      } else {
-        advancedConfig.interface = 'consumer-api'
-        advancedConfig.restURL = this.config.consumerUrl
-      }
-
-      // Instantiate minimal-slp-wallet with the user's mnemonic.
-      const BchWallet = this.adapters.wallet.BchWallet
-      const userWallet = new BchWallet(user.mnemonic, advancedConfig)
-
-      // Wait for wallet to initialize.
-      await userWallet.walletInfoPromise
-      await userWallet.initialize()
-
       // Specify the address to send payment.
-      console.log('userWallet.walletInfo: ', userWallet.walletInfo)
-      entryObj.makerAddr = userWallet.walletInfo.cashAddress
+      entryObj.makerAddr = this.adapters.wallet.bchWallet.walletInfo.cashAddress
       console.log('entryObj.makerAddr: ', entryObj.makerAddr)
-      // console.log('entryObj.makerAddr: ', entryObj.makerAddr)
 
       // Input Validation
       const orderEntity = this.orderEntity.inputValidate(entryObj)
-      // console.log('orderEntity: ', orderEntity)
-
-      // Optimize the wallet to speed up working with it.
-      console.log('Optimizing wallet before creating new order.')
-      // await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.optimize, {})
-      await userWallet.optimize()
+      console.log('orderEntity: ', orderEntity)
 
       // Ensure sufficient tokens exist to create the order.
       // await this.ensureFunds(orderEntity)
-      // await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)
+      await this.retryQueue.addToQueue(this.ensureFunds, orderEntity)
 
       // Get Ticker for token ID.
       // const tokenData = await this.adapters.wallet.bchWallet.getTxData([entryObj.tokenId])
-      // const tokenData = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.getTxData, [entryObj.tokenId])
-      const tokenData = await userWallet.getTxData([entryObj.tokenId])
+      const tokenData = await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.getTxData, [entryObj.tokenId])
       // console.log(`tokenData: ${JSON.stringify(tokenData, null, 2)}`)
       orderEntity.ticker = tokenData[0].tokenTicker
 
       // Move the tokens to holding address.
       const moveObj = {
         tokenId: orderEntity.tokenId,
-        qty: orderEntity.numTokens,
-        wallet: userWallet
+        qty: orderEntity.numTokens
       }
       // const utxoInfo = await this.adapters.wallet.moveTokens(moveObj)
-      const utxoInfo = await this.retryQueue.addToQueue(this.adapters.wallet.moveTokensFromCustomWallet, moveObj)
-      // console.log('utxoInfo: ', utxoInfo)
+      const utxoInfo = await this.retryQueue.addToQueue(this.adapters.wallet.moveTokens, moveObj)
+      console.log('utxoInfo: ', utxoInfo)
 
       // Update the UTXO store for the wallet.
-      await userWallet.bchjs.Util.sleep(3000)
+      await this.adapters.wallet.bchWallet.bchjs.Util.sleep(3000)
       // await this.adapters.wallet.bchWallet.getUtxos()
-      // await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.initialize, {})
-      await userWallet.initialize()
+      await this.retryQueue.addToQueue(this.adapters.wallet.bchWallet.initialize, {})
+
       // Update the order with the new UTXO information.
       orderEntity.utxoTxid = utxoInfo.txid
       orderEntity.utxoVout = utxoInfo.vout
@@ -115,29 +79,28 @@ class OrderLib {
       // Add P2WDB specific flag for signaling that this is a new offer.
       orderEntity.dataType = 'offer'
 
-      // Post the new Order information to Nostr under the topic set in the
-      // config file.
-      const postObj = {
-        data: orderEntity
+      // Add order to P2WDB.
+      const p2wdbObj = {
+        wif: this.adapters.wallet.bchWallet.walletInfo.privateKey,
+        data: orderEntity,
+        appId: this.config.p2wdbAppId
       }
-      const postMsg = JSON.stringify(postObj)
-      const eventId = await this.adapters.nostr.post(postMsg)
+      // const hash = await this.adapters.p2wdb.write(p2wdbObj)
+      const hash = await this.retryQueue.addToQueue(this.adapters.p2wdb.write, p2wdbObj)
       // console.log('hash: ', hash)
 
       // Create a MongoDB model to hold the Order
       orderEntity.hdIndex = utxoInfo.hdIndex
-      orderEntity.nostrEventId = eventId
+      orderEntity.p2wdbHash = hash
 
       console.log(`creating new order model: ${JSON.stringify(orderEntity, null, 2)}`)
       const order = new this.OrderModel(orderEntity)
       await order.save()
 
-      const noteId = this.adapters.nostr.eventId2note(eventId)
-
-      return { eventId, noteId }
+      return hash
     } catch (err) {
       // console.log("Error in use-cases/entry.js/createEntry()", err.message)
-      wlogger.error('Error in use-cases/order.js/createOrder(): ', err)
+      wlogger.error('Error in use-cases/order.js/createOrder())')
       console.log('error entryObj: ', entryObj)
       throw err
     }
@@ -168,10 +131,12 @@ class OrderLib {
 
         // Combine Fungible and NFT token UTXOs.
         let tokenUtxos = utxos.slpUtxos.type1.tokens.concat(utxos.slpUtxos.nft.tokens)
+
         // Get token UTXOs that match the token in the order.
         tokenUtxos = tokenUtxos.filter(
           x => x.tokenId === orderEntity.tokenId
         )
+        console.log('tokenUtxos: ', tokenUtxos)
 
         // Get the total amount of tokens in the wallet that match the token
         // in the order.
@@ -187,7 +152,7 @@ class OrderLib {
           )
         }
 
-        //
+      //
       } else {
         // Buy Order
         throw new Error('Buy orders are not supported yet.')
@@ -200,14 +165,14 @@ class OrderLib {
     }
   }
 
-  // Retrieve an Order model from the database. Find it by its event Id.
-  async findOrderByEvent (nostrEventId) {
+  // Retrieve an Order model from the database. Find it by its P2WDB CID.
+  async findOrderByHash (p2wdbHash) {
     try {
-      if (typeof nostrEventId !== 'string' || !nostrEventId) {
-        throw new Error('nostrEventId must be a string')
+      if (typeof p2wdbHash !== 'string' || !p2wdbHash) {
+        throw new Error('p2wdbHash must be a string')
       }
 
-      const order = await this.OrderModel.findOne({ nostrEventId })
+      const order = await this.OrderModel.findOne({ p2wdbHash })
 
       if (!order) {
         throw new Error('order not found')
@@ -218,35 +183,7 @@ class OrderLib {
 
       return orderObject
     } catch (err) {
-      console.error('Error in findOrderByEvent()')
-      throw err
-    }
-  }
-
-  // Retrieve an Order model from the database. Find it by its UTXO (TXID & Vout)
-  async findOrderByUtxo (offerData = {}) {
-    try {
-      // console.log('findOrderByUtxo() offerData: ', offerData)
-
-      // const order = await this.OrderModel.findOne({ nostrEventId })
-      const order = await this.OrderModel.findOne({ utxoTxid: offerData.data.utxoTxid, utxoVout: offerData.data.utxoVout })
-      // const order = await this.OrderModel.findOne({ utxoTxid: offerData.data.utxoTxid })
-      // const order = await this.OrderModel.findOne({ tokenId: offerData.data.tokenId })
-      console.log('findOrderByUtxo() order: ', order)
-
-      if (!order) {
-        throw new Error('order not found')
-      }
-      if (!order.nostrEventId) {
-        throw new Error('order not found')
-      }
-
-      const orderObject = order.toObject()
-      // return this.offerEntity.validateFromModel(offerObject)
-
-      return orderObject
-    } catch (err) {
-      console.error('Error in findOrderByUtxo(): ', err)
+      console.error('Error in findOrder()')
       throw err
     }
   }
@@ -298,8 +235,7 @@ class OrderLib {
         }
 
         // If the Order UTXO is spent, delete the Order model.
-        if (utxoStatus === false) {
-          // console.log('utxoStatus: ', utxoStatus)
+        if (!utxoStatus) {
           console.log(`Spent UTXO detected. Deleting this Order: ${JSON.stringify(thisOrder, null, 2)}`)
           await thisOrder.remove()
         }
@@ -309,42 +245,6 @@ class OrderLib {
       throw err
     }
   }
-
-  async listOrders (page = 0) {
-    try {
-      const data = await this.OrderModel.find({})
-
-        // Sort entries so newest entries show first.
-        .sort('-timestamp')
-        // Skip to the start of the selected page.
-        .skip(page * DEFAULT_ENTRIES_PER_PAGE)
-        // Only return 20 results.
-        .limit(DEFAULT_ENTRIES_PER_PAGE)
-
-      return data
-    } catch (error) {
-      console.error('Error in use-cases/order/listOrders()')
-      throw error
-    }
-  }
-
-  // Delete an Order model by sending the token back to the root address. This
-  // will allow the garbage collectors to delete the Order and the Offer.
-  async deleteOrder (nostrEventId) {
-    try {
-      // Find the order by the given hash.
-      const order = await this.findOrderByEvent(nostrEventId)
-      console.log('order: ', order)
-
-      // Reclaim the tokens
-      const txid = await this.adapters.wallet.reclaimTokens(order)
-
-      return txid
-    } catch (err) {
-      console.error('Error in use-cases/order/deleteOrder()')
-      throw err
-    }
-  }
 }
 
 export default OrderLib

src/use-cases/usage-use-cases.js

@@ -1,140 +0,0 @@
-/*
-  Use Case library for tracking usage. This library contains business logic
-  for tracking the usage of REST API and JSON RPC calls. This library is used
-  by admins to keep an eye on how many API calls were made in a 24-hour and
-  1-hour time period.
-*/
-
-// This global variable is used to share data between the REST middleware and
-// the Usage Use Case class instance.
-let restCalls = []
-
-class UsageUseCases {
-  constructor (localConfig = {}) {
-    // console.log('User localConfig: ', localConfig)
-    this.adapters = localConfig.adapters
-    if (!this.adapters) {
-      throw new Error(
-        'Instance of adapters must be passed in when instantiating Usage Use Cases library.'
-      )
-    }
-
-    // Bind 'this' object to all subfunctions
-    this.cleanUsage = this.cleanUsage.bind(this)
-    this.getRestSummary = this.getRestSummary.bind(this)
-    this.getTopIps = this.getTopIps.bind(this)
-    this.getTopEndpoints = this.getTopEndpoints.bind(this)
-
-    // State
-  }
-
-  // Clean up the state by removing entries that are older than 24 hours. This
-  // ensures stats reflect only the last 24 hours.
-  // This function is called by a Timer Controller.
-  cleanUsage () {
-    try {
-      const now = new Date()
-      const twentyFourHoursAgo = now.getTime() - (60000 * 60 * 24)
-
-      console.log('cleanUsage() now: ', now)
-      console.log('cleanUsage() restCalls.length before filtering: ', restCalls.length)
-      restCalls = restCalls.filter(x => x.timestamp > twentyFourHoursAgo)
-      console.log('cleanUsage() restCalls.length after filtering: ', restCalls.length)
-
-      return restCalls
-    } catch (err) {
-      console.error('Error in usage-use-cases.js/cleanUsage()')
-      throw err
-    }
-  }
-
-  // Track the calls to a REST API
-  getRestSummary (inObj = {}) {
-    try {
-      console.log(`getRestSummary(): There have been ${restCalls.length} REST calls`)
-
-      return restCalls.length
-    } catch (err) {
-      console.error('Error in usage-use-cases.js/getRestSummary()')
-      throw err
-    }
-  }
-
-  // Get the top 20 IP addresses from the stats.
-  getTopIps () {
-    try {
-      const ips = restCalls.map(x => x.ip)
-      // Create a Map to count occurrences of each IP address string
-      const countMap = new Map()
-      ips.forEach(ip => {
-        countMap.set(ip, (countMap.get(ip) || 0) + 1)
-      })
-
-      // Convert the Map into an array of objects with `str` and `cnt` properties
-      const result = Array.from(countMap, ([ip, cnt]) => ({ ip, cnt }))
-
-      // Sort the results by the `cnt` property in descending order
-      result.sort((a, b) => b.cnt - a.cnt)
-
-      // Ensure the result has at most 20 elements
-      return result.slice(0, 20)
-    } catch (err) {
-      console.error('Error in usage-use-cases.js/getTopIps()')
-      throw err
-    }
-  }
-
-  // Get the top 20 most consumed endpoints.
-  getTopEndpoints () {
-    try {
-      const endpoints = restCalls.map(x => `${x.method} ${x.url}`)
-
-      // Create a Map to count occurrences of each IP address string
-      const countMap = new Map()
-      endpoints.forEach(endpoint => {
-        countMap.set(endpoint, (countMap.get(endpoint) || 0) + 1)
-      })
-
-      // Convert the Map into an array of objects with `str` and `cnt` properties
-      const result = Array.from(countMap, ([endpoint, cnt]) => ({ endpoint, cnt }))
-
-      // Sort the results by the `cnt` property in descending order
-      result.sort((a, b) => b.cnt - a.cnt)
-
-      // Ensure the result has at most 20 elements
-      return result.slice(0, 20)
-    } catch (err) {
-      console.error('Error in usage-use-cases.js/getTopEndpoints()')
-      throw err
-    }
-  }
-}
-
-// This Koa middleware is called any time there is a REST API. It logs the
-// details from the request object.
-function usageMiddleware () {
-  return async (ctx, next) => {
-    try {
-      await next()
-
-      // console.log('ctx.request: ', ctx.request)
-      const now = new Date()
-
-      const reqObj = {
-        ip: ctx.request.ip,
-        url: ctx.request.url,
-        method: ctx.request.method,
-        timestamp: now.getTime()
-      }
-      // console.log('reqObj: ', reqObj)
-
-      restCalls.push(reqObj)
-    } catch (err) {
-      ctx.status = err.status || 500
-      ctx.body = err.message
-      ctx.app.emit('error', err, ctx)
-    }
-  }
-};
-
-export { UsageUseCases, usageMiddleware, restCalls }

src/use-cases/user.js

@@ -16,7 +16,7 @@ class UserLib {
         'Instance of adapters must be passed in when instantiating User Use Cases library.'
       )
     }
-    this.BchWallet = this.adapters.wallet.BchWallet
+
     // Encapsulate dependencies
     this.UserEntity = new UserEntity()
     this.UserModel = this.adapters.localdb.Users
@@ -30,11 +30,6 @@ class UserLib {
       const userEntity = this.UserEntity.validate(userObj)
       const user = new this.UserModel(userEntity)
 
-      const wallet = new this.BchWallet()
-      const walletInfo = await wallet.walletInfoPromise
-      const mnemonic = walletInfo.mnemonic
-      user.mnemonic = mnemonic
-
       // Enforce default value of 'user'
       user.type = 'user'
       // console.log('user: ', user)
@@ -107,7 +102,6 @@ class UserLib {
 
       // Input Validation
       // Optional inputs, but they must be strings if included.
-
       if (newData.email && typeof newData.email !== 'string') {
         throw new Error("Property 'email' must be a string!")
       }
@@ -117,9 +111,6 @@ class UserLib {
       if (newData.password && typeof newData.password !== 'string') {
         throw new Error("Property 'password' must be a string!")
       }
-      if (newData.mnemonic) {
-        throw new Error("Property 'mnemonic' cannot be updated!")
-      }
 
       // Save a copy of the original user type.
       const userType = existingUser.type

test/e2e/automated/a01-auth.rest-e2e.js

@@ -13,6 +13,7 @@ import axios from 'axios'
 
 // Local support libraries
 import config from '../../../config/index.js'
+
 import Server from '../../../bin/server.js'
 import testUtils from '../../utils/test-utils.js'
 import AdminLib from '../../../src/adapters/admin.js'
@@ -23,107 +24,105 @@ const context = {}
 
 const LOCALHOST = `http://localhost:${config.port}`
 
-if (!config.noMongo) {
-  describe('Auth', () => {
-    before(async () => {
-      const app = new Server()
+describe('Auth', () => {
+  before(async () => {
+    const app = new Server()
 
-      // This should be the first instruction. It starts the REST API server.
-      await app.startServer()
+    // This should be the first instruction. It starts the REST API server.
+    await app.startServer()
 
-      // Stop the IPFS node for the rest of the e2e tests.
-      // await app.controllers.adapters.ipfs.stop()
+    // Stop the IPFS node for the rest of the e2e tests.
+    // await app.controllers.adapters.ipfs.stop()
 
-      // Delete all previous users in the database.
-      await testUtils.deleteAllUsers()
+    // Delete all previous users in the database.
+    await testUtils.deleteAllUsers()
 
-      // Create a new admin user.
-      await adminLib.createSystemUser()
+    // Create a new admin user.
+    await adminLib.createSystemUser()
 
-      const userObj = {
-        email: 'test@test.com',
-        password: 'pass',
-        name: 'test'
+    const userObj = {
+      email: 'test@test.com',
+      password: 'pass',
+      name: 'test'
+    }
+    const testUser = await testUtils.createUser(userObj)
+    // console.log('TestUser: ', testUser)
+
+    context.user = testUser.user
+    context.token = testUser.token
+  })
+
+  describe('POST /auth', () => {
+    it('should throw 401 if credentials are incorrect', async () => {
+      try {
+        const options = {
+          method: 'post',
+          url: `${LOCALHOST}/auth`,
+          data: {
+            email: 'test@test.com',
+            password: 'wrongpassword'
+          }
+        }
+
+        const result = await axios(options)
+
+        // console.log(`result: ${JSON.stringify(result, null, 2)}`)
+
+        console.log(
+          `result stringified: ${JSON.stringify(result.data, null, 2)}`
+        )
+        assert(false, 'Unexpected result')
+      } catch (err) {
+        assert(err.response.status === 401, 'Error code 401 expected.')
       }
-      const testUser = await testUtils.createUser(userObj)
-      // console.log('TestUser: ', testUser)
-
-      context.user = testUser.user
-      context.token = testUser.token
     })
 
-    describe('POST /auth', () => {
-      it('should throw 401 if credentials are incorrect', async () => {
-        try {
-          const options = {
-            method: 'post',
-            url: `${LOCALHOST}/auth`,
-            data: {
-              email: 'test@test.com',
-              password: 'wrongpassword'
-            }
+    it('should throw 401 if email is wrong format', async () => {
+      try {
+        const options = {
+          method: 'post',
+          url: `${LOCALHOST}/auth`,
+          data: {
+            email: 'wrongEmail',
+            password: 'wrongpassword'
           }
-
-          const result = await axios(options)
-
-          // console.log(`result: ${JSON.stringify(result, null, 2)}`)
-
-          console.log(
-            `result stringified: ${JSON.stringify(result.data, null, 2)}`
-          )
-          assert(false, 'Unexpected result')
-        } catch (err) {
-          assert(err.response.status === 401, 'Error code 401 expected.')
         }
-      })
 
-      it('should throw 401 if email is wrong format', async () => {
-        try {
-          const options = {
-            method: 'post',
-            url: `${LOCALHOST}/auth`,
-            data: {
-              email: 'wrongEmail',
-              password: 'wrongpassword'
-            }
+        await axios(options)
+        assert(false, 'Unexpected result')
+      } catch (err) {
+        assert(err.response.status === 401, 'Error code 401 expected.')
+      }
+    })
+
+    it('should auth user', async () => {
+      try {
+        const options = {
+          method: 'post',
+          url: `${LOCALHOST}/auth`,
+          data: {
+            email: 'test@test.com',
+            password: 'pass'
           }
-
-          await axios(options)
-          assert(false, 'Unexpected result')
-        } catch (err) {
-          assert(err.response.status === 401, 'Error code 401 expected.')
         }
-      })
+        const result = await axios(options)
+        // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
 
-      it('should auth user', async () => {
-        try {
-          const options = {
-            method: 'post',
-            url: `${LOCALHOST}/auth`,
-            data: {
-              email: 'test@test.com',
-              password: 'pass'
-            }
-          }
-          const result = await axios(options)
-          // console.log(`result: ${JSON.stringify(result.data, null, 2)}`)
-
-          assert(result.status === 200, 'Status Code 200 expected.')
-          assert(
-            result.data.user.email === 'test@test.com',
-            'Email of test expected'
-          )
-          assert(
-            result.data.user.password === undefined,
-            'Password expected to be omited'
-          )
-        } catch (err) {
-          console.log(
-            'Error authenticating test user: ' + JSON.stringify(err, null, 2)
-          )
-          throw err
-        }
-      })
+        assert(result.status === 200, 'Status Code 200 expected.')
+        assert(
+          result.data.user.email === 'test@test.com',
+          'Email of test expected'
+        )
+        assert(
+          result.data.user.password === undefined,
+          'Password expected to be omited'
+        )
+      } catch (err) {
+        console.log(
+          'Error authenticating test user: ' + JSON.stringify(err, null, 2)
+        )
+        throw err
+      }
     })
   })
-}
+})

test/e2e/automated/a09-admin.rest-e2e.js

@@ -2,8 +2,6 @@ import { assert } from 'chai'
 import Admin from '../../../src/adapters/admin.js'
 import sinon from 'sinon'
 import util from 'util'
-import config from '../../../config/index.js'
-
 util.inspect.defaultOptions = { depth: 1 }
 
 let sandbox
@@ -17,118 +15,101 @@ describe('Admin', () => {
 
   afterEach(() => sandbox.restore())
 
-  if (!config.noMongo) {
-    describe('loginAdmin()', () => {
-      it('should logind admin', async () => {
-        try {
-          const error = new Error('test error')
-          error.response = {
-            status: 422
-          }
-          // sandbox.stub(uut.axios, 'request').onFirstCall().throws(error)
-
-          const result = await uut.loginAdmin()
-          const user = result.data.user
-
-          assert.property(user, '_id')
-          assert.property(user, 'email')
-          assert.property(user, 'type')
-
-          assert.isString(user._id)
-          assert.isString(user.email)
-          assert.isString(user.type)
-
-          assert.equal(user.type, 'admin')
-        } catch (err) {
-          assert(false, 'Unexpected result')
+  describe('loginAdmin()', () => {
+    it('should logind admin', async () => {
+      try {
+        const error = new Error('test error')
+        error.response = {
+          status: 422
         }
-      })
+        // sandbox.stub(uut.axios, 'request').onFirstCall().throws(error)
 
-      it('should handle axios error', async () => {
-        try {
-          // Returns an erroneous password to force
-          // an auth error
-          sandbox.stub(uut.jsonFiles, 'readJSON').resolves({ password: 'wrong' })
+        const result = await uut.loginAdmin()
+        const user = result.data.user
 
-          await uut.loginAdmin()
-          assert(false, 'Unexpected result')
-        } catch (err) {
-          assert.equal(err.response.status, 401)
-          assert.include(err.response.data, 'Unauthorized')
-        }
-      })
+        assert.property(user, '_id')
+        assert.property(user, 'email')
+        assert.property(user, 'type')
+
+        assert.isString(user._id)
+        assert.isString(user.email)
+        assert.isString(user.type)
+
+        assert.equal(user.type, 'admin')
+      } catch (err) {
+        assert(false, 'Unexpected result')
+      }
     })
 
-    describe('createSystemUser()', () => {
-      it('should create admin', async () => {
-        try {
-          await uut.deleteExistingSystemUser()
-          const result = await uut.createSystemUser()
+    it('should handle axios error', async () => {
+      try {
+        // Returns an erroneous password to force
+        // an auth error
+        sandbox.stub(uut.jsonFiles, 'readJSON').resolves({ password: 'wrong' })
 
-          assert.property(result, 'email')
-          assert.property(result, 'password')
-          assert.property(result, 'id')
-          assert.property(result, 'token')
-        } catch (err) {
-          assert(false, 'Unexpected result')
-        }
-      })
-      it('should update admin password', async () => {
-        try {
-          uut.config.adminPassword = 'newpassword'
+        await uut.loginAdmin()
+        assert(false, 'Unexpected result')
+      } catch (err) {
+        assert.equal(err.response.status, 401)
+        assert.include(err.response.data, 'Unauthorized')
+      }
+    })
+  })
 
-          const fakeUser = {
-            password: 'oldpassword',
-            save: () => { return 'token' },
-            generateToken: () => { return 'token' }
-          }
+  describe('createSystemUser()', () => {
+    it('should create admin', async () => {
+      try {
+        const result = await uut.createSystemUser()
 
-          sandbox.stub(uut.User, 'findOne').resolves(fakeUser)
-          const result = await uut.createSystemUser()
-
-          assert.property(result, 'email')
-          assert.property(result, 'password')
-          assert.property(result, 'id')
-          assert.property(result, 'token')
-
-          assert.equal(fakeUser.password, 'newpassword', 'password should be updated')
-        } catch (err) {
-          console.log(err)
-          assert(false, 'Unexpected result')
-        }
-      })
-
-      it('should handle error', async () => {
-        try {
-          sandbox.stub(uut.User, 'findOne').throws(new Error('test error'))
-          await uut.createSystemUser()
-          assert.fail('Unexpected result')
-        } catch (err) {
-          assert.include(err.message, 'test error')
-        }
-      })
+        assert.property(result, 'email')
+        assert.property(result, 'password')
+        assert.property(result, 'id')
+        assert.property(result, 'token')
+      } catch (err) {
+        assert(false, 'Unexpected result')
+      }
     })
 
-    describe('deleteExistingSystemUser()', () => {
-      it('should delete admin', async () => {
-        try {
-          sandbox.stub(uut.User, 'deleteOne').resolves(true)
-          const result = await uut.deleteExistingSystemUser()
-          assert.isTrue(result)
-        } catch (err) {
-          assert(false, 'Unexpected result')
+    it('should handle axios error', async () => {
+      try {
+        const error1 = new Error('test error')
+        error1.response = {
+          status: 422
         }
-      })
+        const error2 = new Error('test error')
+        error1.response = {
+          status: 500
+        }
+        // The loginAdmin() function in some use cases is recursive
+        // after handling the 422 error, it gets called again
+        sandbox
+          .stub(uut.axios, 'request')
+          .onFirstCall()
+          .throws(error1)
+          .onSecondCall()
+          .throws(error2)
 
-      it('should handle error when deleting admin', async () => {
-        try {
-          sandbox.stub(uut.User, 'deleteOne').throws(new Error('test error'))
-          await uut.deleteExistingSystemUser()
-          assert.fail('Unexpected result')
-        } catch (err) {
-          assert.include(err.message, 'test error')
-        }
-      })
+        await uut.createSystemUser()
+        assert(false, 'Unexpected result')
+      } catch (err) {
+        assert.include(err.message, 'test error')
+      }
     })
-  }
+
+    it('should handle errors when remove user', async () => {
+      try {
+        const error1 = new Error('test error')
+        error1.response = {
+          status: 422
+        }
+        sandbox.stub(uut.axios, 'request').throws(error1)
+        sandbox.stub(uut.User, 'deleteOne').throws(new Error('test error'))
+
+        await uut.createSystemUser()
+        assert(false, 'Unexpected result')
+      } catch (err) {
+        assert.include(err.message, 'test error')
+      }
+    })
+  })
 })

test/e2e/automated/a10-usage.rest-e2e.js

@@ -1,74 +0,0 @@
-/*
-End-to-end tests for /usage endpoints.
-*/
-
-import config from '../../../config/index.js'
-import { assert } from 'chai'
-import axios from 'axios'
-import sinon from 'sinon'
-import util from 'util'
-
-util.inspect.defaultOptions = { depth: 1 }
-
-const LOCALHOST = `http://localhost:${config.port}`
-
-let sandbox
-
-describe('Usage', () => {
-  beforeEach(() => {
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('GET /usage', () => {
-    it('should return usage status', async () => {
-      try {
-        const options = {
-          method: 'get',
-          url: `${LOCALHOST}/usage`
-        }
-
-        const result = await axios(options)
-
-        assert.property(result.data, 'status')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('GET /usage/ips', () => {
-    it('should return ips', async () => {
-      try {
-        const options = {
-          method: 'get',
-          url: `${LOCALHOST}/usage/ips`
-        }
-
-        const result = await axios(options)
-
-        assert.property(result.data, 'ips')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-
-  describe('GET /usage/endpoints', () => {
-    it('should return ips', async () => {
-      try {
-        const options = {
-          method: 'get',
-          url: `${LOCALHOST}/usage/endpoints`
-        }
-
-        const result = await axios(options)
-
-        assert.property(result.data, 'endpoints')
-      } catch (err) {
-        assert(false, 'Unexpected result')
-      }
-    })
-  })
-})

test/unit/adapters/adapters-index-unit.js

@@ -27,8 +27,6 @@ describe('#adapters', () => {
     it('should start the async adapters', async () => {
       // Mock dependencies
       uut.config.getJwtAtStartup = true
-      uut.config.useIpfs = true
-      uut.config.env = 'not-a-test'
       sandbox.stub(uut.fullStackJwt, 'getJWT').resolves()
       sandbox.stub(uut.fullStackJwt, 'instanceBchjs').resolves()
       sandbox.stub(uut.ipfs, 'start').resolves()

test/unit/adapters/ipfs-coord.adapter.unit.js

@@ -52,7 +52,7 @@ describe('#IPFS', () => {
     it('should get the public IP address if this node is a Circuit Relay', async () => {
       // Mock dependencies.
       uut.IpfsCoord = IPFSCoordMock
-      sandbox.stub(uut, 'publicIp').resolves('123')
+      sandbox.stub(uut.publicIp, 'v4').resolves('123')
 
       // Force Circuit Relay
       uut.config.isCircuitRelay = true
@@ -66,7 +66,7 @@ describe('#IPFS', () => {
     it('should exit quietly if this node is a Circuit Relay and there is an issue getting the IP address', async () => {
       // Mock dependencies.
       uut.IpfsCoord = IPFSCoordMock
-      sandbox.stub(uut, 'publicIp').rejects(new Error('test error'))
+      sandbox.stub(uut.publicIp, 'v4').rejects(new Error('test error'))
 
       // Force Circuit Relay
       uut.config.isCircuitRelay = true

test/unit/adapters/ipfs-index.adapter.unit.js

@@ -66,155 +66,4 @@ describe('#IPFS-adapter-index', () => {
       }
     })
   })
-
-  describe('#getStatus', () => {
-    it('should return an object with node metrics', () => {
-      // Force uut to have the needed properties
-      uut.ipfsCoordAdapter = {
-        ipfsCoord: {
-          thisNode: {
-            ipfsId: 'fake-id',
-            ipfsMultiaddrs: [],
-            bchAddr: 'fake-bch-addr',
-            slpAddr: 'fake-slp-addr',
-            pubKey: 'fake-pubkey',
-            peerList: [],
-            relayData: []
-          }
-        }
-      }
-
-      const result = uut.getStatus()
-      // console.log('result: ', result)
-
-      assert.property(result, 'ipfsId')
-      assert.property(result, 'multiAddrs')
-      assert.property(result, 'bchAddr')
-      assert.property(result, 'slpAddr')
-      assert.property(result, 'pubKey')
-      assert.property(result, 'peers')
-      assert.property(result, 'relays')
-    })
-
-    it('should catch, report, and throw errors', () => {
-      try {
-        uut.getStatus()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err.message: ', err.message)
-        assert.include(err.message, 'Cannot read properties')
-      }
-    })
-  })
-
-  describe('#_removeDuplicatePeers', () => {
-    it('should return the same array when there are no duplicates', () => {
-      const inArray = [
-        '12D3KooWPpBXhhAeoCZCGuQ3KR4xwHzzvtP57f6zLmo8P7ZFBJFE',
-        '12D3KooWRBhwfeP2Y9CDkFRBAZ1pmxUadH36TKuk3KtKm5XXP8mA',
-        '12D3KooWGsgHWyDLKuV4ZSfRJfsxQJj77rxx3i8Px3qXKHsLN7a2',
-        '12D3KooWJyc54njjeZGbLew4D8u1ghrmZTTPyh3QpBF7dxtd3zGY',
-        '12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu'
-      ]
-
-      const result = uut._removeDuplicatePeers(inArray)
-      // console.log('result: ', result)
-
-      assert.equal(result.length, inArray.length)
-    })
-
-    it('should remove duplicates from an array', () => {
-      const inArray = [
-        '12D3KooWPpBXhhAeoCZCGuQ3KR4xwHzzvtP57f6zLmo8P7ZFBJFE',
-        '12D3KooWRBhwfeP2Y9CDkFRBAZ1pmxUadH36TKuk3KtKm5XXP8mA',
-        '12D3KooWGsgHWyDLKuV4ZSfRJfsxQJj77rxx3i8Px3qXKHsLN7a2',
-        '12D3KooWJyc54njjeZGbLew4D8u1ghrmZTTPyh3QpBF7dxtd3zGY',
-        '12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu',
-        '12D3KooWPpBXhhAeoCZCGuQ3KR4xwHzzvtP57f6zLmo8P7ZFBJFE',
-        '12D3KooWRBhwfeP2Y9CDkFRBAZ1pmxUadH36TKuk3KtKm5XXP8mA'
-      ]
-
-      const result = uut._removeDuplicatePeers(inArray)
-      // console.log('result: ', result)
-
-      assert.equal(result.length, inArray.length - 2)
-    })
-  })
-
-  describe('#getPeers', () => {
-    it('should return an array of current JSON data about each peer when showAll is true', async () => {
-      // Mock dependencies
-      uut.ipfsCoordAdapter.ipfsCoord = {
-        thisNode: {
-          peerData: [{ from: 'a', data: { jsonLd: { name: 'a', protocol: 'test', version: '1' } } }, { from: 'b' }]
-        },
-        adapters: {
-          ipfs: {
-            getPeers: async () => ['a', 'b']
-          }
-        }
-      }
-
-      const result = await uut.getPeers(true)
-
-      assert.isArray(result)
-    })
-
-    it('should catch, report, and throw errors', async () => {
-      try {
-        // Force an error
-        uut.ipfsCoordAdapter.ipfsCoord = {
-          thisNode: {},
-          adapters: {
-            ipfs: {
-              getPeers: async () => { throw new Error('test error') }
-            }
-          }
-        }
-
-        await uut.getPeers()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err.message: ', err.message)
-        assert.include(err.message, 'test error')
-      }
-    })
-  })
-
-  describe('#getRelays', () => {
-    it('should return known relays', () => {
-      uut.ipfsCoordAdapter.ipfsCoord = {
-        thisNode: {
-          peerData: [{ from: 'a', data: { jsonLd: { name: 'a', description: 'test' } } }, { from: 'b' }],
-          relayData: [{ ipfsId: 'c' }, { ipfsId: 'a' }]
-        }
-      }
-
-      const result = uut.getRelays()
-      // console.log('result: ', result)
-
-      assert.isArray(result.v2Relays)
-      assert.equal(result.v2Relays.length, 2)
-      assert.property(result.v2Relays[0], 'name')
-      assert.property(result.v2Relays[0], 'description')
-      assert.property(result.v2Relays[1], 'name')
-      assert.property(result.v2Relays[1], 'description')
-    })
-
-    it('should catch, report, and throw errors', () => {
-      try {
-        // Force an error
-        uut.ipfsCoordAdapter.ipfsCoord = { thisNode: {} }
-
-        uut.getRelays()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err.message: ', err.message)
-        assert.include(err.message, 'Cannot read')
-      }
-    })
-  })
 })

test/unit/adapters/ipfs.adapter.unit.js

@@ -2,29 +2,21 @@
   Unit tests for the IPFS Adapter.
 */
 
-// Global npm libraries
 import { assert } from 'chai'
-import sinon from 'sinon'
-import cloneDeep from 'lodash.clonedeep'
-// import { peerIdFromString } from '@libp2p/peer-id'
 
-// Local libraries
+import sinon from 'sinon'
 import IPFSLib from '../../../src/adapters/ipfs/ipfs.js'
-// import create from '../mocks/ipfs-mock.js'
+import create from '../mocks/ipfs-mock.js'
 import config from '../../../config/index.js'
-import createHeliaLib from '../mocks/helia-mock.js'
 
 // config.isProduction =  true;
 describe('#IPFS-adapter', () => {
   let uut
   let sandbox
-  let ipfs
 
   beforeEach(() => {
     uut = new IPFSLib()
 
-    ipfs = cloneDeep(createHeliaLib)
-
     sandbox = sinon.createSandbox()
   })
 
@@ -53,28 +45,35 @@ describe('#IPFS-adapter', () => {
   describe('#start', () => {
     it('should return a promise that resolves into an instance of IPFS.', async () => {
       // Mock dependencies.
-      sandbox.stub(uut, 'createNode').resolves(ipfs)
-      sandbox.stub(uut, 'publicIp').resolves('192.168.2.4')
-      sandbox.stub(uut, 'multiaddr').returns('/ip4/fake-multiaddr')
+      uut.create = create
 
       const result = await uut.start()
       // console.log('result: ', result)
 
-      // Assert properties of the instance are set.
       assert.equal(uut.isReady, true)
-      assert.property(uut, 'multiaddrs')
-      assert.property(uut, 'id')
 
-      // Output should be an instance of IPFS
-      assert.property(result, 'libp2p')
+      assert.property(result, 'config')
+    })
+
+    it('should return a promise that resolves into an instance of IPFS in production mode.', async () => {
+      // Mock dependencies.
+      uut.create = create
+      uut.config.isProduction = true
+      const result = await uut.start()
+      // console.log('result: ', result)
+
+      assert.equal(uut.isReady, true)
+
+      assert.property(result, 'config')
     })
 
     it('should catch and throw an error', async () => {
       try {
         // Force an error
-        sandbox.stub(uut, 'createNode').rejects(new Error('test error'))
+        sandbox.stub(uut, 'create').rejects(new Error('test error'))
 
         await uut.start()
+
         assert.fail('Unexpected code path.')
       } catch (err) {
         // console.log(err)
@@ -97,146 +96,24 @@ describe('#IPFS-adapter', () => {
     })
   })
 
-  describe('#ensureBlocksDir', () => {
-    it('should create directory if it does not exist', () => {
-      // Force desired code path
-      sandbox.stub(uut.fs, 'existsSync').returns(false)
-      sandbox.stub(uut.fs, 'mkdirSync').returns(true)
-
-      const result = uut.ensureBlocksDir()
-
-      assert.equal(result, true)
-    })
-
-    it('should report and throw errors', () => {
-      // Force an error
-      sandbox.stub(uut.fs, 'existsSync').throws(new Error('test error'))
-
-      try {
-        uut.ensureBlocksDir()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-  })
-
-  describe('#createNode', () => {
-    it('should report and throw errors', async () => {
-      // Force an error
-      sandbox.stub(uut, 'createLibp2p').rejects(new Error('test error'))
-
-      try {
-        await uut.createNode()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should create an IPFS node from Helia', async () => {
-      uut.config.isCircuitRelay = false
-      const result = await uut.createNode()
-      // console.log('result: ', result)
-
-      // Assert the returned IPFS node has expected properties
-      assert.property(result, 'libp2p')
-      assert.property(result, 'blockstore')
-
-      // Stop the IPFS node
-      await result.stop()
-    })
-
-    it('should create a Circuit Relay if configured', async () => {
-      uut.config.isCircuitRelay = true
-      const result = await uut.createNode()
-
-      // Assert the returned IPFS node has expected properties
-      assert.property(result, 'libp2p')
-      assert.property(result, 'blockstore')
-
-      // Stop the IPFS node
-      await result.stop()
-    })
-
-    it('should create a new private key on first run', async () => {
-      uut.config.isCircuitRelay = false
-
-      // Mock dependencies and force desired code path.
-      // const beenCalled = false
-      // sandbox.stub(uut, 'getKeychain').resolves({
-      //   exportPeerId: async () => {
-      //     if (!beenCalled) {
-      //       beenCalled = true
-      //       throw new Error('test error')
-      //     }
-      //     return peerIdFromString('12D3KooWSXF1PnEfiA8bCG8SJduCvzdwHtvhVPK4WC6zzDoto2XP')
-      //   },
-      //   createKey: async () => {}
-      // })
-      sandbox.stub(uut, 'createLibp2p').resolves()
-      sandbox.stub(uut, 'createHelia').resolves({})
-
-      const result = await uut.createNode()
-      // console.log('result: ', result)
-
-      assert.property(result, 'fs')
-    })
-
-    it('should not use circuit relay when CONNECT_PREF is set to direct', async () => {
-      process.env.CONNECT_PREF = 'direct'
-
-      uut.config.isCircuitRelay = false
-      const result = await uut.createNode()
-      // console.log('result: ', result)
-
-      delete process.env.CONNECT_PREF
-
-      // Assert the returned IPFS node has expected properties
-      assert.property(result, 'libp2p')
-      assert.property(result, 'blockstore')
-
-      // Stop the IPFS node
-      await result.stop()
-    })
-  })
-
-  describe('#getSeed', () => {
-    it('should read the seed from the JSON file', async () => {
-      // Mock dependencies and force desired code path
-      sandbox.stub(uut.jsonFiles, 'readJSON').resolves('12345678')
-
-      const result = await uut.getSeed()
-      // console.log('result: ', result)
-
-      assert.isString(result)
-    })
-
-    it('should generate a new seed if the JSON file is not found', async () => {
-      // Mock dependencies and force desired code path
-      sandbox.stub(uut.jsonFiles, 'readJSON').rejects(new Error('test error'))
-      sandbox.stub(uut.jsonFiles, 'writeJSON').resolves()
-
-      const result = await uut.getSeed()
-      // console.log('result: ', result)
-
-      assert.isString(result)
-    })
-
-    it('should catch, report, and throw errors', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.jsonFiles, 'readJSON').rejects(new Error('test error'))
-        sandbox.stub(uut.jsonFiles, 'writeJSON').rejects(new Error('test error'))
-
-        await uut.getSeed()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-  })
+// describe('#rmBlocksDir', () => {
+//   it('should delete the /blocks directory', () => {
+//     const result = uut.rmBlocksDir()
+//
+//     assert.equal(result, true)
+//   })
+//
+//   it('should catch and throw an error', () => {
+//     try {
+//       // Force an error
+//       sandbox.stub(uut.fs, 'rmdirSync').throws(new Error('test error'))
+//
+//       uut.rmBlocksDir()
+//
+//       assert.fail('Unexpected code path')
+//     } catch (err) {
+//       assert.equal(err.message, 'test error')
+//     }
+//   })
+// })
 })

test/unit/adapters/nostr.adapter.unit.js

@@ -1,131 +0,0 @@
-/*
-  Unit tests for the Nostr Adapter library.
-*/
-
-// Public npm libraries.
-import { assert } from 'chai'
-import sinon from 'sinon'
-import NostrAdapter from '../../../src/adapters/nostr.js'
-import NostrMock from '../mocks/nostr-mock.js'
-
-describe('#nostr.js', () => {
-  let uut
-  let sandbox
-
-  before(() => {})
-
-  beforeEach(() => {
-    uut = new NostrAdapter({
-      nostrRelay: 'wss://nostr',
-      nostrTopic: 'uut-topic'
-    })
-    uut.RelayPool = NostrMock.RelayPoolMock
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  after(() => {})
-
-  describe('#contructor', () => {
-    it('should throw an error if nostr relay is not provided', async () => {
-      try {
-        const _uut = new NostrAdapter()
-        // Eslint
-        console.log(_uut)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(
-          err.message,
-          '"nostrRelay" must be passed when instantiate NostrAdapter'
-        )
-      }
-    })
-    it('should throw an error if nostr topic is not provided', async () => {
-      try {
-        const _uut = new NostrAdapter({ nostrRelay: 'wss://' })
-        // Eslint
-        console.log(_uut)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(
-          err.message,
-          '"nostrTopic" must be passed when instantiate NostrAdapter'
-        )
-      }
-    })
-  })
-  describe('#start', () => {
-    it('should throw an error if WIF is not provided', async () => {
-      try {
-        await uut.start()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(err.message, 'WIF must be a string!')
-      }
-    })
-    it('should start adapter', async () => {
-      // Stub bchNostr
-      sandbox
-        .stub(uut.bchNostr.keys, 'createNostrPubKeyFromWif')
-        .returns({ privKeyBuf: 'privKeyBuf', nostrPubKey: 'nostrPubKey' })
-
-      const result = await uut.start('WIF')
-      assert.isTrue(result)
-    })
-  })
-
-  describe('#post', () => {
-    it('should throw an error if msg is not provided', async () => {
-      try {
-        await uut.post()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(err.message, 'msg must be a string!')
-      }
-    })
-    it('should post message', async () => {
-      const evId = 'uut-eventId' // Mock
-
-      sandbox.stub(uut.bchNostr.post, 'uploadToNostr').resolves(evId)
-
-      const result = await uut.post('uut-message')
-      assert.isString(result)
-      assert.equal(result, evId)
-    })
-  })
-
-  describe('#read', () => {
-    it('should throw an error if provided limit is wrong', async () => {
-      try {
-        await uut.read(-5)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(err.message, 'Limit must be greater than 0')
-      }
-    })
-
-    it('should read message', async () => {
-      const result = await uut.read()
-      assert.isArray(result)
-      assert.equal(result.length, 1)
-    })
-
-    it('should read message with custom limit', async () => {
-      const result = await uut.read(1)
-      assert.isArray(result)
-      assert.equal(result.length, 1)
-    })
-  })
-})

test/unit/adapters/order-pagination.unit.js

@@ -47,15 +47,7 @@ describe('#OrderPagination', () => {
       timestamp: 'timestamp',
       localTimestamp: 'localTimestamp',
       txid: 'txid',
-      p2wdbHash: 'p2wdbHash',
-      hdIndex: 0,
-      nostrEventId: 'nostrEventId',
-      dataType: 'dataType',
-      makerAddr: 'makerAddr',
-      rateInBaseUnit: 'rateInBaseUnit',
-      minUnitsToExchange: 'minUnitsToExchange',
-      ticker: 'ticker',
-      tokenType: 1
+      p2wdbHash: 'p2wdbHash'
     })
     await order.save()
   })

test/unit/adapters/users.adapter.unit.js

@@ -31,8 +31,7 @@ describe('#User-Adapter', () => {
     testuser = new User({
       email: 'test983@test.com',
       name: 'test983',
-      password: 'password',
-      mnemonic: '12 words mnemonic'
+      password: 'password'
     })
   })
 

test/unit/adapters/wallet.adapter.unit.js

@@ -2,14 +2,16 @@
   Unit tests for the Wallet Adapter library.
 */
 
-// Global npm libraries
+// Public npm libraries.
 import { assert } from 'chai'
 import sinon from 'sinon'
-import BchWallet from 'minimal-slp-wallet'
 import fs from 'fs'
 
-// Local libraries
-import WalletAdapter from '../../../src/adapters/wallet.adapter.js'
+// const BCHJS = require('@psf/bch-js')
+
+// Local libraries.
+import WalletAdapter from '../../../src/adapters/wallet.js'
+
 import { MockBchWallet } from '../mocks/adapters/wallet.js'
 
 // Hack to get __dirname back.
@@ -18,7 +20,7 @@ import * as url from 'url'
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url))
 
 // Global constants
-const testWalletFile = `${__dirname.toString()}test-wallet.json`
+const testWalletFile = `${__dirname.toString()}/test-wallet.json`
 
 describe('#wallet', () => {
   let uut
@@ -28,7 +30,7 @@ describe('#wallet', () => {
     // Delete the test file if it exists.
     try {
       deleteFile(testWalletFile)
-    } catch (err) { }
+    } catch (err) {}
   })
 
   beforeEach(() => {
@@ -42,26 +44,20 @@ describe('#wallet', () => {
     // Delete the test file if it exists.
     try {
       deleteFile(testWalletFile)
-    } catch (err) { }
-  })
-
-  describe('#_instanceWallet', () => {
-    it('should create a wallet given a mnemonic', async () => {
-      const mnemonic = 'wagon tray learn flat erase laugh lonely rug check captain jacket morning'
-      const result = await uut._instanceWallet(mnemonic)
-      // console.log('result: ', result)
-      assert.equal(result.walletInfo.mnemonic, mnemonic)
-    })
+    } catch (err) {}
   })
 
   describe('#openWallet', () => {
-    it('should create a new wallet when wallet file does not exist', async () => {
+    it('should create a new wallet what wallet file does not exist', async () => {
       // Mock dependencies
       uut.BchWallet = MockBchWallet
+
       // Ensure we open the test file, not the production wallet file.
-      uut.config.walletFile = testWalletFile
+      uut.WALLET_FILE = testWalletFile
+
       const result = await uut.openWallet()
       // console.log('result: ', result)
+
       assert.property(result, 'mnemonic')
       assert.property(result, 'privateKey')
       assert.property(result, 'publicKey')
@@ -74,10 +70,13 @@ describe('#wallet', () => {
 
     it('should open existing wallet file', async () => {
       // This test case uses the file created in the previous test case.
+
       // Ensure we open the test file, not the production wallet file.
-      uut.config.walletFile = testWalletFile
+      uut.WALLET_FILE = testWalletFile
+
       const result = await uut.openWallet()
       // console.log('result: ', result)
+
       assert.property(result, 'mnemonic')
       assert.property(result, 'privateKey')
       assert.property(result, 'publicKey')
@@ -91,11 +90,13 @@ describe('#wallet', () => {
     it('should catch and throw an error', async () => {
       try {
         // Force an error
-        uut.config.walletFile = ''
+        uut.WALLET_FILE = ''
         uut.BchWallet = () => {
         }
+
         await uut.openWallet()
         // console.log('result: ', result)
+
         assert.fail('Unexpected code path')
       } catch (err) {
         // console.log('err: ', err)
@@ -104,158 +105,113 @@ describe('#wallet', () => {
     })
   })
 
-  describe('#instanceWalletWithoutInitialization', () => {
-    it('should create an instance of BchWallet', async () => {
-      // Create a mock wallet.
-      const mockWallet = new BchWallet()
-      await mockWallet.walletInfoPromise
-      sandbox.stub(mockWallet, 'initialize').resolves()
-
-      // Mock dependencies
-      sandbox.stub(uut, '_instanceWallet').resolves(mockWallet)
-      uut.config.authPass = 'fake-auth-pass'
-
-      // Ensure we open the test file, not the production wallet file.
-      uut.config.walletFile = testWalletFile
-      const walletData = await uut.openWallet()
-
-      // console.log('walletData: ', walletData)
-      const result = await uut.instanceWalletWithoutInitialization(walletData)
-      // console.log('result: ', result)
-
-      assert.property(result, 'walletInfoPromise')
-      assert.property(result, 'walletInfo')
-    })
-
-    it('should catch and throw an error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut, '_instanceWallet').rejects(new Error('test error'))
-
-        await uut.instanceWalletWithoutInitialization()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should create an instance of BchWallet using web2 infra', async () => {
-      // Create a mock wallet.
-      const mockWallet = new BchWallet()
-      await mockWallet.walletInfoPromise
-      sandbox.stub(mockWallet, 'initialize').resolves()
-
-      // Mock dependencies
-      sandbox.stub(uut, '_instanceWallet').resolves(mockWallet)
-
-      // Ensure we open the test file, not the production wallet file.
-      uut.config.walletFile = testWalletFile
-      const walletData = await uut.openWallet()
-      // console.log('walletData: ', walletData)
-
-      // Force desired code path
-      uut.config.walletInterface = 'web2'
-      const result = await uut.instanceWalletWithoutInitialization(walletData)
-
-      // console.log('result: ', result)
-      assert.property(result, 'walletInfoPromise')
-      assert.property(result, 'walletInfo')
-    })
-
-    it('should generate wallet from mnemonic in config', async () => {
-      // Create a mock wallet.
-      const mockWallet = new BchWallet()
-      await mockWallet.walletInfoPromise
-      sandbox.stub(mockWallet, 'initialize').resolves()
-
-      // Mock dependencies
-      sandbox.stub(uut, '_instanceWallet').resolves(mockWallet)
-
-      // Ensure we open the test file, not the production wallet file.
-      uut.config.walletFile = testWalletFile
-      const walletData = await uut.openWallet()
-      // console.log('walletData: ', walletData)
-
-      const originalConfig = uut.config.mnemonic
-      uut.config.mnemonic = walletData.mnemonic
-
-      const result = await uut.instanceWalletWithoutInitialization({})
-      // console.log('result: ', result)
-
-      uut.config.mnemonic = originalConfig
-
-      assert.property(result, 'walletInfoPromise')
-      assert.property(result, 'walletInfo')
-    })
-  })
-
   describe('#instanceWallet', () => {
-    it('should create an instance of BchWallet', async () => {
-      // Create a mock wallet.
-      const mockWallet = new BchWallet()
-      await mockWallet.walletInfoPromise
-      sandbox.stub(mockWallet, 'initialize').resolves()
-
-      // Mock dependencies
-      sandbox.stub(uut, '_instanceWallet').resolves(mockWallet)
-
-      // Ensure we open the test file, not the production wallet file.
-      uut.WALLET_FILE = testWalletFile
-      const walletData = await uut.openWallet()
-      // console.log('walletData: ', walletData)
-      const result = await uut.instanceWallet(walletData)
-      // console.log('result: ', result)
-
-      assert.property(result, 'walletInfoPromise')
-      assert.property(result, 'walletInfo')
-    })
+    // it('should create an instance of BchWallet', async () => {
+    //   // Mock dependencies
+    //   uut.BchWallet = MockBchWallet
+    //
+    //   // Ensure we open the test file, not the production wallet file.
+    //   uut.WALLET_FILE = testWalletFile
+    //
+    //   const walletData = await uut.openWallet()
+    //
+    //   const result = await uut.instanceWallet(walletData.mnemonic)
+    //   console.log('result: ', result)
+    //
+    //   assert.property(result, 'walletInfoPromise')
+    // })
 
     it('should catch and throw an error', async () => {
       try {
-        // Force an error
-        sandbox.stub(uut, 'instanceWalletWithoutInitialization').rejects(new Error('test error'))
-
         await uut.instanceWallet()
+
         assert.fail('Unexpected code path')
       } catch (err) {
         // console.log('err: ', err)
+        assert.include(err.message, 'Cannot read')
+      }
+    })
+  })
+
+  describe('#generateSignature', () => {
+    it('should return a signature', async () => {
+      // mock instance of minimal-slp-wallet
+      uut.bchWallet = new MockBchWallet()
+
+      const result = await uut.generateSignature('test')
+      // console.log('result: ', result)
+
+      assert.isString(result)
+    })
+
+    it('should catch and throw errors', async () => {
+      try {
+        // mock instance of minimal-slp-wallet
+        uut.bchWallet = new MockBchWallet()
+
+        // force an error
+        sandbox
+          .stub(uut.bchWallet.bchjs.BitcoinCash, 'signMessageWithPrivKey')
+          .throws(new Error('test error'))
+
+        await uut.generateSignature('test')
+
+        assert.fail('Unexpected code path')
+      } catch (err) {
         assert.include(err.message, 'test error')
       }
     })
-
-    it('should create an instance of BchWallet using web2 infra', async () => {
-      // Create a mock wallet.
-      const mockWallet = new BchWallet()
-      await mockWallet.walletInfoPromise
-      sandbox.stub(mockWallet, 'initialize').resolves()
-
-      // Mock dependencies
-      sandbox.stub(uut, '_instanceWallet').resolves(mockWallet)
-
-      // Ensure we open the test file, not the production wallet file.
-      uut.WALLET_FILE = testWalletFile
-      const walletData = await uut.openWallet()
-      // console.log('walletData: ', walletData)
-
-      // Force desired code path
-      uut.config.useFullStackCash = true
-      const result = await uut.instanceWallet(walletData)
-      // console.log('result: ', result)
-
-      assert.property(result, 'walletInfoPromise')
-      assert.property(result, 'walletInfo')
-    })
   })
 
+  // describe('#burnPsf', () => {
+  //   it('should burn PSF tokens and return the txid', async () => {
+  //     // mock instance of minimal-slp-wallet
+  //     uut.bchWallet = new MockBchWallet()
+  //
+  //     const result = await uut.burnPsf()
+  //     // console.log('result: ', result)
+  //
+  //     assert.equal(result.success, true)
+  //     assert.equal(result.txid, 'txid')
+  //   })
+  //
+  //   it('should throw error if no PSF tokens are found', async () => {
+  //     try {
+  //       // mock instance of minimal-slp-wallet
+  //       uut.bchWallet = new MockBchWallet()
+  //
+  //       // Remove the PSF token from the mock data.
+  //       uut.bchWallet.utxos.utxoStore.slpUtxos.type1.tokens.pop()
+  //
+  //       await uut.burnPsf()
+  //
+  //       assert.fail('Unexpected code path')
+  //     } catch (err) {
+  //       assert.include(err.message, 'Token UTXO of with ID of')
+  //     }
+  //   })
+  //
+  //   it('should catch and throw an error', async () => {
+  //     try {
+  //       await uut.burnPsf()
+  //
+  //       assert.fail('Unexpected code path')
+  //     } catch (err) {
+  //       assert.include(err.message, 'Cannot read')
+  //     }
+  //   })
+  // })
+
   describe('#incrementNextAddress', () => {
     it('should increment the nextAddress property', async () => {
       // Ensure we open the test file, not the production wallet file.
       uut.WALLET_FILE = testWalletFile
+
       // mock instance of minimal-slp-wallet
       uut.bchWallet = new MockBchWallet()
+
       const result = await uut.incrementNextAddress()
+
       assert.equal(result, 2)
     })
 
@@ -263,7 +219,9 @@ describe('#wallet', () => {
       try {
         // Force an error
         sandbox.stub(uut, 'openWallet').rejects(new Error('test error'))
+
         await uut.incrementNextAddress()
+
         assert.fail('Unexpected code path')
       } catch (err) {
         assert.include(err.message, 'test error')
@@ -274,8 +232,10 @@ describe('#wallet', () => {
   describe('#getKeyPair', () => {
     it('should return an object with a key pair', async () => {
       // Ensure we open the test file, not the production wallet file.
-      // uut.WALLET_FILE = testWalletFile
-      uut.config.walletFile = testWalletFile
+      uut.WALLET_FILE = testWalletFile
+
+      // mock instance of minimal-slp-wallet
+      uut.bchWallet = new MockBchWallet()
 
       const result = await uut.getKeyPair()
       // console.log('result: ', result)
@@ -291,7 +251,9 @@ describe('#wallet', () => {
         sandbox
           .stub(uut, 'incrementNextAddress')
           .rejects(new Error('test error'))
+
         await uut.getKeyPair()
+
         assert.fail('Unexpected code path')
       } catch (err) {
         assert.include(err.message, 'test error')
@@ -299,37 +261,55 @@ describe('#wallet', () => {
     })
   })
 
-  describe('#optimize', () => {
-    it('should call the wallet optimize function', async () => {
-      // mock instance of minimal-slp-wallet
+  describe('#moveTokens', () => {
+    it('should move tokens to a new address in the HD wallet', async () => {
+      // Mock dependencies
+      sandbox.stub(uut, 'getKeyPair').resolves({
+        cashAddress: 'bitcoincash:qqsj63493jk4p05zzdgqzc29k5unqtet9vv8l4x0yt',
+        wif: 'L4qKTMCwjH9jHnYtNh9Vsrxj7Hg6zmoN8E2v7N47UKvNVEjw7FU8',
+        hdIndex: 6
+      })
       uut.bchWallet = new MockBchWallet()
-      sandbox.stub(uut.bchWallet, 'optimize').resolves({ bchUtxoCnt: 10 })
-      const result = await uut.optimize()
-      assert.equal(result, true)
+      // uut.bchWallet = {
+      //   sendTokens: async () => 'fake-txid',
+      //   getUtxos: async () => {}
+      // }
+
+      const inObj = {
+        tokenId: 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
+        qty: 1
+      }
+
+      const result = await uut.moveTokens(inObj)
+      // console.log('result: ', result)
+
+      assert.property(result, 'txid')
+      assert.property(result, 'vout')
+      assert.property(result, 'hdIndex')
     })
   })
 
-  describe('#getBalance', () => {
-    it('should get the balance for the wallet', async () => {
-      // mock instance of minimal-slp-wallet
-      uut.bchWallet = new MockBchWallet()
-      // Mock dependencies and force desired code path
-      sandbox.stub(uut.bchWallet, 'getBalance').resolves(41012)
-      sandbox.stub(uut.bchWallet, 'listTokens').resolves([{
-        tokenId: '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
-        ticker: 'PSF',
-        name: 'Permissionless Software Foundation',
-        decimals: 8,
-        tokenType: 1,
-        url: 'psfoundation.cash',
-        qty: 2
-      }])
-      const result = await uut.getBalance()
+  describe('#moveBch', () => {
+    it('should move BCH to a new address in the HD wallet', async () => {
+      // Mock dependencies
+      sandbox.stub(uut, 'getKeyPair').resolves({
+        cashAddress: 'bitcoincash:qqsj63493jk4p05zzdgqzc29k5unqtet9vv8l4x0yt',
+        wif: 'L4qKTMCwjH9jHnYtNh9Vsrxj7Hg6zmoN8E2v7N47UKvNVEjw7FU8',
+        hdIndex: 6
+      })
+      uut.bchWallet = {
+        send: async () => 'fake-txid',
+        getUtxos: async () => {}
+      }
+
+      const amountSat = 1000
+
+      const result = await uut.moveBch(amountSat)
       // console.log('result: ', result)
-      // Assert the expected properties exist and have the expected values.
-      assert.equal(result.satBalance, 41012)
-      assert.equal(result.psfBalance, 2)
-      assert.equal(result.success, true)
+
+      assert.property(result, 'txid')
+      assert.property(result, 'vout')
+      assert.property(result, 'hdIndex')
     })
   })
 })

test/unit/adapters/wallet.unit.js

@@ -1,138 +0,0 @@
-
-/*
-  Unit tests for the adapter/wallet.js library.
-*/
-
-// Global npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-import WalletAdapter from '../../../src/adapters/wallet.js'
-import { MockBchWallet } from '../mocks/adapters/wallet.js'
-
-describe('#wallet', () => {
-  let uut
-  let sandbox
-
-  beforeEach(() => {
-    uut = new WalletAdapter()
-    uut.bchWallet = new MockBchWallet()
-    uut.bitcoinJs = {
-      Transaction: {
-        fromHex: () => { return { } },
-        SIGHASH_ALL: () => { return { } }
-      },
-      TransactionBuilder: {
-        fromTransaction: () => { return { sign: () => { return { } }, build: () => { return { toHex: () => { return 'hex' } } } } }
-      },
-      ECPair: {
-        fromWIF: () => { return { } }
-      }
-    }
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#moveTokensFromCustomWallet', () => {
-    it('should move tokens from a custom wallet', async () => {
-      sandbox.stub(uut, 'getKeyPair').resolves({
-        cashAddress: 'cashAddress',
-        wif: 'wif',
-        hdIndex: 11
-      })
-
-      const customWallet = new MockBchWallet()
-      customWallet.sendTokens = () => { return 'move token tx id result' }
-      customWallet.utxos.utxoStore.slpUtxos.type1.tokens = [
-        {
-          tokenId: 'tokenId',
-          tokenType: 1,
-          qty: 1
-        }
-      ]
-      const inObj = {
-        qty: 1,
-        wallet: customWallet,
-        tokenId: 'tokenId'
-      }
-      const result = await uut.moveTokensFromCustomWallet(inObj)
-      assert.equal(result.txid, 'move token tx id result')
-      assert.equal(result.hdIndex, 11)
-      assert.equal(result.tokenType, 1)
-      assert.equal(result.vout, 1)
-    })
-    it('should throw an error if the wallet is not provided', async () => {
-      try {
-        const inObj = {
-          qty: 1,
-          tokenId: 'tokenId'
-        }
-        await uut.moveTokensFromCustomWallet(inObj)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'wallet is required!')
-      }
-    })
-    it('should throw an error if the tokenId is not provided', async () => {
-      try {
-        const inObj = {
-          qty: 1,
-          wallet: new MockBchWallet()
-        }
-        await uut.moveTokensFromCustomWallet(inObj)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'tokenId must be a string!')
-      }
-    })
-    it('should throw an error if the qty is not provided', async () => {
-      try {
-        const inObj = {
-          tokenId: 'tokenId',
-          wallet: new MockBchWallet()
-        }
-        await uut.moveTokensFromCustomWallet(inObj)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'qty must be a number!')
-      }
-    })
-  })
-  describe('#completeTx', () => {
-    it('should complete a transaction', async () => {
-      sandbox.stub(uut, 'getKeyPair').resolves({
-        cashAddress: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
-        wif: 'L5D2UAam8tvo3uii5kpgaGyjvVMimdrXu8nWGQSQjuuAix6ji1YQ',
-        hdIndex: 11
-      })
-      sandbox.stub(uut, 'deseralizeTx').resolves({
-        txid: 'complete tx id result'
-      })
-      sandbox.stub(uut.retryQueue, 'addToQueue').resolves('complete tx id result')
-
-      const hex = 'hex'
-      const hdIndex = 11
-      const txid = await uut.completeTx(hex, hdIndex)
-      assert.equal(txid, 'complete tx id result')
-    })
-    it('should throw an error if the hex is not provided', async () => {
-      try {
-        const hdIndex = 11
-        await uut.completeTx(null, hdIndex)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'hex must be a string!')
-      }
-    })
-    it('should throw an error if the hdIndex is not provided', async () => {
-      try {
-        const hex = 'hex'
-        await uut.completeTx(hex, null)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'hdIndex must be a non-negative number!')
-      }
-    })
-  })
-})

test/unit/controllers/controllers.unit.js

@@ -28,9 +28,6 @@ describe('#Controllers', () => {
         attachRPCRouter: () => {}
       }
 
-      // Mock the timer controllers
-      sandbox.stub(uut.timerControllers, 'startTimers').returns()
-
       const app = {
         use: () => {}
       }

test/unit/controllers/rest-api/ipfs/ipfs.rest.controller.unit.js

@@ -1,251 +0,0 @@
-/*
-  Unit tests for the REST API handler for the /ipfs endpoints.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local libraries
-import IpfsApiController from '../../../../../src/controllers/rest-api/ipfs/controller.js'
-import adapters from '../../../mocks/adapters/index.js'
-import UseCasesMock from '../../../mocks/use-cases/index.js'
-
-import { context as mockContext } from '../../../mocks/ctx-mock.js'
-let uut
-let sandbox
-let ctx
-
-describe('#IPFS REST API', () => {
-  before(async () => {
-  })
-
-  beforeEach(() => {
-    const useCases = new UseCasesMock()
-
-    uut = new IpfsApiController({ adapters, useCases })
-
-    sandbox = sinon.createSandbox()
-
-    // Mock the context object.
-    ctx = mockContext()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new IpfsApiController()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Adapters library required when instantiating /ipfs REST Controller.'
-        )
-      }
-    })
-
-    it('should throw an error if useCases are not passed in', () => {
-      try {
-        uut = new IpfsApiController({ adapters })
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Use Cases library required when instantiating /ipfs REST Controller.'
-        )
-      }
-    })
-  })
-
-  describe('#GET /status', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.adapters.ipfs, 'getStatus').rejects(new Error('test error'))
-
-        await uut.getStatus(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.ipfs, 'getStatus').resolves({ a: 'b' })
-
-      await uut.getStatus(ctx)
-      // console.log('ctx.body: ', ctx.body)
-
-      assert.property(ctx.body, 'status')
-      assert.equal(ctx.body.status.a, 'b')
-    })
-  })
-
-  describe('#POST /peers', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.adapters.ipfs, 'getPeers').rejects(new Error('test error'))
-
-        ctx.request.body = {
-          showAll: true
-        }
-
-        await uut.getPeers(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.ipfs, 'getPeers').resolves({ a: 'b' })
-
-      ctx.request.body = {
-        showAll: true
-      }
-
-      await uut.getPeers(ctx)
-      // console.log('ctx.body: ', ctx.body)
-
-      assert.property(ctx.body, 'peers')
-      assert.equal(ctx.body.peers.a, 'b')
-    })
-  })
-
-  describe('#POST /relays', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.adapters.ipfs, 'getRelays').rejects(new Error('test error'))
-
-        await uut.getRelays(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.ipfs, 'getRelays').resolves({ a: 'b' })
-
-      await uut.getRelays(ctx)
-      // console.log('ctx.body: ', ctx.body)
-
-      assert.property(ctx.body, 'relays')
-      assert.equal(ctx.body.relays.a, 'b')
-    })
-  })
-
-  describe('#POST /connect', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        // Force an error
-        sandbox.stub(uut.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs, 'connectToPeer').rejects(new Error('test error'))
-
-        ctx.request.body = {
-          multiaddr: '/ip4/161.35.99.207/tcp/4001/p2p/12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu'
-        }
-
-        await uut.connect(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs, 'connectToPeer').resolves({ success: true })
-
-      ctx.request.body = {
-        multiaddr: '/ip4/161.35.99.207/tcp/4001/p2p/12D3KooWDtj9cfj1SKuLbDNKvKRKSsGN8qivq9M8CYpLPDpcD5pu'
-      }
-
-      await uut.connect(ctx)
-      // console.log('ctx.body: ', ctx.body)
-
-      assert.property(ctx.body, 'success')
-      assert.equal(ctx.body.success, true)
-    })
-  })
-
-  describe('#handleError', () => {
-    it('should still throw error if there is no message', () => {
-      try {
-        const err = {
-          status: 404
-        }
-
-        uut.handleError(ctx, err)
-      } catch (err) {
-        assert.include(err.message, 'Not Found')
-      }
-    })
-
-    it('should throw error with message', () => {
-      try {
-        const err = {
-          status: 422,
-          message: 'test error'
-        }
-
-        uut.handleError(ctx, err)
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-  })
-
-  describe('#getThisNode', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        // Force an error
-        // sandbox.stub(uut.adapters.ipfs.ipfsCoordAdapter.ipfsCoord, 'thisNode').rejects(new Error('test error'))
-        uut.adapters.ipfs.ipfsCoordAdapter = {}
-
-        ctx.request.body = {}
-
-        await uut.getThisNode(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log('err: ', err)
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'Cannot read')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      // Mock dependencies
-      // sandbox.stub(uut.adapters.ipfs.ipfsCoordAdapter.ipfsCoord.adapters.ipfs, 'connectToPeer').resolves({ success: true })
-
-      uut.adapters.ipfs.ipfsCoordAdapter = {
-        ipfsCoord: {
-          thisNode: {}
-        }
-      }
-
-      ctx.request.body = {}
-
-      await uut.getThisNode(ctx)
-
-      assert.property(ctx.body, 'thisNode')
-    })
-  })
-})

test/unit/controllers/rest-api/ipfs/ipfs.rest.router.unit.js

@@ -1,78 +0,0 @@
-/*
-  Unit tests for the REST API handler for the /ipfs endpoints.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local support libraries
-import adapters from '../../../mocks/adapters/index.js'
-import UseCasesMock from '../../../mocks/use-cases/index.js'
-import IpfsRouter from '../../../../../src/controllers/rest-api/ipfs/index.js'
-// const app = require('../../../mocks/app-mock')
-
-let uut
-let sandbox
-// let ctx
-
-// const mockContext = require('../../../../unit/mocks/ctx-mock').context
-
-describe('#IPFS-REST-Router', () => {
-  // const testUser = {}
-
-  beforeEach(() => {
-    const useCases = new UseCasesMock()
-    uut = new IpfsRouter({ adapters, useCases })
-
-    sandbox = sinon.createSandbox()
-
-    // Mock the context object.
-    // ctx = mockContext()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new IpfsRouter()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Adapters library required when instantiating IPFS REST Controller.'
-        )
-      }
-    })
-
-    it('should throw an error if useCases are not passed in', () => {
-      try {
-        uut = new IpfsRouter({ adapters })
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Use Cases library required when instantiating IPFS REST Controller.'
-        )
-      }
-    })
-  })
-
-  describe('#attach', () => {
-    it('should throw an error if app is not passed in.', () => {
-      try {
-        uut.attach()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Must pass app object when attaching REST API controllers.'
-        )
-      }
-    })
-  })
-})

test/unit/controllers/rest-api/middleware/error-unit.js

@@ -1,66 +0,0 @@
-/*
-Unit tests for the REST API middleware that handle response errors.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local libraries
-import errorMiddleware from '../../../../../src/controllers/rest-api/middleware/error.js'
-import { context as mockContext } from '../../../../unit/mocks/ctx-mock.js'
-
-describe('#Validators', () => {
-  let ctx
-  let sandbox
-
-  beforeEach(() => {
-    // Mock the context object.
-    ctx = mockContext()
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#errorMiddleware', () => {
-    it('should run next function', async () => {
-      // Spy on next
-      const next = sinon.spy(() => { })
-      errorMiddleware()(ctx, next)
-
-      assert.isTrue(next.calledOnce)
-    })
-
-    it('should handle unknown status error', async () => {
-      try {
-        const next = async () => {
-          const e = new Error('test error')
-          e.status = null
-          throw e
-        }
-
-        await errorMiddleware()(ctx, next)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(ctx.status, 500)
-        assert.equal(ctx.body, 'test error')
-      }
-    })
-    it('should handle known status error', async () => {
-      try {
-        const next = async () => {
-          const e = new Error('test error')
-          e.status = 422
-          throw e
-        }
-
-        await errorMiddleware()(ctx, next)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(ctx.status, 422)
-        assert.equal(ctx.body, 'test error')
-      }
-    })
-  })
-})

test/unit/controllers/rest-api/order/order.rest.controller.unit.js

@@ -65,17 +65,13 @@ describe('#Order-REST-Router', () => {
       ctx.request.body = {
         order: {}
       }
-      ctx.state.user = {
-        id: 'testUserId'
-      }
 
       // Mock dependencies
-      sandbox.stub(uut.useCases.order, 'createOrder').resolves({ eventId: 'testEventId', noteId: 'testNoteId' })
+      sandbox.stub(uut.useCases.order, 'createOrder').resolves('testHash')
 
       await uut.createOrder(ctx)
 
-      assert.equal(ctx.body.eventId, 'testEventId')
-      assert.equal(ctx.body.noteId, 'testNoteId')
+      assert.equal(ctx.body.hash, 'testHash')
     })
 
     it('should catch and throw an error', async () => {
@@ -83,9 +79,6 @@ describe('#Order-REST-Router', () => {
         ctx.request.body = {
           order: {}
         }
-        ctx.state.user = {
-          id: 'testUserId'
-        }
 
         // Force an error
         sandbox

test/unit/controllers/rest-api/usage/usage.rest.controller.unit.js

@@ -1,163 +0,0 @@
-/*
-  Unit tests for the REST API handler for the /usage endpoints.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local support libraries
-import adapters from '../../../mocks/adapters/index.js'
-import UseCasesMock from '../../../mocks/use-cases/index.js'
-import UsageController from '../../../../../src/controllers/rest-api/usage/controller.js'
-
-import { context as mockContext } from '../../../mocks/ctx-mock.js'
-
-let uut
-let sandbox
-let ctx
-
-describe('#Usage-REST-Controller', () => {
-  // const testUser = {}
-
-  beforeEach(() => {
-    const useCases = new UseCasesMock()
-    uut = new UsageController({ adapters, useCases })
-
-    sandbox = sinon.createSandbox()
-
-    // Mock the context object.
-    ctx = mockContext()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new UsageController()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Adapters library required when instantiating /usage REST Controller.'
-        )
-      }
-    })
-
-    it('should throw an error if useCases are not passed in', () => {
-      try {
-        uut = new UsageController({ adapters })
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Use Cases library required when instantiating /usage REST Controller.'
-        )
-      }
-    })
-  })
-
-  describe('#Get /usage', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        sandbox.stub(uut.useCases.usage, 'getRestSummary').throws(new Error('test error'))
-        await uut.getStatus(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      await uut.getStatus(ctx)
-
-      // Assert the expected HTTP response
-      assert.equal(ctx.status, 200)
-
-      // Assert that expected properties exist in the returned data.
-      assert.property(ctx.response.body, 'status')
-    })
-  })
-
-  describe('#Get /ips', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        sandbox.stub(uut.useCases.usage, 'getTopIps').throws(new Error('test error'))
-        await uut.getTopIps(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      await uut.getTopIps(ctx)
-
-      // Assert the expected HTTP response
-      assert.equal(ctx.status, 200)
-
-      // Assert that expected properties exist in the returned data.
-      assert.property(ctx.response.body, 'ips')
-    })
-  })
-
-  describe('#Get /endpoints', () => {
-    it('should return 422 status on biz logic error', async () => {
-      try {
-        sandbox.stub(uut.useCases.usage, 'getTopEndpoints').throws(new Error('test error'))
-        await uut.getTopEndpoints(ctx)
-
-        assert.fail('Unexpected result')
-      } catch (err) {
-        // console.log(err)
-        assert.equal(err.status, 422)
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should return 200 status on success', async () => {
-      await uut.getTopEndpoints(ctx)
-
-      // Assert the expected HTTP response
-      assert.equal(ctx.status, 200)
-
-      // Assert that expected properties exist in the returned data.
-      assert.property(ctx.response.body, 'endpoints')
-    })
-  })
-
-  describe('#handleError', () => {
-    it('should pass an error message', () => {
-      try {
-        const err = {
-          status: 422,
-          message: 'Unprocessable Entity'
-        }
-
-        uut.handleError(ctx, err)
-      } catch (err) {
-        assert.include(err.message, 'Unprocessable Entity')
-      }
-    })
-    it('should still throw error if there is no message', () => {
-      try {
-        const err = {
-          status: 404
-        }
-
-        uut.handleError(ctx, err)
-      } catch (err) {
-        assert.include(err.message, 'Not Found')
-      }
-    })
-  })
-})

test/unit/controllers/rest-api/usage/usage.rest.router.unit.js

@@ -1,75 +0,0 @@
-/*
-Unit tests for the REST API handler for the /usage endpoints.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-
-import sinon from 'sinon'
-
-// Local support libraries
-import adapters from '../../../mocks/adapters/index.js'
-
-import UseCasesMock from '../../../mocks/use-cases/index.js'
-
-import UsageRouter from '../../../../../src/controllers/rest-api/usage/index.js'
-
-let uut
-let sandbox
-// let ctx
-
-// const mockContext = require('../../../../unit/mocks/ctx-mock').context
-
-describe('#Usage-REST-Router', () => {
-  beforeEach(() => {
-    const useCases = new UseCasesMock()
-    uut = new UsageRouter({ adapters, useCases })
-
-    sandbox = sinon.createSandbox()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new UsageRouter()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Adapters library required when instantiating IPFS REST Controller.'
-        )
-      }
-    })
-
-    it('should throw an error if useCases are not passed in', () => {
-      try {
-        uut = new UsageRouter({ adapters })
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Use Cases library required when instantiating IPFS REST Controller.'
-        )
-      }
-    })
-  })
-
-  describe('#attach', () => {
-    it('should throw an error if app is not passed in.', () => {
-      try {
-        uut.attach()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Must pass app object when attaching REST API controllers.'
-        )
-      }
-    })
-  })
-})

test/unit/controllers/timer-controllers.unit.js

@@ -1,140 +0,0 @@
-/*
-  Unit tests for the timer-controller.js Controller library
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local libraries
-import TimerControllers from '../../../src/controllers/timer-controllers.js'
-import adapters from '../mocks/adapters/index.js'
-import UseCasesMock from '../mocks/use-cases/index.js'
-
-describe('#Timer-Controllers', () => {
-  let uut
-  let sandbox
-
-  beforeEach(() => {
-    sandbox = sinon.createSandbox()
-
-    const useCases = new UseCasesMock()
-    uut = new TimerControllers({ adapters, useCases })
-  })
-
-  afterEach(() => {
-    sandbox.restore()
-
-    uut.stopTimers()
-  })
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new TimerControllers()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Adapters library required when instantiating Timer Controller libraries.'
-        )
-      }
-    })
-
-    it('should throw an error if useCases are not passed in', () => {
-      try {
-        uut = new TimerControllers({ adapters })
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Use Cases library required when instantiating Timer Controller libraries.'
-        )
-      }
-    })
-  })
-
-  describe('#startTimers', () => {
-    it('should start the timers', () => {
-      const result = uut.startTimers()
-
-      // uut.stopTimers()
-
-      assert.equal(result, true)
-    })
-  })
-
-  describe('#gcOrders', () => {
-    it('should kick off the Use Case', async () => {
-      const result = await uut.gcOrders()
-
-      assert.equal(result, true)
-    })
-
-    it('should return false on error', async () => {
-      sandbox.stub(uut.useCases.order, 'removeStaleOrders').throws(new Error('test error'))
-      const result = await uut.gcOrders()
-
-      assert.equal(result, false)
-    })
-  })
-  describe('#gcOffers', () => {
-    it('should kick off the Use Case', async () => {
-      const result = await uut.gcOffers()
-
-      assert.equal(result, true)
-    })
-
-    it('should return false on error', async () => {
-      sandbox.stub(uut.useCases.offer, 'removeStaleOffers').throws(new Error('test error'))
-      const result = await uut.gcOffers()
-
-      assert.equal(result, false)
-    })
-  })
-  describe('#checkDupOffers', () => {
-    it('should kick off the Use Case', async () => {
-      const result = await uut.checkDupOffers()
-
-      assert.equal(result, true)
-    })
-
-    it('should return false on error', async () => {
-      sandbox.stub(uut.useCases.offer, 'removeDuplicateOffers').throws(new Error('test error'))
-      const result = await uut.checkDupOffers()
-
-      assert.equal(result, false)
-    })
-  })
-  describe('#loadOffers', () => {
-    it('should kick off the Use Case', async () => {
-      const result = await uut.loadOffers()
-
-      assert.equal(result, true)
-    })
-
-    it('should return false on error', async () => {
-      sandbox.stub(uut.useCases.offer, 'loadOffers').throws(new Error('test error'))
-      const result = await uut.loadOffers()
-
-      assert.equal(result, false)
-    })
-  })
-
-  describe('#cleanUsage', () => {
-    it('should kick off the Use Case', async () => {
-      const result = await uut.cleanUsage()
-
-      assert.equal(result, true)
-    })
-
-    it('should return false on error', async () => {
-      sandbox.stub(uut.useCases.usage, 'cleanUsage').throws(new Error('test error'))
-      const result = await uut.cleanUsage()
-
-      assert.equal(result, false)
-    })
-  })
-})

test/unit/entities/offer.entity.unit.js

@@ -237,36 +237,6 @@ describe('#Offer-Entity', () => {
       }
     })
 
-    it('should throw an error if nostrEventId is not included', () => {
-      try {
-        const offerData = {
-          data: {
-            messageType: 1,
-            messageClass: 1,
-            tokenId: 'fakeId',
-            buyOrSell: 'buy',
-            rateInBaseUnit: 1000,
-            minUnitsToExchange: 350,
-            numTokens: 1,
-            utxoTxid: 'fakeTxid',
-            utxoVout: 0,
-            offerStatus: 'posted',
-            makerAddr: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
-            tokenType: 1
-          }
-        }
-        uut.validate(offerData)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log(err)
-        assert.include(
-          err.message,
-          "Property 'nostrEventId' must be a string."
-        )
-      }
-    })
-
     it('should validate a new offer', () => {
       const offerObj = {
         appId: 'swapTest555',
@@ -285,8 +255,7 @@ describe('#Offer-Entity', () => {
           offerStatus: 'posted',
           makerAddr: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
           ticker: 'TROUT',
-          tokenType: 1,
-          nostrEventId: 'test'
+          tokenType: 1
         },
         timestamp: '2021-09-20T17:54:26.395Z',
         localTimeStamp: '9/20/2021, 10:54:26 AM',

test/unit/misc/config-unit.js

@@ -40,13 +40,9 @@ describe('#config', () => {
     assert.equal(config.env, 'test')
   })
 
-  it('Should return prod environment config', async () => {
+  it('Should return test environment config', async () => {
     process.env.BCH_DEX = 'prod'
 
-    process.env.WALLET_INTERFACE = 'web2'
-    process.env.APISERVER = 'https://api.fullstack.cash/v5/'
-
-    await import('../../../config/env/common.js?foo=bar2')
     const importedConfig3 = await import('../../../config/index.js?foo=bar2')
     const config = importedConfig3.default
     // console.log('config: ', config)

test/unit/mocks/adapters/index.js

@@ -18,28 +18,19 @@ class IpfsAdapter {
 class IpfsCoordAdapter {
   constructor () {
     this.ipfsCoord = {
-      adapters: {
-        ipfs: {
-          connectToPeer: async () => {}
-        }
-      },
       useCases: {
         peer: {
           sendPrivateMessage: () => {
           }
         }
-      },
-      thisNode: {}
+      }
     }
   }
 }
 
 const ipfs = {
   ipfsAdapter: new IpfsAdapter(),
-  ipfsCoordAdapter: new IpfsCoordAdapter(),
-  getStatus: async () => {},
-  getPeers: async () => {},
-  getRelays: async () => {}
+  ipfsCoordAdapter: new IpfsCoordAdapter()
 }
 ipfs.ipfs = ipfs.ipfsAdapter.ipfs
 
@@ -150,14 +141,7 @@ const wallet = {
     return { cashAddress: 'fakeAddr', wif: 'fakeWif', hdIndex: 1 }
   },
   bchWallet: new MockBchWallet(),
-  BchWallet: MockBchWallet,
-  moveTokens: async () => {},
-  moveTokensFromCustomWallet: async () => {},
-  moveBch: async () => {},
-  reclaimTokens: async ()=>{},
-  generatePartialTx: async ()=>{},
-  deseralizeTx:async ()=>{},
-  completeTx:async ()=>{ return ''},
+  moveTokens: async () => {}
 }
 
 const p2wdb = {
@@ -166,10 +150,4 @@ const p2wdb = {
   checkForSufficientFunds: async () => true
 }
 
-const nostr = {
-  post: async () => {return true },
-  read: async () => { return true },
-  eventId2note: () => { return 'testNoteId' }
-}
-
-export default { ipfs, localdb, bch, wallet, p2wdb, bchjs, nostr}
+export default { ipfs, localdb, bch, wallet, p2wdb, bchjs}

test/unit/mocks/adapters/wallet.js

@@ -1,150 +1,146 @@
-import BCHJS from "@psf/bch-js";
+/*
+  Mock data for the wallet.adapter.unit.js test file.
+*/
+
+import BCHJS from '@psf/bch-js';
 
 const mockWallet = {
-    mnemonic: 'course abstract aerobic deer try switch turtle diet fence affair butter top',
-    privateKey: 'L5D2UAam8tvo3uii5kpgaGyjvVMimdrXu8nWGQSQjuuAix6ji1YQ',
-    publicKey: '0379433ffc401483ade310469953c1cba77c71af904f07c15bde330d7198b4d6dc',
-    cashAddress: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
-    address: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
-    slpAddress: 'simpleledger:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acq9zm7d33',
-    legacyAddress: '1JQj1KcQL7GPKzc1D2PvdUSgw3MbDtrHzi',
-    hdPath: "m/44'/245'/0'/0/0",
-    nextAddress: 1
-};
-
-class MockBchWallet {
-    constructor() {
-        this.walletInfoPromise = true;
-        this.walletInfo = mockWallet;
-        this.initialize = async () => {}
-        this.bchjs = new BCHJS();
-        this.burnTokens = async () => {
-            return { success: true, txid: 'txid' };
-        };
-        this.sendTokens = async () => {
-            return 'fakeTxid';
-        };
-        this.utxoIsValid =async ()=>{}
-        this.getUtxos = async () => { };
-        this.getBalance = async () => { };
-        this.listTokens = async () => { };
-        this.getTxData = async () => {
-            return [{
-                    tokenTicker: 'TROUT'
-                }];
-        };
-        this.optimize = async () => { };
-        // Environment variable is used by wallet-balance.unit.js to force an error.
-        if (process.env.NO_UTXO) {
-            this.utxos = {};
-        }
-        else {
-            this.utxos = {
-                utxoStore: {
-                    address: 'bitcoincash:qqetvdnlt0p8g27dr44cx7h057kpzly9xse9huc97z',
-                    bchUtxos: [
-                        {
-                            height: 700685,
-                            tx_hash: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
-                            tx_pos: 0,
-                            value: 1000,
-                            txid: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
-                            vout: 0,
-                            isValid: false
-                        },
-                        {
-                            height: 700685,
-                            tx_hash: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
-                            tx_pos: 2,
-                            value: 19406,
-                            txid: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
-                            vout: 2,
-                            isValid: false
-                        }
-                    ],
-                    nullUtxos: [],
-                    slpUtxos: {
-                        type1: {
-                            mintBatons: [],
-                            tokens: [
-                                {
-                                    'height': 717331,
-                                    'tx_hash': '74889580bb1a5f8c026aa2f55118ac9917df3332f7abae72a70343daa1c29621',
-                                    'tx_pos': 1,
-                                    'value': 546,
-                                    'txid': '74889580bb1a5f8c026aa2f55118ac9917df3332f7abae72a70343daa1c29621',
-                                    'vout': 1,
-                                    'isSlp': true,
-                                    'type': 'token',
-                                    'qty': '10',
-                                    'tokenId': '600ee24d0f208aebc2bdd2c4ee1b9acb6d57343561442e8676b5bbea311d5a0f',
-                                    'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
-                                    'ticker': 'FLIPS',
-                                    'name': 'FLIPS',
-                                    'documentUri': '',
-                                    'documentHash': '',
-                                    'decimals': 1,
-                                    'qtyStr': '1'
-                                },
-                                {
-                                    'height': 730597,
-                                    'tx_hash': '52520faddfafc46b8f8c9548b097f3a3b82a5bf363b5095047b9c5f83247fe36',
-                                    'tx_pos': 1,
-                                    'value': 546,
-                                    'txid': '52520faddfafc46b8f8c9548b097f3a3b82a5bf363b5095047b9c5f83247fe36',
-                                    'vout': 1,
-                                    'isSlp': true,
-                                    'type': 'token',
-                                    'qty': '34999991',
-                                    'tokenId': '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
-                                    'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
-                                    'ticker': 'PSF',
-                                    'name': 'Permissionless Software Foundation',
-                                    'documentUri': 'psfoundation.cash',
-                                    'documentHash': '',
-                                    'decimals': 8,
-                                    'qtyStr': '0.34999991'
-                                },
-                                {
-                                    'height': 730597,
-                                    'tx_hash': '5dc7e7c91382aed1666a51212dfb74050261e12c3c4f62b6b1e57f42d6c51ee1',
-                                    'tx_pos': 2,
-                                    'value': 546,
-                                    'txid': '5dc7e7c91382aed1666a51212dfb74050261e12c3c4f62b6b1e57f42d6c51ee1',
-                                    'vout': 2,
-                                    'isSlp': true,
-                                    'type': 'token',
-                                    'qty': '18898',
-                                    'tokenId': 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
-                                    'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
-                                    'ticker': 'TROUT',
-                                    'name': "Trout's test token",
-                                    'documentUri': 'troutsblog.com',
-                                    'documentHash': '',
-                                    'decimals': 2,
-                                    'qtyStr': '188.98'
-                                }
-                            ]
-                        },
-                        nft: {
-                            tokens: []
-                        },
-                        group: {
-                            tokens: [],
-                            mintBatons: []
-                        }
-                    }
-                }
-            };
-        }
-    }
+  mnemonic: 'course abstract aerobic deer try switch turtle diet fence affair butter top',
+  privateKey: 'L5D2UAam8tvo3uii5kpgaGyjvVMimdrXu8nWGQSQjuuAix6ji1YQ',
+  publicKey: '0379433ffc401483ade310469953c1cba77c71af904f07c15bde330d7198b4d6dc',
+  cashAddress: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
+  address: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
+  slpAddress: 'simpleledger:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acq9zm7d33',
+  legacyAddress: '1JQj1KcQL7GPKzc1D2PvdUSgw3MbDtrHzi',
+  hdPath: "m/44'/245'/0'/0/0",
+  nextAddress: 1
 }
 
-export { MockBchWallet };
+class MockBchWallet {
+  constructor () {
+    this.walletInfoPromise = true
+    this.walletInfo = mockWallet
+    this.bchjs = new BCHJS()
+    this.burnTokens = async () => {
+      return { success: true, txid: 'txid' }
+    }
+    this.sendTokens = async () => {
+      return 'fakeTxid'
+    }
+    this.getUtxos = async () => {
+    }
+    this.getTxData = async () => {
+      return [{
+        tokenTicker: 'TROUT'
+      }]
+    }
+    this.getTokenData = async () => {}
+    this.initialize = async () => {}
+    this.utxoIsValid = async () => {}
 
-export { mockWallet };
+    // Environment variable is used by wallet-balance.unit.js to force an error.
+    if (process.env.NO_UTXO) {
+      this.utxos = {}
+    } else {
+      this.utxos = {
+        utxoStore: {
+          address: 'bitcoincash:qqetvdnlt0p8g27dr44cx7h057kpzly9xse9huc97z',
+          bchUtxos: [
+            {
+              height: 700685,
+              tx_hash: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
+              tx_pos: 0,
+              value: 1000,
+              txid: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
+              vout: 0,
+              isValid: false
+            },
+            {
+              height: 700685,
+              tx_hash: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
+              tx_pos: 2,
+              value: 19406,
+              txid: '1fc577caaff5626a8477162581e57bae1b19dc6aa6c10638013c2b1ba14dc654',
+              vout: 2,
+              isValid: false
+            }
+          ],
+          nullUtxos: [],
+          slpUtxos: {
+            type1: {
+              mintBatons: [],
+              tokens: [
+                {
+                  'height': 717331,
+                  'tx_hash': '74889580bb1a5f8c026aa2f55118ac9917df3332f7abae72a70343daa1c29621',
+                  'tx_pos': 1,
+                  'value': 546,
+                  'txid': '74889580bb1a5f8c026aa2f55118ac9917df3332f7abae72a70343daa1c29621',
+                  'vout': 1,
+                  'isSlp': true,
+                  'type': 'token',
+                  'qty': '10',
+                  'tokenId': '600ee24d0f208aebc2bdd2c4ee1b9acb6d57343561442e8676b5bbea311d5a0f',
+                  'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
+                  'ticker': 'FLIPS',
+                  'name': 'FLIPS',
+                  'documentUri': '',
+                  'documentHash': '',
+                  'decimals': 1,
+                  'qtyStr': '1'
+                },
+                {
+                  'height': 730597,
+                  'tx_hash': '52520faddfafc46b8f8c9548b097f3a3b82a5bf363b5095047b9c5f83247fe36',
+                  'tx_pos': 1,
+                  'value': 546,
+                  'txid': '52520faddfafc46b8f8c9548b097f3a3b82a5bf363b5095047b9c5f83247fe36',
+                  'vout': 1,
+                  'isSlp': true,
+                  'type': 'token',
+                  'qty': '34999991',
+                  'tokenId': '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
+                  'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
+                  'ticker': 'PSF',
+                  'name': 'Permissionless Software Foundation',
+                  'documentUri': 'psfoundation.cash',
+                  'documentHash': '',
+                  'decimals': 8,
+                  'qtyStr': '0.34999991'
+                },
+                {
+                  'height': 730597,
+                  'tx_hash': '5dc7e7c91382aed1666a51212dfb74050261e12c3c4f62b6b1e57f42d6c51ee1',
+                  'tx_pos': 2,
+                  'value': 546,
+                  'txid': '5dc7e7c91382aed1666a51212dfb74050261e12c3c4f62b6b1e57f42d6c51ee1',
+                  'vout': 2,
+                  'isSlp': true,
+                  'type': 'token',
+                  'qty': '18898',
+                  'tokenId': 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
+                  'address': 'bitcoincash:qqraj35x6l2qyqhjm5l7qlt7z2245ez8l5z3dwkeq5',
+                  'ticker': 'TROUT',
+                  'name': "Trout's test token",
+                  'documentUri': 'troutsblog.com',
+                  'documentHash': '',
+                  'decimals': 2,
+                  'qtyStr': '188.98'
+                }
+              ]
+            },
+            nft: {
+              tokens: []
+            },
+            group: {
+              tokens: [],
+              mintBatons: []
+            }
+          }
+        }
+      }
+    }
+  }
+}
 
-export default {
-    MockBchWallet,
-    mockWallet
-};
+export { MockBchWallet, mockWallet};

test/unit/mocks/helia-mock.js

@@ -1,13 +0,0 @@
-/*
-  Mocking library for helia.
-  This is used to replace the helia library when running unit tests.
-*/
-
-const ipfs = {
-  libp2p: {
-    getMultiaddrs: () => [],
-    peerId: 'fake-id'
-  }
-}
-
-export default ipfs

test/unit/mocks/nostr-mock.js

@@ -1,15 +0,0 @@
-class RelayPoolClassMock {
-  constructor() {
-    this.relay = { close: () => { } , subscribe: () => { } }
-    this.event = { content: 'content' }
-  }
-  on(ev, callback) {
-    callback(this.relay, null, this.event)
-  }
-}
-
-const RelayPoolMock =()=>{
-  return new RelayPoolClassMock()
-}
-
-export default {  RelayPoolMock }

test/unit/mocks/use-cases/index.js

@@ -41,42 +41,12 @@ class Offer {
   async createOffer() {
     return {}
   }
-  async removeStaleOffers(){
-
-  }
-  async removeDuplicateOffers(){
-    
-  }
-  async loadOffers(){
-    
-  }
 }
 
 class Order {
   async createOrder() {
     return {}
   }
-  async removeStaleOrders(){
-    return {}
-  }
-}
-
-class UsageUseCaseMock {
-  async cleanUsage() {
-    return {}
-  }
-
-  async getRestSummary() {
-    return true
-  }
-
-  async getTopIps(params) {
-    return true
-  }
-
-  async getTopEndpoints(existingUser, newData) {
-    return true
-  }
 }
 
 class UseCasesMock {
@@ -88,7 +58,6 @@ class UseCasesMock {
   entry = new EntryUseCaseMock()
   offer = new Offer()
   order = new Order()
-  usage = new UsageUseCaseMock()
 }
 
 export default UseCasesMock;

test/unit/mocks/use-cases/offer-mock-data.js

@@ -3,45 +3,45 @@
 */
 
 const nftOffer01 = {
-  "messageType": 1,
-  "messageClass": 1,
-  "tokenId": "eb93f05553ff088bffb0ec687519e83c59e5108c160f7c25a4b6c45109d7e40b",
-  "buyOrSell": "sell",
-  "rateInBaseUnit": 7672536,
-  "minUnitsToExchange": 7672536,
-  "numTokens": 1,
-  "utxoTxid": "c736d73e274df20e9b069b4990d1a264fb80aa98d67cc6c7a39e42bff48e7c04",
-  "utxoVout": 1,
-  "timestamp": 1662930309998,
-  "globaltimestamp": "2022-09-11T21:05:09.998Z",
-  "localTimestamp": "9/11/2022, 9:05:09 PM",
-  "txid": "4266862b8358664996038d8c29d49dc0f3d3058fd1ef3d567b084e6b16ceb5b2",
-  "p2wdbHash": "zdpuArq7rCuVCGPyTnWpLjy9AYsh8yrbwjGdKwg2GDDALkM8t",
-  "offerStatus": "posted",
-  "makerAddr": "bitcoincash:qrqlz63cwmu0hcmsrfnd8jemn3atkpaqds6tf4ksrr",
-  "ticker": "TV001",
-  "tokenType": 65
+ "messageType": 1,
+ "messageClass": 1,
+ "tokenId": "eb93f05553ff088bffb0ec687519e83c59e5108c160f7c25a4b6c45109d7e40b",
+ "buyOrSell": "sell",
+ "rateInBaseUnit": 7672536,
+ "minUnitsToExchange": 7672536,
+ "numTokens": 1,
+ "utxoTxid": "c736d73e274df20e9b069b4990d1a264fb80aa98d67cc6c7a39e42bff48e7c04",
+ "utxoVout": 1,
+ "timestamp": 1662930309998,
+ "globaltimestamp": "2022-09-11T21:05:09.998Z",
+ "localTimestamp": "9/11/2022, 9:05:09 PM",
+ "txid": "4266862b8358664996038d8c29d49dc0f3d3058fd1ef3d567b084e6b16ceb5b2",
+ "p2wdbHash": "zdpuArq7rCuVCGPyTnWpLjy9AYsh8yrbwjGdKwg2GDDALkM8t",
+ "offerStatus": "posted",
+ "makerAddr": "bitcoincash:qrqlz63cwmu0hcmsrfnd8jemn3atkpaqds6tf4ksrr",
+ "ticker": "TV001",
+ "tokenType": 65
 }
 
 const nftTokenData01 = {
-  "genesisData": {
-    "type": 65,
-    "ticker": "TV001",
-    "name": "Introduction to NFTs on BCH",
-    "tokenId": "eb93f05553ff088bffb0ec687519e83c59e5108c160f7c25a4b6c45109d7e40b",
-    "documentUri": "ipfs://bafybeibmgilu4lk3uivwyzhtm7jorl5zbsluewqmcsxs6otzrphh33okk4",
-    "documentHash": "c1731268f4873f1928438abdaf6ffc546d86a1817dc6f3c6bc73fbdfb4664f10",
-    "decimals": 0,
-    "mintBatonIsActive": false,
-    "tokensInCirculationBN": "1",
-    "tokensInCirculationStr": "1",
-    "blockCreated": 740395,
-    "totalBurned": "0",
-    "totalMinted": "1",
-    "parentGroupId": "030563ddd65772d8e9b79b825529ed53c7d27037507b57c528788612b4911107"
-  },
-  "immutableData": "ipfs://bafybeibmgilu4lk3uivwyzhtm7jorl5zbsluewqmcsxs6otzrphh33okk4",
-  "mutableData": "ipfs://bafybeifzhunfpodsztsj5x4ypopngkxuapbxwaxaxkahaybdktk6joqtlq"
+ "genesisData": {
+   "type": 65,
+   "ticker": "TV001",
+   "name": "Introduction to NFTs on BCH",
+   "tokenId": "eb93f05553ff088bffb0ec687519e83c59e5108c160f7c25a4b6c45109d7e40b",
+   "documentUri": "ipfs://bafybeibmgilu4lk3uivwyzhtm7jorl5zbsluewqmcsxs6otzrphh33okk4",
+   "documentHash": "c1731268f4873f1928438abdaf6ffc546d86a1817dc6f3c6bc73fbdfb4664f10",
+   "decimals": 0,
+   "mintBatonIsActive": false,
+   "tokensInCirculationBN": "1",
+   "tokensInCirculationStr": "1",
+   "blockCreated": 740395,
+   "totalBurned": "0",
+   "totalMinted": "1",
+   "parentGroupId": "030563ddd65772d8e9b79b825529ed53c7d27037507b57c528788612b4911107"
+ },
+ "immutableData": "ipfs://bafybeibmgilu4lk3uivwyzhtm7jorl5zbsluewqmcsxs6otzrphh33okk4",
+ "mutableData": "ipfs://bafybeifzhunfpodsztsj5x4ypopngkxuapbxwaxaxkahaybdktk6joqtlq"
 }
 
 const simpleNftOffer01 = {
@@ -126,57 +126,11 @@ const fungibleTokenData01 = {
   "mutableData": ""
 }
 
-const offerMockData = {
-  data: {
-    messageType: 1,
-    messageClass: 1,
-    tokenId:
-      '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
-    buyOrSell: 'sell',
-    rateInBaseUnit: 1000,
-    minUnitsToExchange: 10,
-    numTokens: 0.02,
-    utxoTxid:
-      '241c06bf61384b8623477e419bf4779edbcc7e3bc862f0f179a9ed2967069b87',
-    utxoVout: 0,
-    makerAddr: 'address',
-    tokenType: 1,
-    nostrEventId: 'test'
-  }
-}
-
-const deserealizeTxMock = {
-  //...
-  vout: [
-    {
-      value: 0,
-      scriptPubKey: {
-        addresses: ['bitcoincash:qzy97glp47ut7tstm5g0tlrmkhk742795gkmyc7478']
-      }
-    },
-    {
-      value: 0,
-      scriptPubKey: {
-        addresses: ['bitcoincash:qzy97glp47ut7tstm5g0tlrmkhk742795gkmyc7478']
-      }
-    },
-    {
-      value: 0,
-      scriptPubKey: {
-        addresses: ['bitcoincash:qzy97glp47ut7tstm5g0tlrmkhk742795gkmyc7478']
-      }
-    },
-    //...
-  ]
-}
-
 export default {
   nftOffer01,
   nftTokenData01,
   simpleNftOffer01,
   simpleNftTokenData01,
   fungibleOffer01,
-  fungibleTokenData01,
-  offerMockData,
-  deserealizeTxMock
+  fungibleTokenData01
 };

test/unit/use-cases/offer.use-case.unit.js

@@ -48,69 +48,78 @@ describe('#offer-use-case', () => {
         )
       }
     })
-
-    it('should throw an error if order use cases are not passed in', () => {
-      try {
-        uut = new OfferLib({ adapters })
-
-        assert.fail('Unexpected code path')
-        console.log(uut) // linter
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of Order Use Cases must be passed in when instantiating Offer Use Cases library.'
-        )
-      }
-    })
   })
 
   describe('#createOffer', () => {
-    it('should handle error', async () => {
-      try {
-        await uut.createOffer()
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.include(error.message, 'Cannot read properties of undefined')
+    it('should ignore an offer if utxo has been spent', async () => {
+      const offerObj = {
+        appId: 'swapTest555',
+        data: {
+          messageType: 1,
+          messageClass: 1,
+          tokenId:
+            '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
+          buyOrSell: 'sell',
+          rateInSats: 1000,
+          minSatsToExchange: 10,
+          numTokens: 0.02,
+          utxoTxid:
+            '241c06bf61384b8623477e419bf4779edbcc7e3bc862f0f179a9ed2967069b87',
+          utxoVout: 0
+        },
+        timestamp: '2021-09-20T17:54:26.395Z',
+        localTimeStamp: '9/20/2021, 10:54:26 AM',
+        txid: '46f50f2a0cf44e3ed70dfb0618ef3ebfee57aabcf229b5d2d17c07322b54a8d7',
+        hash: 'zdpuB2X25AZCKo3wpr4sSbw44vqPWJRqcxWQRHZccK5BdtoGD'
       }
-    })
-
-    it('should return false if offer already exist', async () => {
-      const offerObj = mockData.offerMockData
 
       // Mock dependencies
-      // sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').resolves(false)
-      sandbox.stub(uut, 'findOfferByTxid').resolves({})
+      sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').resolves(false)
+      sandbox.stub(uut.adapters.wallet.bchWallet, 'getTokenData').resolves({})
+      sandbox.stub(uut, 'categorizeToken').resolves('nft')
+      sandbox.stub(uut, 'detectNsfw').resolves(false)
 
       const result = await uut.createOffer(offerObj)
-      assert.isFalse(result)
+      // console.log('result: ', result)
+
+      assert.equal(result, false)
     })
 
-    it('should return false for invalid utxo', async () => {
-      const offerObj = mockData.offerMockData
+    it('should create an offer and return the hash', async () => {
+      const offerObj = {
+        appId: 'swapTest555',
+        data: {
+          messageType: 1,
+          messageClass: 1,
+          tokenId:
+            '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
+          buyOrSell: 'sell',
+          rateInBaseUnit: 1000,
+          minUnitsToExchange: 10,
+          numTokens: 0.02,
+          utxoTxid:
+            '241c06bf61384b8623477e419bf4779edbcc7e3bc862f0f179a9ed2967069b87',
+          utxoVout: 0,
+          makerAddr: 'bitcoincash:qzl0d3gcqeypv4cy7gh8rgdszxa9vvm2acv7fqtd00',
+          ticker: 'TROUT',
+          tokenType: 1
+        },
+        timestamp: '2021-09-20T17:54:26.395Z',
+        localTimeStamp: '9/20/2021, 10:54:26 AM',
+        txid: '46f50f2a0cf44e3ed70dfb0618ef3ebfee57aabcf229b5d2d17c07322b54a8d7',
+        hash: 'zdpuB2X25AZCKo3wpr4sSbw44vqPWJRqcxWQRHZccK5BdtoGD'
+      }
 
       // Mock dependencies
-      // sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').resolves(false)
-      sandbox.stub(uut, 'findOfferByTxid').throws(new Error('offer not found'))
-      sandbox.stub(uut.retryQueue, 'addToQueue').resolves(null)
+      sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').resolves(true)
+      sandbox.stub(uut, 'categorizeToken').resolves('fungible')
+      sandbox.stub(uut.adapters.wallet.bchWallet, 'getTokenData').resolves({})
+      sandbox.stub(uut, 'detectNsfw').resolves(false)
 
       const result = await uut.createOffer(offerObj)
-      assert.isFalse(result)
-    })
+      // console.log('result: ', result)
 
-    it('should create offer', async () => {
-      const tokenDataMock = mockData.simpleNftTokenData01
-      const offerObj = mockData.offerMockData
-
-      // Mock dependencies
-      // sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').resolves(false)
-      sandbox.stub(uut, 'findOfferByTxid').throws(new Error('offer not found'))
-      sandbox.stub(uut.retryQueue, 'addToQueue')
-        .onCall(0).resolves({}) // Utxo Status call
-        .onCall(1).resolves(tokenDataMock) // Token Data call
-        .onCall(2).resolves(false) // detectNsfw  call
-
-      const result = await uut.createOffer(offerObj)
-      assert.isTrue(result)
+      assert.equal(result, true)
     })
   })
 
@@ -150,29 +159,15 @@ describe('#offer-use-case', () => {
 
       assert.equal(result, 'fungible')
     })
-
-    it('should unknow type', async () => {
-      try {
-        // Mock dependencies
-        const offerData = mockData.fungibleOffer01
-        const tokenData = { genesisData: {} }
-
-        await uut.categorizeToken(offerData, tokenData)
-
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.include(error.message, 'Unknown token type:')
-      }
-    })
   })
 
   describe('#removeDuplicateOffers', () => {
     it('should remove duplicate entries and return true', async () => {
       // Mock dependencies and force desired code path.
       sandbox.stub(uut.OfferModel, 'find').resolves([
-        { p2wdbHash: 'a', remove: async () => { } },
-        { p2wdbHash: 'a', remove: async () => { } },
-        { p2wdbHash: 'b', remove: async () => { } }
+        { p2wdbHash: 'a', remove: async () => {} },
+        { p2wdbHash: 'a', remove: async () => {} },
+        { p2wdbHash: 'b', remove: async () => {} }
       ])
       // sandbox.stub(uut.OfferModel, 'remove').resolves()
 
@@ -185,8 +180,8 @@ describe('#offer-use-case', () => {
     it('should return false if there are no duplicate entries', async () => {
       // Mock dependencies and force desired code path.
       sandbox.stub(uut.OfferModel, 'find').resolves([
-        { p2wdbHash: 'a', remove: async () => { } },
-        { p2wdbHash: 'b', remove: async () => { } }
+        { p2wdbHash: 'a', remove: async () => {} },
+        { p2wdbHash: 'b', remove: async () => {} }
       ])
       // sandbox.stub(uut.OfferModel, 'remove').resolves()
 
@@ -195,595 +190,5 @@ describe('#offer-use-case', () => {
 
       assert.equal(result, false)
     })
-
-    it('should handle error', async () => {
-      try {
-        // Mock dependencies and force desired code path.
-        sandbox.stub(uut.OfferModel, 'find').throws(new Error('test error'))
-        // sandbox.stub(uut.OfferModel, 'remove').resolves()
-
-        await uut.removeDuplicateOffers()
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'test error')
-      }
-    })
-  })
-
-  describe('#removeStaleOffers', () => {
-    it('remove offer with wrong utxoState', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.OfferModel, 'find').resolves([{ remove: async () => { } }])
-      sandbox.stub(uut.retryQueue, 'addToQueue').resolves(false)
-
-      await uut.removeStaleOffers()
-    })
-
-    it('remove offer with wrong txid', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.OfferModel, 'find').resolves([{ remove: async () => { } }])
-      sandbox.stub(uut.retryQueue, 'addToQueue').throws(new Error('txid needs to be a proper transaction ID'))
-
-      await uut.removeStaleOffers()
-    })
-
-    it('remove expired offer ', async () => {
-      const tsMock = new Date()
-      tsMock.setMonth(tsMock.getMonth() - 3)
-
-      const timestamp = tsMock.getTime()
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.OfferModel, 'find').resolves([{ timestamp, remove: async () => { } }])
-      sandbox.stub(uut.retryQueue, 'addToQueue').resolves(true)
-
-      await uut.removeStaleOffers()
-    })
-
-    it('should handle axios error ', async () => {
-      const testErr = new Error()
-      testErr.isAxiosError = true
-
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.OfferModel, 'find').resolves([{ remove: async () => { } }])
-      sandbox.stub(uut.retryQueue, 'addToQueue').throws(testErr)
-
-      await uut.removeStaleOffers()
-    })
-
-    it('should handle error ', async () => {
-      try {
-        const testErr = new Error('unknow error')
-
-        // Mock dependencies and force desired code path.
-        sandbox.stub(uut.OfferModel, 'find').resolves([{ remove: async () => { } }])
-        sandbox.stub(uut.retryQueue, 'addToQueue').throws(testErr)
-
-        await uut.removeStaleOffers()
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'unknow error')
-      }
-    })
-  })
-
-  describe('#findOfferByTxid', () => {
-    it('should throw an error if input is not provided', async () => {
-      try {
-        await uut.findOfferByTxid()
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'utxoTxid must be a string')
-      }
-    })
-
-    it('should throw an error if offer is not found', async () => {
-      try {
-        // Mock dependencies and force desired code path.
-        sandbox.stub(uut.OfferModel, 'findOne').resolves(null)
-
-        await uut.findOfferByTxid('241c06bf61384b8623477e419bf4779edbcc7e3bc862f0f179a9ed2967069b87')
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'offer not found')
-      }
-    })
-
-    it('should return offer', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.OfferModel, 'findOne').resolves(mockData.nftOffer01)
-
-      const result = await uut.findOfferByTxid('241c06bf61384b8623477e419bf4779edbcc7e3bc862f0f179a9ed2967069b87')
-      assert.isObject(result)
-    })
-  })
-
-  describe('#detectNsfw', () => {
-    it('should return false for wrong cid format', async () => {
-      const result = await uut.detectNsfw({ mutableData: '' })
-      assert.isFalse(result)
-    })
-
-    it('should return true if nft boolean detected', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.axios, 'get').resolves({ data: { nsfw: true } })
-
-      const result = await uut.detectNsfw({ mutableData: 'ipfs://bafybeibqnsmmh6bkf2wwextetki4tly65z4r4qkrrpl5xwgvzdzjley6wm' })
-      assert.isTrue(result)
-    })
-
-    it('should return true if nft string detected', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.axios, 'get').resolves({ data: { nsfw: 'true' } })
-
-      const result = await uut.detectNsfw({ mutableData: 'ipfs://bafybeibqnsmmh6bkf2wwextetki4tly65z4r4qkrrpl5xwgvzdzjley6wm' })
-      assert.isTrue(result)
-    })
-
-    it('should return false if nfsw property does not exist', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.axios, 'get').resolves({ data: {} })
-
-      const result = await uut.detectNsfw({ mutableData: 'ipfs://bafybeibqnsmmh6bkf2wwextetki4tly65z4r4qkrrpl5xwgvzdzjley6wm' })
-      assert.isFalse(result)
-    })
-
-    it('should return false on error', async () => {
-      // Mock dependencies and force desired code path.
-      sandbox.stub(uut.axios, 'get').throws(new Error('test error'))
-
-      const result = await uut.detectNsfw({ mutableData: 'ipfs://bafybeibqnsmmh6bkf2wwextetki4tly65z4r4qkrrpl5xwgvzdzjley6wm' })
-      assert.isFalse(result)
-    })
-  })
-
-  describe('#listOffers', () => {
-    it('should handle error', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.OfferModel, 'find').throws(new Error('test error'))
-
-        await uut.listOffers()
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should list orders', async () => {
-      const queryMock = {
-        sort () {
-          return this
-        },
-        skip () {
-          return this
-        },
-        limit () { return [] }
-      }
-      // Mock dependencies
-      sandbox.stub(uut.OfferModel, 'find').returns(queryMock)
-
-      const result = await uut.listOffers()
-      assert.isArray(result)
-    })
-  })
-
-  describe('#listNftOffers', () => {
-    it('should handle error', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.OfferModel, 'find').throws(new Error('test error'))
-
-        await uut.listNftOffers()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should list orders', async () => {
-      const queryMock = {
-        sort () {
-          return this
-        },
-        skip () {
-          return this
-        },
-        limit () { return [] }
-      }
-      // Mock dependencies
-      sandbox.stub(uut.OfferModel, 'find').returns(queryMock)
-
-      const result = await uut.listNftOffers(1, true)
-      assert.isArray(result)
-    })
-  })
-
-  describe('#listFungibleOffers', () => {
-    it('should handle error', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.OfferModel, 'find').throws(new Error('test error'))
-
-        await uut.listFungibleOffers()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should list orders', async () => {
-      const queryMock = {
-        sort () {
-          return this
-        },
-        skip () {
-          return this
-        },
-        limit () { return [] }
-      }
-
-      // Mock dependencies
-      sandbox.stub(uut.OfferModel, 'find').returns(queryMock)
-
-      const result = await uut.listFungibleOffers()
-      assert.isArray(result)
-    })
-  })
-
-  describe('#takeOffer', () => {
-    it('should handle error if input is not provided', async () => {
-      try {
-        await uut.takeOffer()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'eventId must be a string')
-      }
-    })
-
-    it('should handle error for wrong offer status', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').returns({ offerStatus: 'completed' })
-
-        await uut.takeOffer('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'offer status is not "posted", so offer is dead and can not be countered.')
-      }
-    })
-
-    it('should handle error for invalid utxo', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').returns({ offerStatus: 'posted' })
-        sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').returns(false)
-
-        await uut.takeOffer('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'UTXO does not exist. Aborting.')
-      }
-    })
-
-    it('should handle insufficient funds', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').returns({ offerStatus: 'posted' })
-        sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').returns(true)
-        sandbox.stub(uut, 'ensureFunds').throws(new Error('test error'))
-
-        await uut.takeOffer('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should handle error if counter offer cant be calculated', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').returns({ offerStatus: 'posted' })
-        sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').returns(true)
-        sandbox.stub(uut, 'ensureFunds').resolves(true)
-
-        await uut.takeOffer('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Could not calculate the amount of BCH to generate counter offer')
-      }
-    })
-
-    it('should handle error if counter offer cant be calculated', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').returns({ offerStatus: 'posted' })
-        sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').returns(true)
-        sandbox.stub(uut, 'ensureFunds').resolves(true)
-
-        await uut.takeOffer('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Could not calculate the amount of BCH to generate counter offer')
-      }
-    })
-
-    it('should take offer', async () => {
-      // Mock data
-      const offerMock = Object.assign({}, mockData.offerMockData.data)
-      offerMock.remove = async () => { }
-      offerMock.offerStatus = 'posted'
-
-      // Mock dependencies
-      sandbox.stub(uut, 'findOfferByEvent').returns(offerMock)
-      sandbox.stub(uut.adapters.wallet.bchWallet, 'utxoIsValid').returns(true)
-      sandbox.stub(uut, 'ensureFunds').resolves(true)
-      sandbox.stub(uut.adapters.wallet, 'moveBch').resolves({ sats: 1 })
-
-      await uut.takeOffer('eventId')
-    })
-  })
-
-  describe('#ensureFunds', () => {
-    // it('should handle insufficient funds to use p2wdb', async () => {
-    //   try {
-    //     // Mock dependencies
-    //     sandbox.stub(uut.adapters.p2wdb, 'checkForSufficientFunds').resolves(false)
-    //
-    //     await uut.ensureFunds(mockData.offerMockData.data)
-    //
-    //     assert.fail('Unexpected code path')
-    //   } catch (err) {
-    //     assert.include(err.message, 'App wallet does not have funds for writing to the P2WDB')
-    //   }
-    // })
-
-    it('should throw error if sats needed could no be able to calculated', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.adapters.p2wdb, 'checkForSufficientFunds').resolves(true)
-
-        // Mock Input
-        const mock = Object.assign({}, mockData.offerMockData.data)
-        mock.rateInBaseUnit = null
-
-        await uut.ensureFunds(mock)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Could not calculate sats needed!')
-      }
-    })
-
-    it('should throw error if app wallet does not have enough bch', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.adapters.p2wdb, 'checkForSufficientFunds').resolves(true)
-        sandbox.stub(uut.adapters.wallet.bchWallet, 'getBalance').resolves(0)
-
-        await uut.ensureFunds(mockData.offerMockData.data)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'App wallet does not control enough BCH to purchase the tokens.')
-      }
-    })
-
-    it('should handle BUY offer', async () => {
-      try {
-        const mock = Object.assign({}, mockData.offerMockData.data)
-        mock.buyOrSell = 'buy'
-
-        await uut.ensureFunds(mock)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Buy offers are not supported yet.')
-      }
-    })
-
-    it('should return true', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.p2wdb, 'checkForSufficientFunds').resolves(true)
-      sandbox.stub(uut.adapters.wallet.bchWallet, 'getBalance').resolves(10 * 10 ** 6)
-
-      const result = await uut.ensureFunds(mockData.offerMockData.data)
-      assert.isTrue(result)
-    })
-  })
-
-  describe('#findOrderByEvent', () => {
-    it('should throw an error if hash is not provided', async () => {
-      try {
-        await uut.findOfferByEvent()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'nostrEventId must be a string')
-      }
-    })
-
-    it('should throw an error if order is not found!', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.OfferModel, 'findOne').resolves(null)
-
-        await uut.findOfferByEvent('eventId')
-
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'offer not found')
-      }
-    })
-
-    it('should return offer by eventId', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.OfferModel, 'findOne').resolves({ toObject: () => { return { hash: 'hash' } } })
-
-      const result = await uut.findOfferByEvent('eventId')
-      assert.isObject(result)
-    })
-  })
-
-  describe('#flagOffer', () => {
-    it('should throw an error if input is not provided', async () => {
-      try {
-        await uut.flagOffer()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, '"data" property is required')
-      }
-    })
-
-    it('should throw an error if offer is not found!', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut, 'findOfferByEvent').resolves(null)
-
-        const input = {
-          data:
-          {
-            nostrEventId: 'eventId'
-          }
-        }
-        await uut.flagOffer(input)
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'not found in the database')
-      }
-    })
-
-    it('should flag offer', async () => {
-      // Mock dependencies
-      sandbox.stub(uut, 'findOfferByEvent').resolves({ flags: ['a', 'b', 'c'], save: () => { } })
-
-      const input = {
-        data:
-        {
-          nostrEventId: 'eventId'
-        }
-      }
-      const result = await uut.flagOffer(input)
-      assert.isTrue(result)
-    })
-  })
-
-  describe('#loadOffers', () => {
-    it('should handle nostr error', async () => {
-      try {
-        // Mock dependencies
-        sandbox.stub(uut.adapters.nostr, 'read').throws(new Error('test error'))
-
-        await uut.loadOffers()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should skip internal function errors ', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.nostr, 'read').resolves([mockData.offerMockData])
-
-      await uut.loadOffers()
-    })
-
-    it('should review and load offers', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.adapters.nostr, 'read').resolves([JSON.stringify(mockData.offerMockData)])
-
-      await uut.loadOffers()
-    })
-  })
-
-  describe('#acceptCounterOffer', () => {
-    it('should return if order is not found!', async () => {
-      // Mock dependencies
-      sandbox.stub(uut.orderUseCase, 'findOrderByEvent').throws(new Error('test error'))
-
-      const result = await uut.acceptCounterOffer({ data: { /** .... */ } })
-      assert.equal(result, 'N/A')
-    })
-
-    it('should handle error if counter offer cant be calculated', async () => {
-      try {
-        // Mock Data
-        const mock = Object.assign({}, mockData.offerMockData.data)
-        mock.rateInBaseUnit = null
-
-        // Mock dependencies
-        sandbox.stub(uut.orderUseCase, 'findOrderByEvent').resolves(mock)
-        sandbox.stub(uut.orderUseCase, 'findOrderByUtxo').resolves(mock)
-
-        const result = await uut.acceptCounterOffer({ data: { /** .... */ } })
-        console.log('result: ', result)
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Could not calculate the amount of BCH offered in the Counter Offer')
-      }
-    })
-
-    it('should handle error for wrong transaction output', async () => {
-      try {
-        // Mock Data
-        const mock = Object.assign({}, mockData.offerMockData.data)
-
-        // Mock dependencies
-        sandbox.stub(uut.orderUseCase, 'findOrderByUtxo').resolves(mock)
-        sandbox.stub(uut.orderUseCase, 'findOrderByEvent').resolves(mockData.offerMockData.data)
-        sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.BitcoinCash, 'toSatoshi').returns(0)
-        sandbox.stub(uut.adapters.wallet, 'deseralizeTx').resolves(mockData.deserealizeTxMock)
-
-        await uut.acceptCounterOffer({ data: mock })
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'The Counter Offer has an output of ')
-        assert.include(err.message, 'which does not match the required')
-      }
-    })
-
-    it('should handle error for wrong transaction output address', async () => {
-      try {
-        // Mock data
-        const mock = Object.assign({}, mockData.offerMockData.data)
-        mock.makerAddr = 'bitcoincash:qzy97glp47ut7tstm5g0tlrmkhk742795gkmyc7477' // Unknow Adress
-        mock.rateInBaseUnit = 0
-        mock.numTokens = 0
-
-        // Mock dependencies
-        sandbox.stub(uut.orderUseCase, 'findOrderByEvent').resolves(mock)
-        sandbox.stub(uut.orderUseCase, 'findOrderByUtxo').resolves(mock)
-        sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.BitcoinCash, 'toSatoshi').returns(0)
-
-        sandbox.stub(uut.adapters.wallet, 'deseralizeTx').resolves(mockData.deserealizeTxMock)
-
-        await uut.acceptCounterOffer({ data: { /** .... */ } })
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'The Counter Offer has an output address of')
-        assert.include(err.message, 'which does not match the Maker address')
-      }
-    })
-
-    it('should return tx id', async () => {
-      // Mock data
-      const mock = Object.assign({}, mockData.offerMockData.data)
-      mock.makerAddr = mockData.deserealizeTxMock.vout[2].scriptPubKey.addresses[0] // Maker Address
-      mock.rateInBaseUnit = 0
-      mock.numTokens = 0
-
-      // Mock dependencies
-      sandbox.stub(uut.orderUseCase, 'findOrderByEvent').resolves(mock)
-      sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.BitcoinCash, 'toSatoshi').returns(0)
-      sandbox.stub(uut.adapters.wallet, 'deseralizeTx').resolves(mockData.deserealizeTxMock)
-
-      //
-      const result = await uut.acceptCounterOffer({ data: { /** .... */ } })
-      assert.isString(result)
-    })
   })
 })

test/unit/use-cases/order.use-case.unit.js

@@ -62,69 +62,6 @@ describe('#order-use-case', () => {
 
       assert.equal(result, true)
     })
-    it('should handle insufficient funds', async () => {
-      try {
-        sandbox.stub(uut.adapters.p2wdb, 'checkForSufficientFunds').resolves(false)
-        const orderEntity = {
-          lokadId: 'SWP',
-          messageType: 1,
-          messageClass: 1,
-          tokenId: 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
-          buyOrSell: 'sell',
-          rateInSats: 1000,
-          minSatsToExchange: 0,
-          numTokens: 1
-        }
-
-        await uut.ensureFunds(orderEntity)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'App wallet does not have funds for writing to the P2WDB')
-      }
-    })
-
-    it('should handle insufficient tokens to satisfy the order', async () => {
-      try {
-        const orderEntity = {
-          lokadId: 'SWP',
-          messageType: 1,
-          messageClass: 1,
-          tokenId: '38e97c5d7d3585a2cbf3f9580c82ca33985f9cb0845d4dcce220cb709f9538b0',
-          buyOrSell: 'sell',
-          rateInSats: 1000,
-          minSatsToExchange: 0,
-          numTokens: 1000
-        }
-
-        await uut.ensureFunds(orderEntity)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'App wallet does not have enough tokens to satisfy the SELL order.')
-      }
-    })
-
-    it('should handle BUY order', async () => {
-      try {
-        const orderEntity = {
-          lokadId: 'SWP',
-          messageType: 1,
-          messageClass: 1,
-          tokenId: 'a4fb5c2da1aa064e25018a43f9165040071d9e984ba190c222a7f59053af84b2',
-          buyOrSell: 'buy',
-          rateInSats: 1000,
-          minSatsToExchange: 0,
-          numTokens: 1
-        }
-
-        await uut.ensureFunds(orderEntity)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'Buy orders are not supported yet')
-      }
-    })
   })
 
   // describe('#moveTokens', () => {
@@ -173,66 +110,15 @@ describe('#order-use-case', () => {
       // Mock dependencies and force expected code path
       sandbox.stub(uut.orderEntity, 'inputValidate').returns(entryObj)
       sandbox.stub(uut, 'ensureFunds').resolves()
-      sandbox.stub(uut.UserModel, 'findById').resolves({ mnemonic: 'testMnemonic' })
       sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.Util, 'sleep').resolves()
-      sandbox.stub(uut.adapters.wallet, 'moveTokensFromCustomWallet').resolves({ txid: 'fakeTxid', vout: 0, hdIndex: 1 })
+      sandbox.stub(uut.adapters.wallet, 'moveTokens').resolves({ txid: 'fakeTxid', vout: 0, hdIndex: 1 })
       sandbox.stub(uut.adapters.wallet.bchWallet, 'initialize').resolves()
-      sandbox.stub(uut.adapters.nostr, 'post').resolves('fakeEvenetId')
+      sandbox.stub(uut.adapters.p2wdb, 'write').resolves('fakeHash')
 
       const result = await uut.createOrder(entryObj)
       console.log('result: ', result)
 
-      assert.property(result, 'eventId')
-      assert.property(result, 'noteId')
-    })
-    it('should create an order with consumer-api', async () => {
-      uut.config.useFullStackCash = false
-      const entryObj = {
-        lokadId: 'SWP',
-        messageType: 1,
-        messageClass: 1,
-        tokenId: 'token-id',
-        buyOrSell: 'sell',
-        rateInBaseUnit: 1000,
-        minUnitsToExchange: 1250,
-        numTokens: 1,
-        ticker: 'TEST'
-      }
-
-      // Mock dependencies and force expected code path
-      sandbox.stub(uut.orderEntity, 'inputValidate').returns(entryObj)
-      sandbox.stub(uut, 'ensureFunds').resolves()
-      sandbox.stub(uut.UserModel, 'findById').resolves({ mnemonic: 'testMnemonic' })
-      sandbox.stub(uut.adapters.wallet.bchWallet.bchjs.Util, 'sleep').resolves()
-      sandbox.stub(uut.adapters.wallet, 'moveTokensFromCustomWallet').resolves({ txid: 'fakeTxid', vout: 0, hdIndex: 1 })
-      sandbox.stub(uut.adapters.wallet.bchWallet, 'initialize').resolves()
-      sandbox.stub(uut.adapters.nostr, 'post').resolves('fakeEvenetId')
-
-      const result = await uut.createOrder(entryObj)
-      console.log('result: ', result)
-
-      assert.property(result, 'eventId')
-      assert.property(result, 'noteId')
-    })
-    it('should throw error if user is not found', async () => {
-      try {
-        const entryObj = {
-          lokadId: 'SWP',
-          messageType: 1,
-          messageClass: 1,
-          tokenId: 'token-id',
-          buyOrSell: 'sell',
-          rateInBaseUnit: 1000,
-          minUnitsToExchange: 1250,
-          numTokens: 1,
-          ticker: 'TEST'
-        }
-        await uut.createOrder(entryObj)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'user not found')
-      }
+      assert.isString(result)
     })
 
     it('should catch and throw an error', async () => {
@@ -251,137 +137,4 @@ describe('#order-use-case', () => {
       assert.equal(result, false)
     })
   })
-
-  describe('#findOrderByEvent', () => {
-    it('should throw an error if hash is not provided', async () => {
-      try {
-        await uut.findOrderByEvent()
-      } catch (err) {
-        assert.include(err.message, 'nostrEventId must be a string')
-      }
-    })
-    it('should throw an error if order is not found!', async () => {
-      try {
-        sandbox.stub(uut.OrderModel, 'findOne').resolves(null)
-        await uut.findOrderByEvent('hash')
-      } catch (err) {
-        assert.include(err.message, 'order not found')
-      }
-    })
-    it('should return order by hash', async () => {
-      sandbox.stub(uut.OrderModel, 'findOne').resolves({ toObject: () => { return { hash: 'hash' } } })
-      const result = await uut.findOrderByEvent('hash')
-      assert.isObject(result)
-    })
-  })
-
-  describe('#removeStaleOrders', () => {
-    it('should remove stale orders', async () => {
-      const spy = sinon.spy() // Spy the function
-
-      // Create 2 orders mock .
-      const ordersMock = new Array(2)
-      ordersMock.fill({ remove: () => { spy.call() } })
-
-      sandbox.stub(uut.OrderModel, 'find').resolves(ordersMock)
-      sandbox.stub(uut.retryQueue, 'addToQueue').resolves(false)
-
-      await uut.removeStaleOrders()
-
-      assert.equal(spy.callCount, 2, 'Expected to be called twice.')
-    })
-    it('should handle wrong txid', async () => {
-      const spy = sinon.spy() // Spy the function
-
-      // Create 2 orders mock .
-      const ordersMock = new Array(2)
-      ordersMock.fill({ remove: () => { spy.call() } })
-
-      sandbox.stub(uut.OrderModel, 'find').resolves(ordersMock)
-      sandbox.stub(uut.retryQueue, 'addToQueue').throws(new Error('txid needs to be a proper transaction ID'))
-
-      await uut.removeStaleOrders()
-
-      assert.equal(spy.callCount, 2, 'Expected to be called twice.')
-    })
-    it('should skip order on axios error', async () => {
-      const spy = sinon.spy() // Spy the function
-
-      // Create 2 orders mock .
-      const ordersMock = new Array(2)
-      ordersMock.fill({ remove: () => { spy.call() } })
-
-      const axiosError = new Error()
-      axiosError.isAxiosError = true
-
-      sandbox.stub(uut.OrderModel, 'find').resolves(ordersMock)
-      sandbox.stub(uut.retryQueue, 'addToQueue').throws(axiosError)
-
-      await uut.removeStaleOrders()
-
-      assert.equal(spy.callCount, 0, 'Expected to no be called.')
-    })
-    it('should handle unknow error', async () => {
-      try {
-        // Create 2 orders mock .
-        const ordersMock = new Array(2)
-        ordersMock.fill({ remove: () => { } })
-
-        sandbox.stub(uut.OrderModel, 'find').resolves(ordersMock)
-        sandbox.stub(uut.retryQueue, 'addToQueue').throws(new Error('test error'))
-
-        await uut.removeStaleOrders()
-        assert.fail('unexpected code path')
-      } catch (error) {
-        assert.include(error.message, 'test error')
-      }
-    })
-  })
-
-  describe('#listOrders', () => {
-    it('should handle error', async () => {
-      try {
-        sandbox.stub(uut.OrderModel, 'find').throws(new Error('test error'))
-        await uut.listOrders()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should list orders', async () => {
-      const queryMock = {
-        sort () {
-          return this
-        },
-        skip () {
-          return this
-        },
-        limit () { return [] }
-      }
-
-      sandbox.stub(uut.OrderModel, 'find').returns(queryMock)
-      const result = await uut.listOrders()
-      assert.isArray(result)
-    })
-  })
-
-  describe('#deleteOrder', () => {
-    it('should handle error', async () => {
-      try {
-        sandbox.stub(uut, 'findOrderByEvent').throws(new Error('test error'))
-        await uut.deleteOrder()
-        assert.fail('unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
-
-    it('should delete orders', async () => {
-      sandbox.stub(uut, 'findOrderByEvent').resolves([])
-      sandbox.stub(uut.adapters.wallet, 'reclaimTokens').resolves('txid')
-      const result = await uut.deleteOrder()
-      assert.isString(result)
-    })
-  })
 })

test/unit/use-cases/usage.use-case.unit.js

@@ -1,258 +0,0 @@
-/*
-  Unit tests for the use-cases/usage-use-cases.js business logic library.
-*/
-
-// Public npm libraries
-import { assert } from 'chai'
-import sinon from 'sinon'
-
-// Local support libraries
-import adapters from '../mocks/adapters/index.js'
-
-// Mock
-import { context as mockContext } from '../mocks/ctx-mock.js'
-
-// Unit under test (uut)
-import { UsageUseCases, restCalls, usageMiddleware } from '../../../src/use-cases/usage-use-cases.js'
-
-describe('#usage-use-case', () => {
-  let uut
-  let sandbox
-  let ctx
-
-  before(async () => {
-
-  })
-
-  beforeEach(() => {
-    sandbox = sinon.createSandbox()
-    uut = new UsageUseCases({ adapters })
-
-    // Set as empty array
-    restCalls.splice(0, restCalls.length)
-
-    ctx = mockContext()
-  })
-
-  afterEach(() => sandbox.restore())
-
-  describe('#constructor', () => {
-    it('should throw an error if adapters are not passed in', () => {
-      try {
-        uut = new UsageUseCases()
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(
-          err.message,
-          'Instance of adapters must be passed in when instantiating Usage Use Cases library.'
-        )
-      }
-    })
-  })
-
-  describe('#cleanUsage', () => {
-    it('should delete older data than 24 hours', () => {
-      const now = new Date() // Mock date
-
-      // set older mock data
-      restCalls.push({
-        timestamp: now.getTime() - (60000 * 60 * 48), // 48 hours ago
-        ip: '127.0.0.1'
-      })
-
-      // Set recently mock data
-      restCalls.push({
-        timestamp: now.getTime(),
-        ip: 'localhost'
-      })
-
-      const result = uut.cleanUsage()
-
-      assert.isArray(result)
-      assert.equal(result.length, 1)
-      assert.equal(result[0].ip, 'localhost')
-    })
-
-    it('should handle error', () => {
-      try {
-        // Force an error
-        sandbox.stub(restCalls, 'filter').throws(new Error('uut error'))
-
-        uut.cleanUsage()
-
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'uut error')
-      }
-    })
-  })
-
-  describe('#getRestSummary', () => {
-    it('should get the number of rest calls', () => {
-      // Set mock data
-      restCalls.push({
-        ip: 'localhost'
-      })
-
-      const result = uut.getRestSummary()
-
-      assert.isNumber(result)
-      assert.equal(result, 1)
-    })
-
-    it('should handle error', () => {
-      try {
-        // Force an error
-        sandbox.stub(console, 'log').throws(new Error('uut error'))
-
-        uut.getRestSummary()
-
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'uut error')
-      }
-    })
-  })
-
-  describe('#getTopIps', () => {
-    it('should get top IPs', () => {
-      // Set mock data
-      restCalls.push({
-        ip: 'localhost'
-      })
-
-      // Set mock data
-      restCalls.push({
-        ip: 'localhost'
-      })
-
-      const result = uut.getTopIps()
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'ip')
-      assert.property(result[0], 'cnt')
-
-      assert.equal(result[0].ip, 'localhost')
-      assert.equal(result[0].cnt, '2')
-    })
-
-    it('should return a maximum of 20 values', () => {
-      //  Fill Array with 21 values
-      for (let i = 0; i < 21; i++) {
-        restCalls.push({
-          ip: `localhost-${i}`
-        })
-      }
-
-      const result = uut.getTopIps()
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'ip')
-      assert.property(result[0], 'cnt')
-
-      assert.equal(result.length, 20)
-    })
-
-    it('should handle error', () => {
-      try {
-        // Set mock data
-        restCalls.push(null)
-
-        uut.getTopIps()
-
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.include(error.message, 'Cannot read properties')
-      }
-    })
-  })
-
-  describe('#getTopEndpoints', () => {
-    it('should get top Endpoints', () => {
-      // Set mock data
-      restCalls.push({
-        ip: 'localhost',
-        url: '/api/v1/users',
-        method: 'GET'
-      })
-
-      // Set mock data
-      restCalls.push({
-        ip: 'localhost',
-        url: '/api/v1/users',
-        method: 'GET'
-      })
-
-      const result = uut.getTopEndpoints()
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'endpoint')
-      assert.property(result[0], 'cnt')
-
-      assert.equal(result[0].endpoint, 'GET /api/v1/users')
-      assert.equal(result[0].cnt, '2')
-    })
-
-    it('should return a maximum of 20 values', () => {
-      //  Fill Array with 21 values
-      for (let i = 0; i < 21; i++) {
-        restCalls.push({
-          ip: 'localhost',
-          url: `/api/v1/users-${i}`,
-          method: 'GET'
-        })
-      }
-
-      const result = uut.getTopEndpoints()
-
-      assert.isArray(result)
-
-      assert.property(result[0], 'endpoint')
-      assert.property(result[0], 'cnt')
-
-      assert.equal(result.length, 20)
-    })
-
-    it('should handle error', () => {
-      try {
-        // Set mock data
-        restCalls.push(null)
-
-        uut.getTopEndpoints()
-
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.include(error.message, 'Cannot read properties')
-      }
-    })
-  })
-
-  describe('#usageMiddleware', () => {
-    it('should update restCalls state', async () => {
-      // Spy on next
-      const next = sinon.spy(() => { })
-
-      await usageMiddleware()(ctx, next)
-
-      assert.equal(restCalls.length, 1)
-      assert.isTrue(next.called)
-    })
-
-    it('should handle error', async () => {
-      try {
-        const next = () => { throw new Error('uut error') }
-
-        await usageMiddleware()(ctx, next)
-        assert.fail('Unexpected code path')
-      } catch (error) {
-        assert.equal(error.message, 'uut error')
-        assert.equal(ctx.status, 500)
-        assert.equal(restCalls.length, 0)
-      }
-    })
-  })
-})

test/unit/use-cases/users.use-case.unit.js

@@ -117,29 +117,6 @@ describe('#users-use-case', () => {
         assert.include(err.message, 'test error')
       }
     })
-    it('should handle wallet errors', async () => {
-      try {
-        // Force an error with the database.
-        class MockErrorBchWallet {
-          constructor () {
-            this.walletInfoPromise = Promise.reject(new Error('test error'))
-          }
-        }
-        uut.BchWallet = MockErrorBchWallet
-
-        const usrObj = {
-          email: 'test@test.com',
-          password: 'password',
-          name: 'test'
-        }
-
-        await uut.createUser(usrObj)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        assert.include(err.message, 'test error')
-      }
-    })
 
     it('should create a new user in the DB', async () => {
       // Note: The user created in this test is used by the getUser, update,
@@ -152,6 +129,7 @@ describe('#users-use-case', () => {
       }
 
       const { userData, token } = await uut.createUser(usrObj)
+
       testUser = userData
 
       // Commented out because there is some sophisticated mocking required that
@@ -349,26 +327,6 @@ describe('#users-use-case', () => {
         )
       }
     })
-    it('should throw an error if mnemonic is provided', async () => {
-      try {
-        const newData = {
-          email: 'test@test.com',
-          password: 'password',
-          name: 'test',
-          mnemonic: 'test'
-        }
-
-        await uut.updateUser(testUser, newData)
-
-        assert.fail('Unexpected code path')
-      } catch (err) {
-        // console.log(err)
-        assert.include(
-          err.message,
-          "Property 'mnemonic' cannot be updated!"
-        )
-      }
-    })
 
     it('should update the user model', async () => {
       const newData = {

util/users/createUsers.js

@@ -1,9 +1,8 @@
 import mongoose from 'mongoose'
 import config from '../../config/index.js'
-import User from '../../src/adapters/localdb/models/users.js'
 
-const EMAIL = process.env.EMAIL || 'test@test3.com'
-const PASSWORD = process.env.PASSWORD || 'pass'
+const EMAIL = 'test@test.com'
+const PASSWORD = 'pass'
 
 async function addUser () {
   // Connect to the Mongo Database.
@@ -14,6 +13,8 @@ async function addUser () {
     { useNewUrlParser: true, useUnifiedTopology: true }
   )
 
+  const User = require('../../src/models/users')
+
   const userData = {
     email: EMAIL,
     password: PASSWORD

util/users/getUsers.js

@@ -1,6 +1,6 @@
 import mongoose from 'mongoose'
 import config from '../../config/index.js'
-import User from '../../src/adapters/localdb/models/users.js'
+import User from '../../src/models/users.js'
 
 async function getUsers () {
   // Connect to the Mongo Database.

util/users/production/getUsers.js

@@ -1,21 +0,0 @@
-import mongoose from 'mongoose'
-// import config from '../../config/index.js'
-import User from '../../../src/adapters/localdb/models/users.js'
-
-const mongooseConnectStr = 'mongodb://172.17.0.1:5666/bch-swap-service-prod'
-
-async function getUsers () {
-  // Connect to the Mongo Database.
-  mongoose.Promise = global.Promise
-  mongoose.set('useCreateIndex', true) // Stop deprecation warning.
-  await mongoose.connect(
-    mongooseConnectStr,
-    { useNewUrlParser: true, useUnifiedTopology: true }
-  )
-
-  const users = await User.find({}, '-password')
-  console.log(`users: ${JSON.stringify(users, null, 2)}`)
-
-  mongoose.connection.close()
-}
-getUsers()

util/wallet/sweep-funds.js

@@ -9,10 +9,10 @@
 // Public npm libraries
 import BCHJS from '@psf/bch-js'
 
-import BchTokenSweep from 'bch-token-sweep'
+import BchTokenSweep from 'bch-token-sweep/index'
 
 // Local libraries
-import WalletAdapter from '../../src/adapters/wallet.js'
+import WalletAdapter from '../../src/adapters/wallet'
 
 // Constants
 const EMTPY_ADDR_CUTOFF = 15
@@ -22,7 +22,6 @@ async function sweepFunds () {
     // Open the wallet files.
     const wallet = new WalletAdapter()
     const walletInfo = await wallet.openWallet()
-    const bchWallet = await wallet.instanceWallet(walletInfo)
     console.log('walletInfo: ', walletInfo)
 
     const rootAddr = walletInfo.cashAddress
@@ -50,7 +49,7 @@ async function sweepFunds () {
         const sweeper = new BchTokenSweep(
           wifToSweep,
           rootWif,
-          bchWallet,
+          bchjs,
           550,
           rootAddr
         )
@@ -69,7 +68,7 @@ async function sweepFunds () {
         // Wait between loop iterations.
         await bchjs.Util.sleep(3000)
       } catch (err) {
-        console.log(`error message with index ${hdIndex}: ${err}`)
+        console.log(`error message with index ${hdIndex}: ${err.message}`)
         emptyAddrCnt++
       }
 

util/wallet/sweep-funds2.js

@@ -1,83 +0,0 @@
-/*
-  This script will travers the HD wallet and sweep funds and tokens back
-  into the root address (index 0). That root address needs to have funds
-  to pay for the transactions.
-
-  This version will traverse the HD index of the wallet until it reaches
-  the value in the nextAddress property. This ensures that all UTXOs
-  that could be used by the wallet have been swept.
-*/
-
-// Public npm libraries
-import BCHJS from '@psf/bch-js'
-
-import BchTokenSweep from 'bch-token-sweep'
-
-// Local libraries
-import WalletAdapter from '../../src/adapters/wallet.js'
-
-async function sweepFunds () {
-  try {
-    // Open the wallet files.
-    const wallet = new WalletAdapter()
-    const walletInfo = await wallet.openWallet()
-    const bchWallet = await wallet.instanceWallet(walletInfo)
-    console.log('walletInfo: ', walletInfo)
-
-    const lastIndex = walletInfo.nextAddress
-
-    const rootAddr = walletInfo.cashAddress
-    const rootWif = walletInfo.privateKey
-    console.log(`Sweeping all funds into root address ${rootAddr}...`)
-
-    // Generate an HD tree
-    const bchjs = new BCHJS()
-    const rootSeed = await bchjs.Mnemonic.toSeed(walletInfo.mnemonic)
-    const masterHDNode = bchjs.HDNode.fromSeed(rootSeed)
-
-    let hdIndex = 1
-
-    do {
-      // Generate a keypair from the HD wallet.
-      const childNode = masterHDNode.derivePath(`m/44'/245'/0'/0/${hdIndex}`)
-      const cashAddress = bchjs.HDNode.toCashAddress(childNode)
-      const wifToSweep = bchjs.HDNode.toWIF(childNode)
-
-      console.log(`\nSweeping HD Index ${hdIndex} with address ${cashAddress}`)
-
-      try {
-        // Sweep tokens from address
-        const sweeper = new BchTokenSweep(
-          wifToSweep,
-          rootWif,
-          bchWallet,
-          550,
-          rootAddr
-        )
-        await sweeper.populateObjectFromNetwork()
-
-        const hex = await sweeper.sweepTo(rootAddr)
-        // console.log(`hex: ${hex}`)
-
-        const txid = await sweeper.blockchain.broadcast(hex)
-
-        // console.log('Transaction ID', txid)
-        console.log(`Swept HD index ${hdIndex}. TXID: ${txid}`)
-
-        // Wait between loop iterations.
-        await bchjs.Util.sleep(3000)
-      } catch (err) {
-        console.log(`error message with index ${hdIndex}: ${err}`)
-      }
-
-      hdIndex++
-    } while (hdIndex <= lastIndex)
-
-    console.log(`${lastIndex} empty addresses detected. Exiting.`)
-
-    console.log('\n\nDo not forget to reset the nextAddress property in the wallet.json file!\n\n')
-  } catch (err) {
-    console.error('Error in sweepFunds(): ', err)
-  }
-}
-sweepFunds()