Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: Multiple Ledger and Endorser Selection + additional UI Controls #790

Merged
merged 14 commits into from
Sep 18, 2023
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
4 changes: 4 additions & 0 deletions charts/traction/templates/acapy/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,7 @@ data:
{{- if index .Values "acapy" "plugin-config.yml" }}
{{- include "common.tplvalues.render" ( dict "value" (index .Values "acapy" "plugin-config.yml") "context" $) | nindent 4 }}
{{- end }}
multi-ledger-config.yml: |
{{- if index .Values "acapy" "multi-ledger-config.yml" }}
{{- include "common.tplvalues.render" ( dict "value" (index .Values "acapy" "multi-ledger-config.yml") "context" $) | nindent 4 }}
{{- end }}
5 changes: 5 additions & 0 deletions charts/traction/templates/acapy/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
--admin '0.0.0.0' {{ .Values.acapy.service.adminPort }} \
--endpoint https://{{ include "acapy.host" . }} \
--arg-file '/home/aries/argfile.yml' \
--genesis-transactions-list '/home/aries/multi-ledger-config.yml' \
--plugin 'aries_cloudagent.messaging.jsonld' \
{{- if .Values.acapy.plugins.tractionInnkeeper }}
--plugin traction_plugins.traction_innkeeper.v1_0 \
Expand Down Expand Up @@ -142,6 +143,10 @@ spec:
mountPath: "/home/aries/plugin-config.yml"
subPath: "plugin-config.yml"
readOnly: true
- name: config
mountPath: "/home/aries/multi-ledger-config.yml"
subPath: "multi-ledger-config.yml"
readOnly: true
resources:
{{- toYaml .Values.acapy.resources | nindent 12 }}
volumes:
Expand Down
44 changes: 34 additions & 10 deletions charts/traction/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,29 @@ acapy:
## @param acapy.labelOverride
labelOverride: ""

## @section Acapy multiledger configuration file
##
## @param acapy.multi-ledger-config.yml.id
## @param acapy.multi-ledger-config.yml.is_production
## @param acapy.multi-ledger-config.yml.is_write
## @param acapy.multi-ledger-config.yml.genesis_url
## @param acapy.multi-ledger-config.yml.endorser_did
## @param acapy.multi-ledger-config.yml.endorser_alias
##
multi-ledger-config.yml:
- id: bcovrin-test
is_production: true
is_write: true
genesis_url: 'http://test.bcovrin.vonx.io/genesis'
endorser_did: 'Ket75eV5UQvVkW2XBjgDH7'
endorser_alias: 'endorser-1'
- id: bcovrin-dev
is_production: true
is_write: true
genesis_url: 'http://dev.bcovrin.vonx.io/genesis'
endorser_did: 'VGA8QzjQaL5xkXRHjAgQcj'
endorser_alias: 'endorser-2'

## @section Acapy configuration file
##
## @param acapy.argfile.yml.auto-accept-invites Automatically accept invites without firing a webhook event or waiting for an admin request. Default: false.
Expand Down Expand Up @@ -115,10 +138,10 @@ acapy:
auto-write-transactions: true
emit-new-didcomm-mime-type: true
emit-new-didcomm-prefix: true
endorser-alias: endorser
endorser-protocol-role: author
endorser-public-did: 'Ket75eV5UQvVkW2XBjgDH7'
genesis-url: http://test.bcovrin.vonx.io/genesis
# endorser-alias: endorser
# endorser-public-did: 'Ket75eV5UQvVkW2XBjgDH7'
# genesis-url: http://test.bcovrin.vonx.io/genesis
label: '{{ include "acapy.label" .}}'
log-level: info
monitor-ping: true
Expand Down Expand Up @@ -219,13 +242,14 @@ acapy:
wallet_name: traction_innkeeper
print_key: false
print_token: false
connect_to_endorser: []
## Example:
# - endorser_alias: endorser
# ledger_id: bcovrin-test
create_public_did: []
## Example:
# - bcovrin-test
connect_to_endorser:
- endorser_alias: endorser-1
ledger_id: bcovrin-test
- endorser_alias: endorser-2
ledger_id: bcovrin-dev
create_public_did:
- bcovrin-test
- bcovrin-dev
reservation:
expiry_minutes: 2880
auto_approve: false
Expand Down
5 changes: 4 additions & 1 deletion deploy/traction/values-development.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ acapy:
print_key: true
print_token: true
connect_to_endorser:
- endorser_alias: endorser
- endorser_alias: endorser-1
ledger_id: bcovrin-test
- endorser_alias: endorser-2
ledger_id: bcovrin-dev
create_public_did:
- bcovrin-test
- bcovrin-dev
reservation:
expiry_minutes: 7200
resources:
Expand Down
5 changes: 4 additions & 1 deletion deploy/traction/values-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,13 @@ acapy:
print_key: true
print_token: true
connect_to_endorser:
- endorser_alias: endorser
- endorser_alias: endorser-1
ledger_id: bcovrin-test
- endorser_alias: endorser-2
ledger_id: bcovrin-dev
create_public_did:
- bcovrin-test
- bcovrin-dev
reservation:
expiry_minutes: 2880
auto_approve: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@ class Meta:

connection_id = fields.Str(required=False)
message_id = fields.Str(required=False)
sent_time = fields.Str(required=False,
sent_time = fields.Str(
required=False,
validate=INDY_ISO8601_DATETIME_VALIDATE,
example=INDY_ISO8601_DATETIME_EXAMPLE
example=INDY_ISO8601_DATETIME_EXAMPLE,
)
locale = fields.Str(required=False)
content = fields.Str(required=False)
Loading
Loading