Skip to content

Commit 49b17e5

Browse files
swcurranswcurran
authored
Merge branch 'main' into 0.12.0-rc0
2 parents 936f0c8 + 5a8748e commit 49b17e5

File tree

10 files changed

+306
-84
lines changed

10 files changed

+306
-84
lines changed

‎.devcontainer/devcontainer.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,6 @@
6161
},
6262

6363
"mounts": [],
64-
// Use 'forwardPorts' to make a list of ports inside the container available locally.
65-
"forwardPorts": [
66-
9060,
67-
9061
68-
],
6964
"postCreateCommand": "bash ./.devcontainer/post-install.sh"
7065

7166
}

‎.vscode-sample/multitenant.yml renamed to ‎.vscode-sample/alice.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
1+
# Alice agent configuration
2+
13
auto-provision: true
2-
label: vscode
4+
label: alice
35

46
inbound-transport:
5-
- [http, 0.0.0.0, 9060]
7+
- [http, 0.0.0.0, 9010]
68

79
outbound-transport: http
810

9-
emit-new-didcomm-prefix: true
1011
wallet-type: askar
1112
wallet-storage-type: default
13+
wallet-name: alice-wallet
14+
wallet-key: alice-wallet-key
1215

1316
admin-insecure-mode: true
1417

15-
admin: [0.0.0.0, 9061]
18+
admin: [0.0.0.0, 9011]
1619

17-
endpoint: http://host.docker.internal:9060
20+
endpoint: http://localhost:9010
1821

19-
genesis-url: http://test.bcovrin.vonx.io/genesis
22+
genesis-url: http://localhost:9000/genesis
2023

2124
# Connections
2225
debug-connections: true
2326
auto-accept-invites: true
2427
auto-accept-requests: true
2528
auto-ping-connection: true
2629

27-
# multitenant
28-
multitenant: true
29-
multitenant-admin: true
30-
jwt-secret: changeme
31-
3230
log-level: info
31+
32+
tails-server-base-url: http://localhost:6543

‎.vscode-sample/author.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Author agent configuration
2+
3+
auto-provision: true
4+
label: author
5+
6+
inbound-transport:
7+
- [http, 0.0.0.0, 9020]
8+
9+
outbound-transport: http
10+
11+
wallet-type: askar
12+
wallet-storage-type: default
13+
wallet-name: author-wallet
14+
wallet-key: author-wallet-key
15+
16+
admin-insecure-mode: true
17+
18+
admin: [0.0.0.0, 9021]
19+
20+
endpoint: http://localhost:9020
21+
22+
genesis-url: http://localhost:9000/genesis
23+
24+
# Connections
25+
debug-connections: true
26+
auto-accept-invites: true
27+
auto-accept-requests: true
28+
auto-ping-connection: true
29+
30+
log-level: info
31+
32+
tails-server-base-url: https://localhost:6543
33+
34+
# endorser info configuration
35+
endorser-alias: endorser
36+
endorser-protocol-role: author
37+
auto-request-endorsement: true
38+
auto-write-transactions: true
39+
# endorser-public-did: FsTs4Xb4PHwb6BxyFPFfYd
40+
auto-promote-author-did: true
41+
auto-create-revocation-transactions: true
42+
# endorser-invitation: http://localhost:9060?oob=eyJAdHlwZSI6ICJodHRwczovL2RpZGNvbW0ub3JnL291dC1vZi1iYW5kLzEuMS9pbnZpdGF0aW9uIiwgIkBpZCI6ICIwOWU3MDRmOC04YzUxLTQzNTktOTg2YS0xZmI5YTIzYmQxODciLCAibGFiZWwiOiAiZW5kb3JzZXIiLCAiaGFuZHNoYWtlX3Byb3RvY29scyI6IFsiaHR0cHM6Ly9kaWRjb21tLm9yZy9kaWRleGNoYW5nZS8xLjAiXSwgInNlcnZpY2VzIjogW3siaWQiOiAiI2lubGluZSIsICJ0eXBlIjogImRpZC1jb21tdW5pY2F0aW9uIiwgInJlY2lwaWVudEtleXMiOiBbImRpZDprZXk6ejZNa3ZNUFlNYUdGTVFTRFhQc2o4OUNobTY0aVIyYmE0U1hZY3ZON2JCeUNkNWJoI3o2TWt2TVBZTWFHRk1RU0RYUHNqODlDaG02NGlSMmJhNFNYWWN2TjdiQnlDZDViaCJdLCAic2VydmljZUVuZHBvaW50IjogImh0dHA6Ly9sb2NhbGhvc3Q6OTA2MCJ9XX0=

