Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
The TRISA test net is comprised of the following:

- [TRISA Directory Service](https://trisatest.net) - a user interface to explore the TRISA Global Directory Service and register to become a TRISA member
- [TestNet Demo](https://vaspbot.net) - a demo site to show TRISA interactions between “robot” VASPs that run in the TestNet
- [TestNet Demo](https://vaspbot.com) - a demo site to show TRISA interactions between “robot” VASPs that run in the TestNet

For more details, see the [TRISA Documentation](https://trisatest.net/), or check out the [TRISA codebase](https://github.com/trisacrypto/trisa).

Expand Down
2 changes: 1 addition & 1 deletion containers/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Additionally you can use the `skaffold build` command to build and push the imag
The rVASP CLI can be used to interact with the rVASPs running in the containers. By default, `alice` listens on `localhost:5434`, `bob` listens on `localhost:6434`, and `evil` listens on `localhost:7434`. For example, one might initiate a transfer between two accounts using the `transfer` command:

```
$ go run ./cmd/rvasp transfer -e localhost:6434 -a robert@bobvasp.co.uk -b mary@alicevasp.us -B api.alice.vaspbot.net -d 42.99 -E
$ go run ./cmd/rvasp transfer -e localhost:6434 -a robert@bobvasp.co.uk -b mary@alicevasp.us -B api.alice.vaspbot.com -d 42.99 -E
```

The `resetdb` command can be used to reset the rVASP database without restarting the containers, using a fixtures directory containing a `vasps.json` and `wallets.json` (defaults to `pkg/rvasp/fixtures`).
Expand Down
10 changes: 5 additions & 5 deletions manifests/cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ spec:
name: letsencrypt-prod
kind: ClusterIssuer
dnsNames:
- "vaspbot.net"
- "*.vaspbot.net"
- "*.alice.vaspbot.net"
- "*.bob.vaspbot.net"
- "*.evil.vaspbot.net"
- "vaspbot.com"
- "*.vaspbot.com"
- "*.alice.vaspbot.com"
- "*.bob.vaspbot.com"
- "*.evil.vaspbot.com"
6 changes: 3 additions & 3 deletions manifests/demo/demo.routes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`vaspbot.net`)
- match: Host(`vaspbot.com`)
kind: Rule
services:
- name: demo-web-service
Expand All @@ -25,7 +25,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`demo.alice.vaspbot.net`)
- match: Host(`demo.alice.vaspbot.com`)
kind: Rule
services:
- name: demobff-alice-service
Expand All @@ -42,7 +42,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`demo.bob.vaspbot.net`)
- match: Host(`demo.bob.vaspbot.com`)
kind: Rule
services:
- name: demobff-bob-service
Expand Down
6 changes: 3 additions & 3 deletions manifests/rvasp/alice.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ spec:
resources: {}
env:
- name: RVASP_NAME
value: "api.alice.vaspbot.net"
value: "api.alice.vaspbot.com"
- name: RVASP_BIND_ADDR
value: ":4434"
- name: RVASP_TRISA_BIND_ADDR
value: ":4435"
- name: RVASP_DATABASE
value: "/data/rvasp.db"
- name: RVASP_CERT_PATH
value: "/data/certs/api.alice.vaspbot.net.gz"
value: "/data/certs/api.alice.vaspbot.com.gz"
- name: RVASP_TRUST_CHAIN_PATH
value: "/data/certs/trisa.zip"
- name: RVASP_DIRECTORY_SERVICE_URL
Expand All @@ -53,7 +53,7 @@ spec:
secretName: alice-certs
items:
- key: mtls
path: api.alice.vaspbot.net.gz
path: api.alice.vaspbot.com.gz
- key: chain
path: trisa.zip
---
Expand Down
6 changes: 3 additions & 3 deletions manifests/rvasp/bob.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ spec:
resources: {}
env:
- name: RVASP_NAME
value: "api.bob.vaspbot.net"
value: "api.bob.vaspbot.com"
- name: RVASP_BIND_ADDR
value: ":4434"
- name: RVASP_TRISA_BIND_ADDR
value: ":4435"
- name: RVASP_DATABASE
value: "/data/rvasp.db"
- name: RVASP_CERT_PATH
value: "/data/certs/api.bob.vaspbot.net.gz"
value: "/data/certs/api.bob.vaspbot.com.gz"
- name: RVASP_TRUST_CHAIN_PATH
value: "/data/certs/trisa.zip"
- name: RVASP_DIRECTORY_SERVICE_URL
Expand All @@ -53,7 +53,7 @@ spec:
secretName: bob-certs
items:
- key: mtls
path: api.bob.vaspbot.net.gz
path: api.bob.vaspbot.com.gz
- key: chain
path: trisa.zip
---
Expand Down
6 changes: 3 additions & 3 deletions manifests/rvasp/evil.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,15 @@ spec:
resources: {}
env:
- name: RVASP_NAME
value: "api.evil.vaspbot.net"
value: "api.evil.vaspbot.com"
- name: RVASP_BIND_ADDR
value: ":4434"
- name: RVASP_TRISA_BIND_ADDR
value: ":4435"
- name: RVASP_DATABASE
value: "/data/rvasp.db"
- name: RVASP_CERT_PATH
value: "/data/certs/api.evil.vaspbot.net.gz"
value: "/data/certs/api.evil.vaspbot.com.gz"
- name: RVASP_TRUST_CHAIN_PATH
value: "/data/certs/trisa.zip"
- name: RVASP_DIRECTORY_SERVICE_URL
Expand All @@ -53,7 +53,7 @@ spec:
secretName: evil-certs
items:
- key: mtls
path: api.evil.vaspbot.net.gz
path: api.evil.vaspbot.com.gz
- key: chain
path: trisa.zip
---
Expand Down
6 changes: 3 additions & 3 deletions manifests/rvasp/rvasp.routes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`admin.alice.vaspbot.net`)
- match: Host(`admin.alice.vaspbot.com`)
kind: Rule
services:
- name: rvasp-alice-service
Expand All @@ -24,7 +24,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`admin.bob.vaspbot.net`)
- match: Host(`admin.bob.vaspbot.com`)
kind: Rule
services:
- name: rvasp-bob-service
Expand All @@ -40,7 +40,7 @@ spec:
entryPoints:
- websecure
routes:
- match: Host(`admin.evil.vaspbot.net`)
- match: Host(`admin.evil.vaspbot.com`)
kind: Rule
services:
- name: rvasp-evil-service
Expand Down
2 changes: 1 addition & 1 deletion pkg/rvasp/testdata/generate.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ openssl req -x509 -newkey rsa:4096 -sha256 -days 10950 \
openssl req -new -newkey rsa:4096 \
-nodes -keyout alice.key.pem -out alice.csr \
-subj "/C=US/ST=New York/L=New York/O=Alice VASP/OU=Testing/CN=alice" \
-addext "subjectAltName=DNS:alice.vaspbot.net,DNS:*.alice.vaspbot.net,DNS:bufnet,DNS:alice"
-addext "subjectAltName=DNS:alice.vaspbot.com,DNS:*.alice.vaspbot.com,DNS:bufnet,DNS:alice"

