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

MIRROR: Cred Issuance V2 #2

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2ad71ed
initial holder draft
gmulhearn-anonyome Sep 19, 2023
c4e5b2b
moved around
gmulhearn-anonyome Sep 19, 2023
5465287
renaming
gmulhearn-anonyome Sep 19, 2023
0d2f894
holder alt flows
gmulhearn-anonyome Sep 20, 2023
28cb51e
demos and such
gmulhearn-anonyome Sep 20, 2023
2b2283b
fmt
gmulhearn-anonyome Sep 20, 2023
3bb64c3
ok issuer impl, and moved mod
gmulhearn-anonyome Sep 20, 2023
6c15151
demoing and some cleaning
gmulhearn-anonyome Sep 20, 2023
bce7856
mock the ld demo
gmulhearn-anonyome Sep 20, 2023
9a3205c
cleaning
gmulhearn-anonyome Sep 20, 2023
ce0f5c0
replacement id
gmulhearn-anonyome Sep 20, 2023
6471cfc
comments
gmulhearn-anonyome Sep 20, 2023
0e9bb4f
embed the format in all states
gmulhearn-anonyome Sep 21, 2023
bac0381
Merge branch 'main' into gm/cred-issuance-v2-drafting
gmulhearn-anonyome Sep 25, 2023
339ee46
pull main and fmt
gmulhearn-anonyome Sep 25, 2023
dcc3f26
Merge branch 'gm/issue-cred-v2-messages' into gm/cred-issuance-v2-dra…
gmulhearn-anonyome Sep 25, 2023
428ba60
update imports
gmulhearn-anonyome Sep 25, 2023
1fa110c
message construction
gmulhearn-anonyome Sep 25, 2023
19a1c66
thids
gmulhearn-anonyome Sep 25, 2023
72f9d2e
rm many creds
gmulhearn-anonyome Sep 25, 2023
287abd9
attachment extraction
gmulhearn-anonyome Sep 25, 2023
539ca91
Merge branch 'gm/issue-cred-v2-messages' into gm/cred-issuance-v2-dra…
gmulhearn-anonyome Sep 25, 2023
d64749d
unit test setup
gmulhearn-anonyome Sep 26, 2023
685beec
first sys test
gmulhearn-anonyome Sep 26, 2023
bb7ab5d
offer and proposal details APIs
gmulhearn-anonyome Sep 26, 2023
52a386e
thid checking
gmulhearn-anonyome Sep 26, 2023
35b86ba
state modules
gmulhearn-anonyome Sep 26, 2023
6d38661
into failed state
gmulhearn-anonyome Sep 26, 2023
672d17f
construction and deconstruction
gmulhearn-anonyome Sep 26, 2023
a40547b
in progress documenting
gmulhearn-anonyome Sep 26, 2023
dbce3a7
docco
gmulhearn-anonyome Sep 26, 2023
72ed0a9
Add fixed nightly toolchain version for the formatting job (#997)
bobozaur Sep 26, 2023
cb3eede
Sync up nodejs state definitions (#999)
Patrik-Stas Sep 26, 2023
62ea7b1
trait(BaseWallet): change return type of unpack_message, (#992)
nain-F49FF806 Sep 26, 2023
23cef4f
temp test against acapy
gmulhearn-anonyome Sep 27, 2023
ac35fdd
Expose wallet migration to node wrapper (#978)
bobozaur Sep 27, 2023
e04ba1a
Move CI dir (#1001)
bobozaur Sep 28, 2023
d8e7602
Use standard UnpackMessage struct until needing to transform. (#1002)
nain-F49FF806 Sep 28, 2023
ed39a52
Issue Credential V2.0 message structures (#990)
gmulhearn-anonyome Sep 28, 2023
6d3b5bb
Merge branch 'gm/issue-cred-v2-messages' into gm/cred-issuance-v2-dra…
gmulhearn-anonyome Sep 28, 2023
5d050cf
Merge branch 'main' into gm/cred-issuance-v2-drafting
gmulhearn-anonyome Sep 28, 2023
636c295
Connection protocol: add encrypt_message, remove auto-problem-report …
Patrik-Stas Sep 28, 2023
78bdd33
Release 0.59.0 (#996)
Patrik-Stas Sep 29, 2023
7272cfb
Use generics over trait objects (#1003)
bobozaur Oct 2, 2023
725797b
Add logs to credx wallet migration (#1004)
Patrik-Stas Oct 2, 2023
34c35de
Modify wallet migration (#1006)
Patrik-Stas Oct 3, 2023
77c8d8f
Use a sequence of bytes (representing AriesMessage) as input for Encr…
nain-F49FF806 Oct 4, 2023
1d24bd9
Release 0.59.1 (#1010)
Patrik-Stas Oct 4, 2023
55f0df0
Delete dead code, simplify testing (#995)
Patrik-Stas Oct 4, 2023
ff6a060
Use credx anoncreds in napi wrapper (#927)
Patrik-Stas Oct 4, 2023
59938d7
Refactor/remove mocks (#1005)
bobozaur Oct 4, 2023
56d7e9a
Merge branch 'main' into gm/cred-issuance-v2-drafting
gmulhearn-anonyome Oct 5, 2023
603a26c
Replace trait objects in libvcx_core with generics/concrete types (#1…
bobozaur Oct 5, 2023
d63effe
Remove vdrtools anoncreds, update dependencies (#1013)
bobozaur Oct 12, 2023
b2e87eb
Release 0.60.0 (#1015)
Patrik-Stas Oct 12, 2023
b48fcd6
Merge branch 'main' into gm/cred-issuance-v2-drafting
gmulhearn-anonyome Oct 17, 2023
17acf7f
lock update
gmulhearn-anonyome Oct 17, 2023
8efba17
fix base64 usage
gmulhearn-anonyome Oct 17, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .github/actions/build-napi/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ inputs:
node-version:
default: 18
rust-version:
default: 1.65.0
default: 1.70.0

runs:
using: "composite"
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/derive-cache-info/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ runs:
- id: main
shell: bash
run: |
source ./ci/util.sh
source ./.github/ci/util.sh
DOCKER_IMG=${{ inputs.docker-img }}
CACHE_KEY=`as_docker_cache_key $DOCKER_IMG`
CACHE_DIR="/tmp/cachedir-$CACHE_KEY"
Expand Down
30 changes: 0 additions & 30 deletions .github/actions/publish-android/action.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/actions/setup-codecov-rust/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ runs:
docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }}
sleep 5
docker-compose -f ./ci/agency/docker-compose.yml up -d
docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
2 changes: 1 addition & 1 deletion .github/actions/setup-testing-nodejs/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ runs:
docker run --rm -d --name mysql --network host -e MYSQL_ROOT_PASSWORD=mysecretpassword mysql:5.7.35
docker run --rm -d --name indypool --network host ${{ env.DOCKER_IMAGE_POOL }}
sleep 5
docker-compose -f ./ci/agency/docker-compose.yml up -d
docker-compose -f ./.github/ci/agency/docker-compose.yml up -d
- name: "Build binding module"
shell: bash
run: (cd wrappers/vcx-napi-rs && npm install && npm run build:napi:debug)
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions ci/vdrproxy.dockerfile → .github/ci/vdrproxy.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apk update && apk upgrade && \
USER indy
WORKDIR /home/indy

ARG RUST_VER="1.65.0"
ARG RUST_VER="1.70.0"
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER --default-host x86_64-unknown-linux-musl

ENV PATH="/home/indy/.cargo/bin:$PATH"
Expand All @@ -32,7 +32,7 @@ RUN apk update && apk upgrade && \
USER indy
RUN git clone https://github.com/hyperledger/indy-vdr.git
WORKDIR /home/indy/indy-vdr/indy-vdr-proxy
RUN git checkout 32f44489
RUN git checkout c143268
RUN cargo build --release

FROM alpine:3.18
Expand Down
119 changes: 19 additions & 100 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,12 @@ jobs:
uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: nightly-2023-05-08
components: rustfmt
override: true
- name: "Verify code formatting"
run: |
cargo +nightly fmt --check
cargo +nightly-2023-05-08 fmt --check

workflow-setup:
runs-on: ubuntu-20.04
Expand Down Expand Up @@ -64,16 +65,15 @@ jobs:
run: |
set -x

HASH_DOCKERFILE_LIBVCX=${{ hashFiles('ci/libvcx.dockerfile') }}
HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('ci/vdrproxy.dockerfile') }}
HASH_DOCKERFILE_LIBVCX=${{ hashFiles('.github/ci/libvcx.dockerfile') }}
HASH_DOCKERFILE_VDRPROXY=${{ hashFiles('.github/ci/vdrproxy.dockerfile') }}
HASH_SRC_LIBVDRTOOLS=${{ hashFiles('libvdrtools') }}
HASH_SRC_LIBVCX=${{ hashFiles('libvcx') }}
HASH_SRC_ARIESVCX=${{ hashFiles('aries_vcx') }}
HASH_SRC_ARIESVCX_CORE=${{ hashFiles('aries_vcx_core') }}
HASH_SRC_AGENCYCLIENT=${{ hashFiles('agency_client') }}
HASH_SRC_DIDDOC=${{ hashFiles('diddoc') }}
HASH_SRC_MESSAGES=${{ hashFiles('messages') }}
HASH_SRC_WRAPPER_JAVA=${{ hashFiles('wrappers/java') }}

SEED_HASH_ARIESVCX=${HASH_SRC_LIBVDRTOOLS:0:11}-${HASH_SRC_ARIESVCX_CORE:0:11}-${HASH_SRC_ARIESVCX:0:11}-${HASH_SRC_AGENCYCLIENT:0:11}-${HASH_SRC_DIDDOC:0:11}-${HASH_SRC_MESSAGES:0:11}}
HASH_ARIESVCX=$(echo -n "$SEED_HASH_ARIESVCX" | sha256sum | awk '{print $1}')
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
runs-on: ubuntu-20.04
strategy:
matrix:
backend: ["vdrtools", "modular_libs", "vdr_proxy_ledger"]
backend: ["credx,vdrtools_wallet", "vdr_proxy_ledger"]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -133,38 +133,12 @@ jobs:
sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
- name: "Verify clippy across the entire workspace with default features"
run: |
cargo clippy -p aries-vcx --features legacy_proof,migration --features ${{ matrix.backend }} --no-default-features
cargo clippy -p aries-vcx --features legacy_proof --features ${{ matrix.backend }} --no-default-features
env:
RUSTFLAGS: -D warnings

aries_vcx_core_clippy:
runs-on: ubuntu-20.04
strategy:
matrix:
backend: ["vdrtools_anoncreds", "modular_libs", "vdr_proxy_ledger"]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: ${{ env.RUST_TOOLCHAIN_VERSON }}
components: clippy
- name: "Install dependencies"
shell: bash
run: |
sudo apt-get update -y
sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
- name: "Verify clippy across the entire workspace with default features"
run: |
cargo clippy -p aries_vcx_core --features legacy_proof,vdrtools_wallet --features ${{ matrix.backend }}
env:
RUSTFLAGS: -D warnings

libvcx_core_clippy:
aries_vcx_no_features_clippy:
runs-on: ubuntu-20.04
strategy:
matrix:
backend: ["anoncreds_credx", "anoncreds_vdrtools"]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -179,15 +153,15 @@ jobs:
sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
- name: "Verify clippy across the entire workspace with default features"
run: |
cargo clippy -p libvcx_core --features ${{ matrix.backend }}
cargo clippy -p aries-vcx --no-default-features
env:
RUSTFLAGS: -D warnings

node_wrapper_clippy:
aries_vcx_core_clippy:
runs-on: ubuntu-20.04
strategy:
matrix:
backend: ["anoncreds_credx", "anoncreds_vdrtools"]
backend: ["credx,vdrtools_wallet", "vdr_proxy_ledger"]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -202,7 +176,7 @@ jobs:
sudo apt-get install -y libsodium-dev libssl-dev libzmq3-dev
- name: "Verify clippy across the entire workspace with default features"
run: |
cargo clippy -p vcx-napi-rs --features ${{ matrix.backend }}
cargo clippy -p aries_vcx_core --features legacy_proof,vdrtools_wallet --features ${{ matrix.backend }}
env:
RUSTFLAGS: -D warnings

Expand Down Expand Up @@ -232,7 +206,7 @@ jobs:
uses: ./.github/actions/build-image
with:
docker-img: ${{ env.DOCKER_IMG_CACHED }}
dockerfile-path: "ci/vdrproxy.dockerfile"
dockerfile-path: ".github/ci/vdrproxy.dockerfile"
build-arg: "ALPINE_CORE_IMAGE=$DOCKER_IMG_CACHED_ALPINE_CORE"
branch-name: ${{ env.BRANCH_NAME }}
branch-main: ${{ env.MAIN_BRANCH }}
Expand Down Expand Up @@ -283,7 +257,7 @@ jobs:
run: |
RUSTFLAGS='-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' \
RUSTDOCFLAGS='-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' \
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --package aries-vcx -F 'modular_libs' -- --ignored;
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --package aries-vcx -- --ignored;

mkdir -p /tmp/artifacts/coverage
grcov ./target/debug/ -s . -t lcov --llvm --branch --ignore-not-existing -o /tmp/artifacts/coverage/coverage.lcov
Expand All @@ -306,12 +280,6 @@ jobs:
test-unit-workspace:
needs: workflow-setup
runs-on: ubuntu-20.04
strategy:
matrix:
features: [
"anoncreds_vdrtools",
"anoncreds_credx",
]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -321,17 +289,11 @@ jobs:
rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
skip-docker-setup: true
- name: "Run workspace unit tests"
run: RUST_TEST_THREADS=1 cargo test --workspace --lib --exclude aries-vcx-agent --exclude libvdrtools --exclude wallet_migrator --features ${{ matrix.features }}
run: RUST_TEST_THREADS=1 cargo test --workspace --lib --exclude aries-vcx-agent --exclude libvdrtools --exclude wallet_migrator

test-integration-aries-vcx:
needs: workflow-setup
runs-on: ubuntu-20.04
strategy:
matrix:
features: [
"vdrtools",
"modular_libs"
]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -340,7 +302,7 @@ jobs:
with:
rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
- name: "Run aries-vcx integration tests"
run: RUST_TEST_THREADS=1 cargo test --manifest-path="aries_vcx/Cargo.toml" --features ${{ matrix.features }} -- --ignored;
run: RUST_TEST_THREADS=1 cargo test --manifest-path="aries_vcx/Cargo.toml" -- --ignored;

test-integration-aries-vcx-mysql:
needs: workflow-setup
Expand Down Expand Up @@ -384,34 +346,10 @@ jobs:
with:
name: "docker-services-${{ github.job }}"

test-integration-aries-vcx-migration:
needs: workflow-setup
runs-on: ubuntu-20.04
steps:
- name: "Git checkout"
uses: actions/checkout@v3
- name: "Setup rust testing environment"
uses: ./.github/actions/setup-testing-rust
with:
rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
- name: "Run aries-vcx tests: pool_tests agency_pool_tests"
run: |
cargo test --manifest-path="wallet_migrator/Cargo.toml";
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --manifest-path="aries_vcx/Cargo.toml" -F migration --test test_credential_issuance -- --include-ignored;
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --manifest-path="aries_vcx/Cargo.toml" -F migration --test test_credential_retrieval -- --include-ignored;
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --manifest-path="aries_vcx/Cargo.toml" -F migration --test test_proof_presentation -- --include-ignored;
RUST_TEST_THREADS=1 CARGO_INCREMENTAL=0 TEST_POOL_IP=127.0.0.1 cargo test --manifest-path="aries_vcx/Cargo.toml" -F migration --test test_revocations -- --include-ignored;

test-integration-libvcx:
needs: workflow-setup
if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
runs-on: ubuntu-20.04
strategy:
matrix:
features: [
"anoncreds_vdrtools",
"anoncreds_credx"
]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
Expand All @@ -421,7 +359,7 @@ jobs:
rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
- name: "Run libvcx_core integration tests"
run: |
RUST_TEST_THREADS=1 cargo test --features ${{ matrix.features }} --manifest-path="libvcx_core/Cargo.toml" -- --include-ignored;
RUST_TEST_THREADS=1 cargo test --manifest-path="libvcx_core/Cargo.toml" -- --include-ignored;

test-integration-did-crate:
needs: workflow-setup
Expand All @@ -438,25 +376,6 @@ jobs:
run: |
RUST_TEST_THREADS=1 cargo test -p did_doc -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov -p did_resolver_web -p did_doc_sov -p did_key -p did_peer --test "*"

test-node-wrapper:
needs: workflow-setup
if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
runs-on: ubuntu-22.04
strategy:
matrix:
node-version: [18.x]
steps:
- name: "Git checkout"
uses: actions/checkout@v3
- name: "Setup NodeJS libvcx testing environment"
uses: ./.github/actions/setup-testing-nodejs
with:
rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }}
skip-docker-setup: true
node-version: ${{ matrix.node-version }}
- name: "Run tests"
run: cd wrappers/node && npm run test

test-integration-node-wrapper:
needs: workflow-setup
if: ${{ needs.workflow-setup.outputs.SKIP_CI != 'true' }}
Expand Down Expand Up @@ -613,7 +532,7 @@ jobs:
- test-integration-libvcx
- test-integration-aries-vcx
- test-integration-aries-vcx-mysql
- test-node-wrapper
# - test-node-wrapper
- test-integration-node-wrapper
- workflow-setup
- build-napi
Expand All @@ -637,7 +556,7 @@ jobs:
- test-integration-libvcx
- test-integration-aries-vcx
- test-integration-aries-vcx-mysql
- test-node-wrapper
# - test-node-wrapper
- test-integration-node-wrapper
if: ${{ needs.workflow-setup.outputs.RELEASE == 'true' || needs.workflow-setup.outputs.PRERELEASE == 'true' }}
outputs:
Expand Down
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,7 @@
**/node_modules
**/*.node
**/dist
wrappers/ios/vcx/vcx.framework/**
wrappers/ios/vcx/vcx.framework.dSYM/**
wrappers/ios_legacy/vcx/vcx.framework/**
wrappers/ios_legacy/vcx/vcx.framework.dSYM/**
.vscode
*.code-workspace
**/tails.txt
.session.vim
Loading
Loading