‎.vscode-sample/endorser.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# Endorser agent configuration
2+
3+
auto-provision: true
4+
label: endorser
5+
6+
inbound-transport:
7+
- [http, 0.0.0.0, 9030]
8+
9+
outbound-transport: http
10+
11+
wallet-type: askar
12+
wallet-storage-type: default
13+
wallet-name: endorser-wallet
14+
wallet-key: endorser-wallet-key
15+
16+
admin-insecure-mode: true
17+
18+
admin: [0.0.0.0, 9031]
19+
20+
endpoint: http://localhost:9030
21+
22+
genesis-url: http://localhost:9000/genesis
23+
24+
# Connections
25+
debug-connections: true
26+
auto-accept-invites: true
27+
auto-accept-requests: true
28+
auto-ping-connection: true
29+
30+
log-level: info
31+
32+
tails-server-base-url: http://localhost:6543
33+
34+
# endorser
35+
endorser-protocol-role: endorser
36+
auto-endorse-transactions: true

‎.vscode-sample/faber.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Faber agent configuration
2+
3+
auto-provision: true
4+
label: faber
5+
6+
inbound-transport:
7+
- [http, 0.0.0.0, 9040]
8+
9+
outbound-transport: http
10+
11+
wallet-type: askar
12+
wallet-storage-type: default
13+
wallet-name: faber-wallet
14+
wallet-key: faber-wallet-key
15+
16+
admin-insecure-mode: true
17+
18+
admin: [0.0.0.0, 9041]
19+
20+
endpoint: http://localhost:9040
21+
22+
genesis-url: http://localhost:9000/genesis
23+
24+
# Connections
25+
debug-connections: true
26+
auto-accept-invites: true
27+
auto-accept-requests: true
28+
auto-ping-connection: true
29+
30+
log-level: info
31+
32+
tails-server-base-url: http://localhost:6543

‎.vscode-sample/launch.json

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,58 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"name": "Run/Debug ACA-Py",
8+
"name": "Run/Debug Faber",
99
"type": "python",
1010
"request": "launch",
1111
"module": "aries_cloudagent",
1212
"justMyCode": true,
1313
"args": [
1414
"start",
15-
"--arg-file=${workspaceRoot}/.vscode/multitenant.yml"
15+
"--arg-file=${workspaceRoot}/.vscode/faber.yml"
16+
]
17+
},
18+
{
19+
"name": "Run/Debug Alice",
20+
"type": "python",
21+
"request": "launch",
22+
"module": "aries_cloudagent",
23+
"justMyCode": true,
24+
"args": [
25+
"start",
26+
"--arg-file=${workspaceRoot}/.vscode/alice.yml"
27+
]
28+
},
29+
{
30+
"name": "Run/Debug Endorser",
31+
"type": "python",
32+
"request": "launch",
33+
"module": "aries_cloudagent",
34+
"justMyCode": true,
35+
"args": [
36+
"start",
37+
"--arg-file=${workspaceRoot}/.vscode/endorser.yml"
38+
]
39+
},
40+
{
41+
"name": "Run/Debug Author",
42+
"type": "python",
43+
"request": "launch",
44+
"module": "aries_cloudagent",
45+
"justMyCode": true,
46+
"args": [
47+
"start",
48+
"--arg-file=${workspaceRoot}/.vscode/author.yml"
49+
]
50+
},
51+
{
52+
"name": "Run/Debug Multitenant Admin",
53+
"type": "python",
54+
"request": "launch",
55+
"module": "aries_cloudagent",
56+
"justMyCode": true,
57+
"args": [
58+
"start",
59+
"--arg-file=${workspaceRoot}/.vscode/multitenant-admin.yml"
1660
]
1761
},
1862
{
@@ -24,7 +68,7 @@
2468
"sudo": true,
2569
"justMyCode": true,
2670
"cwd": "${workspaceFolder}/aries_cloudagent",
27-
"args": ["check", "."],
71+
"args": ["check", "."]
2872
},
2973
{
3074
"name": "ruff fix - aries_cloudagent",
@@ -35,7 +79,7 @@
3579
"sudo": true,
3680
"justMyCode": true,
3781
"cwd": "${workspaceFolder}/aries_cloudagent",
38-
"args": ["check", ".", "--fix"],
82+
"args": ["check", ".", "--fix"]
3983
},
4084
{
4185
"name": "ruff - current file",
@@ -46,7 +90,7 @@
4690
"sudo": true,
4791
"justMyCode": true,
4892
"cwd": "${workspaceFolder}/aries_cloudagent",
49-
"args": ["check", ".", "${file}"],
93+
"args": ["check", ".", "${file}"]
5094
},
5195
{
5296
"name": "black (check) - aries_cloudagent",
@@ -59,7 +103,7 @@
59103
"args": [
60104
".",
61105
"--check"
62-
],
106+
]
63107
},
64108
{
65109
"name": "black (check) - current file",
@@ -71,7 +115,7 @@
71115
"args": [
72116
"${file}",
73117
"--check"
74-
],
118+
]
75119
},
76120
{
77121
"name": "black (format) - aries_cloudagent",
@@ -83,7 +127,7 @@
83127
"cwd": "${workspaceFolder}/aries_cloudagent",
84128
"args": [
85129
"."
86-
],
130+
]
87131
},
88132
{
89133
"name": "black (format) - current file",
@@ -93,8 +137,8 @@
93137
"console": "integratedTerminal",
94138
"justMyCode": true,
95139
"args": [
96-
"${file}",
97-
],
98-
},
140+
"${file}"
141+
]
142+
}
99143
]
100144
}