# Create signed certificates with CA
openssl x509 -req -days 10950 \
Expand Down
4 changes: 2 additions & 2 deletions scripts/rvasp-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ if [ "$1" == "--local" ]; then
ALICE_ENDPOINT=localhost:5434
BOB_ENDPOINT=localhost:6434
else
ALICE_ENDPOINT=admin.alice.vaspbot.net:443
BOB_ENDPOINT=admin.bob.vaspbot.net:443
ALICE_ENDPOINT=admin.alice.vaspbot.com:443
BOB_ENDPOINT=admin.bob.vaspbot.com:443
fi

# Send from Alice to Bob
Expand Down
4 changes: 2 additions & 2 deletions web/demo/bff/flaskr/service/socket_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,10 @@ def handle_transaction_message(self, vasp_context: VaspContext, msg):
msg.transfer.transaction.timestamp,
'23hlkjad824', # TODO: need transaction ID - Issue #1
msg.transfer.transaction.originator.wallet_address,
'api.bob.vaspbot.net',
'api.bob.vaspbot.com',
msg.transfer.transaction.originator.provider,
msg.transfer.transaction.beneficiary.wallet_address,
'api.alice.vaspbot.net',
'api.alice.vaspbot.com',
msg.transfer.transaction.beneficiary.provider,
MessageToJson(msg.transfer)
))
Expand Down
24 changes: 12 additions & 12 deletions web/demo/bff/flaskr/vasps_development.sql
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
INSERT INTO vasps(vasp_id, display_name, description, private_key, public_key, websocket_address, trisa_ds_id, trisa_ds_name, trisa_protocol_host)
VALUES('api.bob.vaspbot.net', 'Bob VASP', 'Run of the mill VASP. Registered in the Trisa Directory Service.', 'private', 'E9Lmo/wLSj8Q0FqFhxiTl7r+y2U4U78YjJ/c3sCo20+hwkHDzn1WjII9TLk/dpJUIwaAx5pB/nGeOWeNLzBTZZspXMWAJSORdZyWtOe6jKBsRAfIW/qKeqltg5O3GkiZzC74toZwuNU7W1IkWzIiT6l7qlWlRjPTo4gYmtRSB/W4ZYBiCbAW9YnOUw0Qt2VYKo3N02EeuZAYBoem57RUgOwgR4+sBx3K67JRiR1JVdm9JQ5FUY4QRCQoMbXV0gVCipET/lMLxFJVQ0eTxdmqiV0CwBLege1mDY0CCdBUadizQC3IjGAr8kvcbZa/DEX3nS5j1sMsA50ZOQivjom1SUCyPy6Nj/05RHbVDXDIh9sNSqTJ0qpK1aFpjuoQu0DTKESGs/LoL6yCq3N/LhMetawZjSCsRaMeppe45ZD7sSosOCmATIymgY02TexPZdVNTZRr87gPk8u+vplThzKu4HSbmkPfvBwQ2PZcJIaMq/DU3RmkveYoqdiWoi/90tTPMpGdfwj5N+6TJgDlp9oROImyAGy+EK4kzO3+aqvmDV9bvyewZCdsGjjqmG9jLLMOsmzqNzDMu/M/Hs5jqECB9ByARQ2S7tNVZpt6nl/wDiFzMAqnj54dNFbPlrkOan84Ie9/p7ZaJbu91r5DipCAo7LO0M2slCygsvBJdpdgS2E=', 'admin.bob.vaspbot.net:443', '9e069e01-8515-4d57-b9a5-e249f7ab4fca', 'Bobs VASP', 'http://api.bob.vaspbot.net:443');
VALUES('api.bob.vaspbot.com', 'Bob VASP', 'Run of the mill VASP. Registered in the Trisa Directory Service.', 'private', 'E9Lmo/wLSj8Q0FqFhxiTl7r+y2U4U78YjJ/c3sCo20+hwkHDzn1WjII9TLk/dpJUIwaAx5pB/nGeOWeNLzBTZZspXMWAJSORdZyWtOe6jKBsRAfIW/qKeqltg5O3GkiZzC74toZwuNU7W1IkWzIiT6l7qlWlRjPTo4gYmtRSB/W4ZYBiCbAW9YnOUw0Qt2VYKo3N02EeuZAYBoem57RUgOwgR4+sBx3K67JRiR1JVdm9JQ5FUY4QRCQoMbXV0gVCipET/lMLxFJVQ0eTxdmqiV0CwBLege1mDY0CCdBUadizQC3IjGAr8kvcbZa/DEX3nS5j1sMsA50ZOQivjom1SUCyPy6Nj/05RHbVDXDIh9sNSqTJ0qpK1aFpjuoQu0DTKESGs/LoL6yCq3N/LhMetawZjSCsRaMeppe45ZD7sSosOCmATIymgY02TexPZdVNTZRr87gPk8u+vplThzKu4HSbmkPfvBwQ2PZcJIaMq/DU3RmkveYoqdiWoi/90tTPMpGdfwj5N+6TJgDlp9oROImyAGy+EK4kzO3+aqvmDV9bvyewZCdsGjjqmG9jLLMOsmzqNzDMu/M/Hs5jqECB9ByARQ2S7tNVZpt6nl/wDiFzMAqnj54dNFbPlrkOan84Ie9/p7ZaJbu91r5DipCAo7LO0M2slCygsvBJdpdgS2E=', 'admin.bob.vaspbot.com:443', '9e069e01-8515-4d57-b9a5-e249f7ab4fca', 'Bobs VASP', 'http://api.bob.vaspbot.com:443');

INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('robert@bobvasp.co.uk', 'api.bob.vaspbot.net', '18nxAxBktHZDrMoJ3N2fk9imLX8xNnYbNh');
('robert@bobvasp.co.uk', 'api.bob.vaspbot.com', '18nxAxBktHZDrMoJ3N2fk9imLX8xNnYbNh');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('george@bobvasp.co.uk', 'api.bob.vaspbot.net', '1LgtLYkpaXhHDu1Ngh7x9fcBs5KuThbSzw');
('george@bobvasp.co.uk', 'api.bob.vaspbot.com', '1LgtLYkpaXhHDu1Ngh7x9fcBs5KuThbSzw');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('larry@bobvasp.co.uk', 'api.bob.vaspbot.net', '14WU745djqecaJ1gmtWQGeMCFim1W5MNp3');
('larry@bobvasp.co.uk', 'api.bob.vaspbot.com', '14WU745djqecaJ1gmtWQGeMCFim1W5MNp3');


INSERT INTO vasps(vasp_id, display_name, description, private_key, public_key, websocket_address, trisa_ds_id, trisa_ds_name, trisa_protocol_host)
VALUES('api.alice.vaspbot.net', 'AliceCoin', 'A small VASP. Registered in the Trisa Directory Service.', 'private', 'UA5tAqUTULJfNMmLTi0kT+j4s95+iLu3t+4ambDoKBlhNziYII1WtnEAh5rOlr6/VyjGcR604qN8SWeK4q3j3kvi0t1ONNUaiQRW+uwe4mjp03ywdLCfyEysepZLTPM6G6ykZD+dyL3Yf57VPsx2sWrC5hc/qqAb6D+yVH6LOKKn9p8JclfygxfXya7QHUJhd7oUroNI1GoPWomu8hKO0JM0VXAb7q7xjVd8npL9iT41LCueJD2+A07Yvm0dQI1Qc4UgS4/TQp/DTNlSqa7cr6EF8ZsRWRnJOdgVPOWJ9+s74OLfWNw5mIwBe3dtHKO605Dr6GQ02yrs5qkfNnHa/pYVIrG49Dmtlar9OF9J39OifIv4LHTaHNJunMqYloX5T1M3iSZIk/uGfs3k4Rt18wcttMYWp9gk/Xxqlg7N17KtE15csYW9gWhRBDxbS8juQ5Zu7+BjAWc6OdzMcNYDFbJ7XG9mpPt/9g+VxJq1xRlIKGlRnGJ+gTU/bcao8a/fHxsl1bwLOQpnO2SmciDbjLh3bmawERMk9Ac3V3GmS9wnCILmOb4s8tgP21Yd9e73aHXVgQOpJcZYSMJzN6BbhWiw7jYON7euW/lIisQr2QAdHzJSkT1sm2nEV8j9qzNhO9/gK/cWQYzoGRkR7At5nR8AMVKl962GeZ8zahPB09w=', 'admin.alice.vaspbot.net:443', '7a96ca2c-2818-4106-932e-1bcfd743b04c', 'AliceCoin', 'http://api.alice.vaspbot.net:443');
VALUES('api.alice.vaspbot.com', 'AliceCoin', 'A small VASP. Registered in the Trisa Directory Service.', 'private', 'UA5tAqUTULJfNMmLTi0kT+j4s95+iLu3t+4ambDoKBlhNziYII1WtnEAh5rOlr6/VyjGcR604qN8SWeK4q3j3kvi0t1ONNUaiQRW+uwe4mjp03ywdLCfyEysepZLTPM6G6ykZD+dyL3Yf57VPsx2sWrC5hc/qqAb6D+yVH6LOKKn9p8JclfygxfXya7QHUJhd7oUroNI1GoPWomu8hKO0JM0VXAb7q7xjVd8npL9iT41LCueJD2+A07Yvm0dQI1Qc4UgS4/TQp/DTNlSqa7cr6EF8ZsRWRnJOdgVPOWJ9+s74OLfWNw5mIwBe3dtHKO605Dr6GQ02yrs5qkfNnHa/pYVIrG49Dmtlar9OF9J39OifIv4LHTaHNJunMqYloX5T1M3iSZIk/uGfs3k4Rt18wcttMYWp9gk/Xxqlg7N17KtE15csYW9gWhRBDxbS8juQ5Zu7+BjAWc6OdzMcNYDFbJ7XG9mpPt/9g+VxJq1xRlIKGlRnGJ+gTU/bcao8a/fHxsl1bwLOQpnO2SmciDbjLh3bmawERMk9Ac3V3GmS9wnCILmOb4s8tgP21Yd9e73aHXVgQOpJcZYSMJzN6BbhWiw7jYON7euW/lIisQr2QAdHzJSkT1sm2nEV8j9qzNhO9/gK/cWQYzoGRkR7At5nR8AMVKl962GeZ8zahPB09w=', 'admin.alice.vaspbot.com:443', '7a96ca2c-2818-4106-932e-1bcfd743b04c', 'AliceCoin', 'http://api.alice.vaspbot.com:443');

INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('mary@alicevasp.us', 'api.alice.vaspbot.net', '1ASkqdo1hvydosVRvRv2j6eNnWpWLHucMX');
('mary@alicevasp.us', 'api.alice.vaspbot.com', '1ASkqdo1hvydosVRvRv2j6eNnWpWLHucMX');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('alice@alicevasp.us', 'api.alice.vaspbot.net', '1MRCxvEpBoY8qajrmNTSrcfXSZ2wsrGeha');
('alice@alicevasp.us', 'api.alice.vaspbot.com', '1MRCxvEpBoY8qajrmNTSrcfXSZ2wsrGeha');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('jane@alicevasp.us', 'api.alice.vaspbot.net', '14HmBSwec8XrcWge9Zi1ZngNia64u3Wd2v');
('jane@alicevasp.us', 'api.alice.vaspbot.com', '14HmBSwec8XrcWge9Zi1ZngNia64u3Wd2v');



INSERT INTO vasps(vasp_id, display_name, description, private_key, public_key, websocket_address, trisa_ds_id, trisa_ds_name, trisa_protocol_host)
VALUES('api.evil.vaspbot.net', 'Evil VASP', 'An evil VASP out to do no good. NOT registered in Trisa Directory Service', 'private', 'N/A', 'admin.evil.vaspbot.net:443', null, 'Evil VASP', 'http://api.evil.vaspbot.net:443');
VALUES('api.evil.vaspbot.com', 'Evil VASP', 'An evil VASP out to do no good. NOT registered in Trisa Directory Service', 'private', 'N/A', 'admin.evil.vaspbot.com:443', null, 'Evil VASP', 'http://api.evil.vaspbot.com:443');

INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('voldemort@evilvasp.gg', 'api.evil.vaspbot.net', '1PFTsUQrRqvmFkJunfuQbSC2k9p4RfxYLF');
('voldemort@evilvasp.gg', 'api.evil.vaspbot.com', '1PFTsUQrRqvmFkJunfuQbSC2k9p4RfxYLF');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('launderer@evilvasp.gg', 'api.evil.vaspbot.net', '172n89jLjXKmFJni1vwV5EzxKRXuAAoxUz');
('launderer@evilvasp.gg', 'api.evil.vaspbot.com', '172n89jLjXKmFJni1vwV5EzxKRXuAAoxUz');
INSERT INTO wallets(wallet_address, vasp_id, wallet_id) VALUES
('badnews@evilvasp.gg', 'api.evil.vaspbot.net', '182kF4mb5SW4KGEvBSbyXTpDWy8rK1Dpu');
('badnews@evilvasp.gg', 'api.evil.vaspbot.com', '182kF4mb5SW4KGEvBSbyXTpDWy8rK1Dpu');
6 changes: 3 additions & 3 deletions web/demo/npm/src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {VaspStreamingService} from "./services/VaspStreamingService";

class App extends Component {

vaspService = new VaspRestService('https://demo.vaspbot.net')
vaspService = new VaspRestService('https://demo.vaspbot.com')
sessionId = uuidv4();

state = {
Expand Down Expand Up @@ -70,7 +70,7 @@ class App extends Component {
selectedOriginatingVasp: selectedVasp,
selectedBeneficiaryVasp: null,
targetVasps: targetVasps,
originatingVaspStreamingService: new VaspStreamingService({'vasp_id': selectedVasp.vasp_id, 'context_id': this.sessionId, originator: true}, 'https://demo.vaspbot.net'),
originatingVaspStreamingService: new VaspStreamingService({'vasp_id': selectedVasp.vasp_id, 'context_id': this.sessionId, originator: true}, 'https://demo.vaspbot.com'),
beneficiaryVaspStreamingService: null
})
}
Expand Down Expand Up @@ -111,7 +111,7 @@ class App extends Component {
}
this.setState({
selectedBeneficiaryVasp: selectedVasp,
beneficiaryVaspStreamingService: new VaspStreamingService({'vasp_id': selectedVasp.vasp_id, 'context_id': this.sessionId, originator: false}, 'https://demo.vaspbot.net')
beneficiaryVaspStreamingService: new VaspStreamingService({'vasp_id': selectedVasp.vasp_id, 'context_id': this.sessionId, originator: false}, 'https://demo.vaspbot.com')
})
}

Expand Down