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 LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020 TRISA (https://trisa.io)
Copyright (c) 2020 TRISA (https://travelrule.io)

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TRISA TestNet

**An integration and test platform for the [TRISA Travel Rule Implementation](https://trisa.io).**
**An integration and test platform for the [TRISA Travel Rule Implementation](https://travelrule.io).**

The TRISA test net is comprised of the following:

Expand Down Expand Up @@ -32,4 +32,4 @@ To regenerate the Go and Python code from the protocol buffers:
$ go generate ./...
```

The go generate directives are stored in `pkg/rvasp/pb/v1/pb.go`. The directives create grpc Go in the `pb` package and grpc Python in the `rvaspy` module.
The go generate directives are stored in `pkg/rvasp/pb/v1/pb.go`. The directives create grpc Go in the `pb` package and grpc Python in the `rvaspy` module.
4 changes: 2 additions & 2 deletions containers/db/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ COPY . .
RUN go test ./... && go build -v ./cmd/rvasp

FROM ubuntu:focal
LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="Job to reset the Robot VASP working database"
RUN apt-get update && apt-get install -y postgresql-client
COPY --from=builder /rvasp/build/rvasp /bin/
COPY --from=builder /rvasp/build/scripts/reset-db.sh /bin/
COPY --from=builder /rvasp/build/pkg/rvasp/fixtures /fixtures

RUN chmod +x /bin/reset-db.sh
CMD ["/bin/reset-db.sh"]
CMD ["/bin/reset-db.sh"]
3 changes: 1 addition & 2 deletions containers/demo/bff/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM python:3.8

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="Backend for Frontend (BFF) for rVASP Demo"

# Install rvaspy library
Expand Down Expand Up @@ -28,4 +28,3 @@ ENV FLASK_ENV development
RUN [ "flask", "init-db" ]

ENTRYPOINT ["flask", "run", "--host", "0.0.0.0", "--port", "8000"]

2 changes: 1 addition & 1 deletion containers/demo/npm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN npm run build

FROM nginx:stable

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="rVASP Demo React Frontend Application"

COPY --from=builder /usr/src/app/build/ /var/www/
Expand Down
4 changes: 2 additions & 2 deletions containers/docs-redirect/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM nginx:stable

LABEL maintainer="TRISA <admin@trisa.io>"
LABEL maintainer="TRISA <admin@travelrule.io>"
LABEL description="Redirect testnet.directory to trisa.dev"

COPY containers/docs-redirect/nginx.conf /etc/nginx/conf.d/default.conf

ENV NGINX_ENTRYPOINT_QUIET_LOGS=1
CMD [ "nginx", "-g", "daemon off;" ]
CMD [ "nginx", "-g", "daemon off;" ]
4 changes: 2 additions & 2 deletions containers/rvasp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RUN go build -v -o /go/bin/rvasp -ldflags="-X 'github.com/trisacrypto/testnet/pk
# Final Stage
FROM ${FINAL_IMAGE} AS final

LABEL maintainer="TRISA <info@trisa.io>"
LABEL maintainer="TRISA <info@travelrule.io>"
LABEL description="Robot VASP for TRISA demonstration and integration"

# Ensure ca-certificates are up to date
Expand All @@ -46,4 +46,4 @@ RUN set -x && apt-get update && \
# Copy the binary to the production image from the builder stage.
COPY --from=builder /go/bin/rvasp /usr/local/bin/rvasp

CMD [ "/usr/local/bin/rvasp", "serve" ]
CMD [ "/usr/local/bin/rvasp", "serve" ]
4 changes: 2 additions & 2 deletions lib/python/rvaspy/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# setup
# Setup script for installing the rvaspy client library.
#
# Author: Benjamin Bengfort <benjamin@trisa.io>
# Author: Benjamin Bengfort <benjamin@travelrule.io>
# Created: Wed Oct 28 08:23:49 2020 -0400
#
# For license information, see LICENSE.txt
Expand Down Expand Up @@ -33,7 +33,7 @@
NAME = "rvaspy"
DESCRIPTION = "Python bindings for the rVASP API"
AUTHOR = "TRISA"
EMAIL = "benjamin@trisa.io"
EMAIL = "benjamin@travelrule.io"
MAINTAINER = "Benjamin Bengfort"
LICENSE = "MIT"
REPOSITORY = "https://github.com/bbengfort/rvasp/"
Expand Down
2 changes: 1 addition & 1 deletion manifests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
Create a basic-auth secret to login

```
$ htpasswd -nb admin@trisa.io [supersecretpassword] | openssl base64
$ htpasswd -nb admin@travelrule.io [supersecretpassword] | openssl base64
```

Write the results into `creds/traefik-dashboard-auth.yaml`
Expand Down
6 changes: 3 additions & 3 deletions manifests/cert-manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
namespace: cert-manager
spec:
acme:
email: benjamin@trisa.io
email: benjamin@travelrule.io
server: https://acme-staging-v02.api.letsencrypt.org/directory
privateKeySecretRef:
name: letsencrypt-staging
Expand All @@ -24,7 +24,7 @@ metadata:
namespace: cert-manager
spec:
acme:
email: admin@trisa.io
email: admin@travelrule.io
server: https://acme-v02.api.letsencrypt.org/directory
privateKeySecretRef:
name: letsencrypt-prod
Expand Down Expand Up @@ -64,4 +64,4 @@ spec:
- "*.vaspbot.com"
- "*.alice.vaspbot.com"
- "*.bob.vaspbot.com"
- "*.evil.vaspbot.com"
- "*.evil.vaspbot.com"
2 changes: 1 addition & 1 deletion manifests/trisads.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
- name: GDS_SERVICE_EMAIL
value: "TRISA Directory Service <admin@trisa.directory>"
- name: GDS_ADMIN_EMAIL
value: "TRISA Admins <admin@trisa.io>"
value: "TRISA Admins <admin@travelrule.io>"
- name: SECTIGO_USERNAME
valueFrom:
secretKeyRef:
Expand Down
14 changes: 8 additions & 6 deletions scripts/fixtures/template.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@
}
],
"name": {
"name_identifiers": [{
"legal_person_name": "",
"legal_person_name_identifier_type": 0
}]
"name_identifiers": [
{
"legal_person_name": "",
"legal_person_name_identifier_type": 0
}
]
},
"national_identification": {
"country_of_issue": "CA",
Expand All @@ -91,7 +93,7 @@
],
"review_notes": {
"5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927": {
"author": "admin@trisa.io",
"author": "admin@travelrule.io",
"created": "2021-07-12T20:12:02Z",
"editor": "yvonne26@example.org",
"id": "5daa4ff0-9011-4b61-a8b3-9b0ff1ec4927",
Expand Down Expand Up @@ -139,4 +141,4 @@
"version": "4"
},
"website": "https://trisa.alice.example.com"
}
}
6 changes: 3 additions & 3 deletions web/placeholder/vaspbot/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@
<div class="display-table-cell">
<h1 class="title"><b>rVASP Demo Returning Soon</b></h1>
<p class="desc font-white">
The TRISA demo site is under re-development following the changes to the protocol in the <a href="https://trisa.io/trisa-whitepaper/">v9 whitepaper</a>.
The TRISA demo site is under re-development following the changes to the protocol in the <a href="https://travelrule.io/trisa-whitepaper/">v9 whitepaper</a>.
</p>
<p class="desc font-white">
The Alice & Bob rVASP servers are still up and running, for more information on how to interact with them using the CLI, please see the <a href="https://trisa.dev/testnet/rvasps/">TRISA documentation</a>.
</p>

<ul class="social-btn">
<li><a href="https://trisa.io"><i class="fas fa-home"></i></a></li>
<li><a href="https://travelrule.io"><i class="fas fa-home"></i></a></li>
<li><a href="https://trisa.dev"><i class="fas fa-book"></i></a></li>
<li><a href="https://join.slack.com/t/trisa-workspace/shared_invite/zt-19b0wy7kj-l~netkzeq3y6ZVdne7fMmQ"><i class="fab fa-slack"></i></a></li>
<li><a href="https://github.com/trisacrypto"><i class="fab fa-github"></i></a></li>
Expand All @@ -110,4 +110,4 @@ <h1 class="title"><b>rVASP Demo Returning Soon</b></h1>

<script src="https://cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js" integrity="sha512-3n19xznO0ubPpSwYCRRBgHh63DrV+bdZfHK52b1esvId4GsfwStQNPJFjeQos2h3JwCmZl0/LgLxSKMAI55hgw==" crossorigin="anonymous"></script>
</body>
</html>
</html>
Loading