‎.vscode-sample/multitenant-admin.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Multitenant admin agent configuration
2+
3+
auto-provision: true
4+
label: multitenant-admin
5+
6+
inbound-transport:
7+
- [http, 0.0.0.0, 9050]
8+
9+
outbound-transport: http
10+
11+
wallet-type: askar-anoncreds
12+
wallet-storage-type: default
13+
wallet-name: multitenant-admin-wallet
14+
wallet-key: multitenant-admin-wallet-key
15+
16+
admin-insecure-mode: true
17+
18+
admin: [0.0.0.0, 9051]
19+
20+
endpoint: http://localhost:9050
21+
22+
genesis-url: https://localhost:9000/genesis
23+
24+
# Connections
25+
debug-connections: true
26+
auto-accept-invites: true
27+
auto-accept-requests: true
28+
auto-ping-connection: true
29+
30+
# Multi-tenancy
31+
multitenant: true
32+
jwt-secret: insecure-jwt-secret
33+
multitenant-admin: true
34+
35+
log-level: info
36+
37+
tails-server-base-url: https://localhost:6543

‎.vscode-sample/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"python.testing.pytestArgs": ["--no-cov"],
2+
"python.testing.pytestArgs": ["--no-cov"]
33
}

‎DevReadMe.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,15 @@ ACA-Py can issue W3C Verifiable Credentials using Linked Data Proofs. See the [d
140140

141141
[Docker](https://www.docker.com) must be installed to run software locally and to run the test suite.
142142

143+
### Running In A Dev Container
144+
145+
The dev container environment is a great way to deploy agents quickly with code changes and an interactive debug session. Detailed information can be found in the [Docs On Devcontainers](devcontainer.md). It is specific for vscode, so if you prefer another code editor or IDE you will need to figure it out on your own, but it is highly recommended to give this a try.
146+
147+
One thing to be aware of is, unlike the demo, none of the steps are automated. You will need to create public dids, connections and all the other steps yourself. Using the demo and studying the flow and then copying them with your dev container debug session is a great way to learn how everything works.
148+
143149
### Running Locally
144150

145-
For local development, we recommend using the provided Docker scripts to run the ACA-Py software.
151+
Another way to develop locally is by using the provided Docker scripts to run the ACA-Py software.
146152

147153
```bash
148154
./scripts/run_docker start <args>

0 commit comments

Comments
 (0)