Dockerized

.github/workflows/docker-deploy-to-github.yml

@@ -0,0 +1,66 @@
+name: 'Docker deploy to GitHub'
+
+on:
+  push:
+    branches:
+      - dockerized
+    paths:
+      - 'api.dockerfile'
+      - 'worker.dockerfile'
+      - 'src/**'
+      - '.github/workflows/docker-deploy-to-github.yml'
+
+env:
+  # GitHub settings
+  REGISTRY: ghcr.io/liquality
+
+  # AWS settings
+  AWS_REGION: 'us-east-1'
+
+  # atomicagent-api
+  AGENT_API_IMAGE_NAME: 'atomicagent-api'
+  AGENT_API_IMAGE_TAG: 'latest'
+  AGENT_API_DOCKERFILE_PATH: 'api.dockerfile'
+
+  # atomicagent-worker
+  AGENT_WORKER_IMAGE_NAME: 'atomicagent-worker'
+  AGENT_WORKER_IMAGE_TAG: 'latest'
+  AGENT_WORKER_DOCKERFILE_PATH: 'worker.dockerfile'
+
+jobs:
+  build-and-push-image:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # Build, tag, and push Docker image (agent api)
+      - name: Build, tag, push image to GitHub (agent api)
+        id: build-api-image
+        run: |
+          echo "Building and tagging Docker image ($AGENT_API_IMAGE_NAME)"
+          docker build -f $AGENT_API_DOCKERFILE_PATH -t $AGENT_API_IMAGE_NAME . --no-cache
+          docker tag $AGENT_API_IMAGE_NAME:$AGENT_API_IMAGE_TAG $REGISTRY/$AGENT_API_IMAGE_NAME:$AGENT_API_IMAGE_TAG
+          echo "Pushing image to registry as: $REGISTRY/$AGENT_API_IMAGE_NAME"
+          docker push $REGISTRY/$AGENT_API_IMAGE_NAME:$AGENT_API_IMAGE_TAG
+
+      # Build, tag, and push Docker image (agent worker)
+      - name: Build, tag, push image to GitHub (agent worker)
+        id: build-worker-image
+        run: |
+          echo "Building and tagging Docker image ($AGENT_WORKER_IMAGE_NAME)"
+          docker build -f $AGENT_WORKER_DOCKERFILE_PATH -t $AGENT_WORKER_IMAGE_NAME . --no-cache
+          docker tag $AGENT_WORKER_IMAGE_NAME:$AGENT_WORKER_IMAGE_TAG $REGISTRY/$AGENT_WORKER_IMAGE_NAME:$AGENT_WORKER_IMAGE_TAG
+          echo "Pushing image to registry as: $REGISTRY/$AGENT_WORKER_IMAGE_NAME"
+          docker push $REGISTRY/$AGENT_WORKER_IMAGE_NAME:$AGENT_WORKER_IMAGE_TAG

.github/workflows/test.yml

@@ -1,7 +1,14 @@
 # This actions runs against every Pull request(Include Draft)
 name: Test
 
-on: push
+on:
+  push:
+    paths:
+      - 'src/**'
+      - 'test/**'
+      - 'sample.config.toml'
+      - 'package.json'
+      - '.github/workflows/test.yml'
 
 jobs:
   test:

.gitignore

