Skip to content

Commit

Permalink
chore: sync docs and readmes (#2830)
Browse files Browse the repository at this point in the history
* fix: getting the localenv docs and readme in sync

* chore: updated MASE screenshots

* chore: updating the code block language identifier to have consistent approach through the docs
  • Loading branch information
JoblersTune authored Jul 31, 2024
1 parent 9b7fcdc commit 752bb73
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 48 deletions.
58 changes: 33 additions & 25 deletions localenv/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ These packages depend on the following databases:

- TigerBeetle or Postgres (accounting)
- Postgres (Open Payments resources, auth resources)
- Redis (STREAM details)
- Redis (STREAM details, auth sessions)

We provide containerized versions of our packages together with two pre-configured docker-compose files ([peer1](./cloud-nine-wallet/docker-compose.yml) and [peer2](./happy-life-bank/docker-compose.yml)) to start two Mock Account Servicing Entities with their respective Rafiki backend and auth servers. They automatically peer and 2 to 3 user accounts are created on both of them.
We provide containerized versions of our packages together with two pre-configured docker-compose files ([Cloud Nine Wallet](./cloud-nine-wallet/docker-compose.yml) and [Happy Life Bank](./happy-life-bank/docker-compose.yml)) to start two Mock Account Servicing Entities with their respective Rafiki backend and auth servers. They automatically peer and 2 to 3 user accounts are created on both of them.

This environment will set up a playground where you can use the Rafiki Admin APIs and the Open Payments APIs.

Expand Down Expand Up @@ -77,7 +77,7 @@ Navigate to [`localhost:3030`](http://localhost:3030) to view the accounts on on

The accounts of the second instance (Happy Life Bank) can be found on [`localhost:3031`](http://localhost:3031).

When clicking on the Account Name, a list of Transactions appears.
When clicking on the Account Name, you can view the account information, the available balance, and see a list of transactions.

![Mock Account Servicing Entity Transactions](../packages/documentation/public/img/map-transactions.png)

Expand Down Expand Up @@ -125,18 +125,19 @@ See the `frontend` [README](../packages/frontend/README.md#ory-kratos) for more

#### Autopeering

If you want to start the local env and peer it automatically to rafiki.money, you can run the following commands:
If you want to start one local instance of Rafiki and peer it automatically to [Rafiki.money](https://rafiki.money), you can run the following commands:

```
```sh
# using Tigerbeetle DB
pnpm localenv:compose:autopeer

// OR to start with Postgres db
# OR using Postgres DB
pnpm localenv:compose:psql:autopeer
```

Your local cloud nine rafiki instance will be peered automatically in this case with https://rafiki.money instance.
The required services will be exposed externally using [localtunnel](https://www.npmjs.com/package/localtunnel) package.
The exposed ports are 3000(open-payments), 3006(auth server), 3002(ilp connector).
Your local Rafiki instance will be automatically peered with the remote [Rafiki.money](https://rafiki.money) instance.
The required services will be exposed externally using the [localtunnel](https://www.npmjs.com/package/localtunnel) package.
The exposed ports are 3000(open-payments), 3006(auth server), 3002(ILP connector).

To use the Open Payments example in the Bruno collection examples, follow these steps:

Expand All @@ -146,7 +147,13 @@ To use the Open Payments example in the Bruno collection examples, follow these

Note that you have to go through an additional "login" step by providing you IPv4 address as tunnel password before being able to visit the consent screen for the outgoing payment grant request. You can find out your current IPv4 address by e.g. visiting https://loca.lt/mytunnelpassword (or https://www.whatismyip.com/).

After stopping the script it is necessary to clear the environment using the command described in [Shutting down](#Shutting-down). This is necessary as on a new run of the scripts (with autopeering or not) the wallet address url will differ.
To shut down the connection and to clear the environment, run

```sh
pnpm localenv:compose down --volumes
```

This is necessary since on a new run of the scripts (with autopeering or not), the wallet address urls will differ.

### Debugging

Expand Down Expand Up @@ -204,20 +211,21 @@ pnpm localenv:compose down --volumes --rmi all

### Commands

| Command | Description |
| ------------------------------------------- | ------------------------------------------- |
| `pnpm localenv:compose config` | Show all merged config (with Tigerbeetle) |
| `pnpm localenv:compose up` | Start (with Tigerbeetle) |
| `pnpm localenv:compose up -d` | Start detached (with Tigerbeetle) |
| `pnpm localenv:compose down` | Down (with Tigerbeetle) |
| `pnpm localenv:compose down --volumes` | Down and kill volumes (with Tigerbeetle) |
| `pnpm localenv:compose:psql config` | Show all merged config (with Postgresql) |
| `pnpm localenv:compose build` | Build all the containers (with Tigerbeetle) |
| `pnpm localenv:compose:psql up` | Start (with Postgresql) |
| `pnpm localenv:compose:psql up -d` | Start detached (with Postgresql) |
| `pnpm localenv:compose:psql down` | Down (with Postgresql) |
| `pnpm localenv:compose:psql down --volumes` | Down and kill volumes (with Postgresql) |
| `pnpm localenv:compose:psql build` | Build all the containers (with Postgresql) |
| Command | Description |
| ------------------------------------------------ | ------------------------------------------------ |
| `pnpm localenv:compose config` | Show all merged config (with Tigerbeetle) |
| `pnpm localenv:compose up` | Start (with Tigerbeetle) |
| `pnpm localenv:compose up -d` | Start (with Tigerbeetle) detached |
| `pnpm localenv:compose down` | Down (with Tigerbeetle) |
| `pnpm localenv:compose down --volumes` | Down and kill volumes (with Tigerbeetle) |
| `pnpm localenv:compose down --volumes --rmi all` | Down, kill volumes (with Tigerbeetle) and images |
| `pnpm localenv:compose:psql config` | Show all merged config (with Postgresql) |
| `pnpm localenv:compose build` | Build all the containers (with Tigerbeetle) |
| `pnpm localenv:compose:psql up` | Start (with Postgresql) |
| `pnpm localenv:compose:psql up -d` | Start (with Postgresql) detached |
| `pnpm localenv:compose:psql down` | Down (with Postgresql) |
| `pnpm localenv:compose:psql down --volumes` | Down (with Postgresql) and kill volumes |
| `pnpm localenv:compose:psql build` | Build all the containers (with Postgresql) |

### Usage

Expand Down Expand Up @@ -289,7 +297,7 @@ Keep-Alive: timeout=5

It is possible that upon (re)starting the local playground, you may run into an issue where there are no accounts/wallet addresses visible in the mock account servicing entities' pages (http://localhost:3030, http://localhost:3031). This is because seeding of the initial account data only works against an empty database. To correct this, clear the volumes, and restart the container via:

```
```sh
pnpm localenv:compose down --volumes
pnpm localenv:compose up -d
```
Expand Down
Binary file modified packages/documentation/public/img/map-accounts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified packages/documentation/public/img/map-transactions.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ title: Auto-Peering

If you want to start one local instance of Rafiki and peer it automatically to [Rafiki.money](https://rafiki.money), you can run the following commands:

```
// using Tigerbeetle DB
```sh
# using Tigerbeetle DB
pnpm localenv:compose:autopeer

// OR using Postgres DB
# OR using Postgres DB
pnpm localenv:compose:psql:autopeer
```

Expand All @@ -26,7 +26,7 @@ Note that you have to go through an additional "login" step by providing you IPv

To shut down the connection and to clear the environment, run

```
```sh
pnpm localenv:compose down --volumes
```

Expand Down
50 changes: 31 additions & 19 deletions packages/documentation/src/content/docs/playground/overview.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ These packages include:
- `auth` (GNAP auth server)
- `mock-account-servicing-entity` (mocks an [Account Servicing Entity](/reference/glossary#account-servicing-entity))
- `frontend` (Remix app to expose a UI for Rafiki Admin management via interaction with the `backend` Admin APIs)
- `kratos` (An identity and user management solution for the `frontend`)
- `mailslurper` (A SMTP mail server to catch account recovery emails)

These packages depend on the following databases:

Expand All @@ -21,6 +23,10 @@ We provide containerized versions of our packages together with two pre-configur

This environment will set up a playground where you can use the Rafiki Admin APIs and the Open Payments APIs.

## Disclaimer

> **The Mock ASE provided in this repository is intended solely for internal use and demonstration purposes. It is not designed to serve as a reference architecture. If you are looking for a reference implementation of an ASE, please refer to the [Test Wallet](https://github.com/interledger/testnet).**
## Environment overview

![Docker compose environment](/img/localenv-architecture.png)
Expand Down Expand Up @@ -73,7 +79,7 @@ Navigate to [`localhost:3030`](http://localhost:3030) to view the accounts on on

The accounts of the second instance (Happy Life Bank) can be found on [`localhost:3031`](http://localhost:3031).

When clicking on the Account Name, a list of Transactions appears.
When clicking on the Account Name, you can view the account information, the available balance, and see a list of transactions.

![Mock Account Servicing Entity Transactions](/img/map-transactions.png)

Expand All @@ -89,19 +95,22 @@ When clicking on the Account Name, a list of Transactions appears.

The following should be run from the root of the project.

```
// If you have spun up the environment before, remember to first tear down and remove volumes!
```sh
# If you have spun up the environment before, remember to first tear down and remove volumes!

// start the local environment
# start the local environment
pnpm localenv:compose up

// tear down and remove volumes
# tear down and remove volumes
pnpm localenv:compose down --volumes

# tear down, delete database volumes and remove images
pnpm localenv:compose down --volumes --rmi all
```

If you want to use Postgres as the accounting database instead of TigerBeetle, you can use the `psql` variant of the `localenv:compose` commands:

```
```sh
pnpm localenv:compose:psql up
pnpm localenv:compose:psql down --volumes
```
Expand All @@ -118,12 +127,12 @@ The `pnpm localenv:compose up` command starts both the primary instance and the

Debuggers for the services are exposed on the following ports:

| IP and Port | Services |
| -------------- | ----------------------- |
| 127.0.0.1:9229 | Cloud Nine Backend |
| 127.0.0.1:9230 | Cloud Nine Auth |
| 127.0.0.1:9231 | Happy Life Bank Backend |
| 127.0.0.1:9232 | Happy Life Bank Auth |
| IP and Port | Services |
| -------------- | ------------------------- |
| 127.0.0.1:9229 | Cloud Nine Wallet Backend |
| 127.0.0.1:9230 | Cloud Nine Auth |
| 127.0.0.1:9231 | Happy Life Bank Backend |
| 127.0.0.1:9232 | Happy Life Bank Auth |

#### With a chromium browser:

Expand All @@ -134,9 +143,9 @@ Debuggers for the services are exposed on the following ports:

You can either trigger the debugger by adding `debugger` statements in code and restarting, or by adding breakpoints directly in the chromium debugger after starting the docker containers.

#### With Vscode:
#### With VS Code:

For debugging with Vscode, you can add this configuration to your `.vscode/launch.json`):
For debugging with VS Code, you can add this configuration to your `.vscode/launch.json`):

```json
{
Expand All @@ -157,12 +166,15 @@ For more ways to connect debuggers, see the Node docs for debugging: https://nod

### Shutting down

```
// tear down
```sh
# tear down
pnpm localenv:compose down

// tear down and delete database volumes
# tear down and delete database volumes
pnpm localenv:compose down --volumes

# tear down, delete database volumes and remove images
pnpm localenv:compose down --volumes --rmi all
```

### Commands
Expand Down Expand Up @@ -249,9 +261,9 @@ Keep-Alive: timeout=5

#### No data in Mock Account Servicing Entity (MASE)

It is possible that upon (re)starting the local playground, you may run into an issue where there are no accounts/wallet addresses visible in the mock account servicing entities' pages (http://localhost:3030, http://localhost:3031). This is because seeding of the intial account data only works against an empty database. To correct this, clear the volumes, and restart the container via:
It is possible that upon (re)starting the local playground, you may run into an issue where there are no accounts/wallet addresses visible in the mock account servicing entities' pages (http://localhost:3030, http://localhost:3031). This is because seeding of the initial account data only works against an empty database. To correct this, clear the volumes, and restart the container via:

```
```sh
pnpm localenv:compose down --volumes
pnpm localenv:compose up -d
```
Expand Down

0 comments on commit 752bb73

Please sign in to comment.