@@ -1,10 +1,29 @@
-.env
-*config.toml
+# ------------------------------------------------------------------------------
+# Local env and config files
+# ------------------------------------------------------------------------------
+/*config.toml
+/*config.docker.toml
 !sample.config.toml
 !heroku.config.toml
-node_modules/
-marketdata/
 test/docker/config/*
 !test/docker/config/bitcoin.conf
-docker-commands.md
-.DS_Store
+
+# ------------------------------------------------------------------------------
+# NodeJS artifacts
+# ------------------------------------------------------------------------------
+# (yarn.lock is ignored because we are using npm)
+node_modules/
+npm-debug.log*
+.eslintcache
+yarn.lock
+
+# ------------------------------------------------------------------------------
+# Custom assets
+# ------------------------------------------------------------------------------
+marketdata/
+
+# ------------------------------------------------------------------------------
+# OS junk files
+# ------------------------------------------------------------------------------
+[Tt]humbs.db
+*.DS_Store

README.md

@@ -1,8 +1,29 @@
 # 💥 Atomic Agent ![Build status](https://github.com/liquality/agent/workflows/Test,%20publish%20&%20deploy/badge.svg)
 
-## User <-> Agent Swap Workflow
 
-![Workflow](diagram.png "Workflow")
+## Table of Contents
+
+* [Introduction][section-introduction]
+* [Prerequisites][section-prerequisites]
+* [Installation][section-installation]
+* [Usage][section-usage]
+* [Test][section-test]
+* [Liquality Hosted Agents][section-liquality-hosted-agents]
+* [Liquality Nodes][section-liquality-nodes]
+* [Run with Docker][section-run-with-docker]
+* [User to Agent Swap Workflow][section-swap-workflow]
+* [License][section-license]
+
+
+## Introduction
+
+The Atomic Agent service contains three utilities: `migrate`, `api`, `worker`. The API and worker utilities work together to provide the running service, while the migrate utility is utilized to initialize the database with market data.
+
+The API and worker utilities are also distributed as Docker images:
+* `atomicagent-api`
+* `atomicagent-worker`
+
+> Found here: https://github.com/orgs/liquality/packages?repo_name=atomicagent
 
 
 ## Prerequisites
@@ -13,28 +34,60 @@
 4. [RPC/API endpoints for the chains you want to support](#liquality-nodes)
 
 
-## Setup
+## Installation
+
+These instructions outline the standard installation process for the atomic agent:
 
 ```bash
 git clone git@github.com:liquality/atomicagent.git
 cd atomicagent
-npm ci
+npm install
 cp sample.config.toml config.toml   # copy sample config
-nano config.toml                    # configure your agent
+nano config.toml                    # configure your agent settings
 nano src/migrate/data/assets.json   # add/remove assets
 nano src/migrate/data/markets.json  # add/remove markets
 npm run migrate                     # prepare agent with assets & markets
 ```
 
+## Usage
+
+Ensure you have configured all settings for your scenario within the `config.toml` file you created at the root of the repo.
+
+To run the utilities:
+
+```bash
+npm run api     # runs agent market maker api
+npm run worker  # runs the background process
+```
+
+
+## Test
+
+### Configure
+
+```bash
+cp sample.config.toml test.config.toml  # copy sample config
+nano config.toml                        # configure your agent as per your test environment
+```
+
+### Run Automated Tests
+
+```bash
+chmod -R 777 test/docker/config
+npm run docker:start
+sleep 30                          # let bitcoind[regtest] mine first 100 blocks
+npm run test
+```
+
 
 ## Liquality Hosted Agents
 
-|Environment| Network | Endpoint                                               |
-|-|---------|--------------------------------------------------------|
-|Production| Testnet | https://liquality.io/swap-testnet/agent                |
-|Production| Mainnet | https://liquality.io/swap/agent                        |
-|Development| Testnet | https://liquality.io/swap-testnet-dev/agent                |
-|Development| Mainnet | https://liquality.io/swap-dev/agent                        |
+|Environment | Network | Endpoint                                    |
+|------------|---------|---------------------------------------------|
+|Production  | Testnet | https://liquality.io/swap-testnet/agent     |
+|Production  | Mainnet | https://liquality.io/swap/agent             |
+|Development | Testnet | https://liquality.io/swap-testnet-dev/agent |
+|Development | Mainnet | https://liquality.io/swap-dev/agent         |
 
 
 ## Liquality Testnet Nodes
@@ -61,36 +114,85 @@ npm run migrate                     # prepare agent with assets & markets
 | Polygon Scraper       | Mainnet | https://liquality.io/polygon-mainnet-api/              |
 
 
+## Run with Docker
 
-## Run!
+The atomicagent service (which contains two utilities: api, worker) can each be dockerized for portability and convenience.
 
-```bash
-npm run api     # runs agent market maker api
-npm run worker  # runs the background process
-```
+### Run the Atomic Agent Utilities Locally
 
+To run the utilities locally as Docker containers, make a copy of the `sample.config.toml` at the root of the repo and name it: `config.docker.toml`. The Docker run commands provided will use this file for its configuration.
 
-## Test
+> **NOTE:** This configuration requires you to have your own MongoDB running.
 
+> **TIP:** You can use the `config/local/run-mongodb.yml` config to run a simple MongoDB locally.
 
-### Configure
+Ensure you have configured your desired markets and assets to run. The migrate utility will run automatically when the container starts, if the database is empty.
+
+You can configure the markets and assets in the following files:
 
-```bash
-cp sample.config.toml test.config.toml  # copy sample config
-nano config.toml                        # configure your agent as per your test environment
+```
+src/migrate/data/markets.json
+src/migrate/data/assets.json
 ```
 
+To run the API as a container locally:
 
-### Test!
+| Command                   | Description                           |
+| ------------------------- | ------------------------------------- |
+| `docker:build-api-local`  | Builds the "atomicagent-api-local" image. |
+| `docker:run-api-local`    | Runs the "atomicagent-api-local" image as a container. |
+| `docker:log-api-local`    | Prints the standard out of the running "atomicagent-api-local" container. |
+| `docker:stop-api-local`   | Stops the running "atomicagent-api-local" container. |
 
-```bash
-chmod -R 777 test/docker/config
-npm run docker:start
-sleep 30                          # let bitcoind[regtest] mine first 100 blocks
-npm run test
-```
+To run the worker as a container locally:
+
+| Command                      | Description                           |
+| ---------------------------- | ------------------------------------- |
+| `docker:build-worker-local`  | Builds the "atomicagent-worker-local" image. |
+| `docker:run-worker-local`    | Runs the "atomicagent-worker-local" image as a container. |
+| `docker:log-worker-local`    | Prints the standard out of the running "atomicagent-worker-local" container. |
+| `docker:stop-worker-local`   | Stops the running "atomicagent-worker-local" container. |
+
+
+### Docker Image Settings
+
+[TBC]
+
+### Run the Full Swap System
+
+The atomicagent service operates on multiple dependencies (for various chains/networks), as well as requiring a MongoDB to read/write data.
+
+To run the full swap system in a contained environment (for testing purposes):
+
+| Command                       | Description                           |
+| ----------------------------- | ------------------------------------- |
+| `docker:start-full-system`    | Builds and runs the "atomicagent-full-system" image and runs a local simulation of the supported agent services. |
+| `docker:log-full-system`      | Prints the standard out of the running "atomicagent-full-system" container. |
+| `docker:stop-full-system`     | Stops the running "atomicagent-full-system" container and the agent services. |
+
+The config file is pre-configured for this scenario and is located at: `config/tester/config.tester.toml`
+
+
+## User to Agent Swap Workflow
+
+![Workflow](diagram.png "Workflow")
 
 
 ## License
 
 [MIT](./LICENSE.md)
+
+
+
+
+
+[section-introduction]: #introduction
+[section-prerequisites]: #prerequisites
+[section-installation]: #installation
+[section-usage]: #usage
+[section-test]: #test
+[section-liquality-hosted-agents]: #liquality-hosted-agents
+[section-liquality-nodes]: #liquality-nodes
+[section-run-with-docker]: #run-with-docker
+[section-swap-workflow]: #user-to-agent-swap-workflow
+[section-license]: #license