From 941f2923dbcd402dd57a13c99a42ef2688475797 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Mon, 7 Aug 2023 13:00:17 +0200 Subject: [PATCH 01/20] feat: update aries Signed-off-by: Stas D --- Makefile | 17 +++++++++++++++-- cmd/vc-rest/go.mod | 9 ++++++--- cmd/vc-rest/go.sum | 16 ++++++++-------- component/credentialstatus/go.mod | 8 +++++--- component/credentialstatus/go.sum | 14 ++++++-------- component/event/go.mod | 8 +++++--- component/event/go.sum | 14 ++++++-------- component/profile/reader/file/go.mod | 8 +++++--- component/profile/reader/file/go.sum | 14 ++++++-------- component/wallet-cli/go.mod | 9 ++++++--- component/wallet-cli/go.sum | 16 ++++++++-------- go.mod | 9 ++++++--- go.sum | 16 ++++++++-------- test/bdd/go.mod | 9 ++++++--- test/bdd/go.sum | 16 ++++++++-------- test/stress/go.mod | 9 ++++++--- test/stress/go.sum | 16 ++++++++-------- 17 files changed, 118 insertions(+), 90 deletions(-) diff --git a/Makefile b/Makefile index 8265aa17b..0f1109ff9 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ all: checks unit-test bdd-test checks: license lint .PHONY: generate -generate: +generate: update-mock-aries @GOBIN=$(GOBIN_PATH) go install github.com/golang/mock/mockgen@$(MOCK_VERSION) @GOBIN=$(GOBIN_PATH) go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPIGEN_VERSION) @go generate ./... @@ -187,4 +187,17 @@ update-aries: @cd ./component/profile/reader/file && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy @cd ./component/wallet-cli && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy @cd ./test/bdd && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./test/stress && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy \ No newline at end of file + @cd ./test/stress && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy + +.PHONY: tidy-modules +tidy-modules: + @find . -type d \( -name .build -prune \) -o -name go.mod -print | while read -r gomod_path; do \ + dir_path=$$(dirname "$$gomod_path"); \ + echo "Executing 'go mod tidy' in directory: $$dir_path"; \ + (cd "$$dir_path" && go mod tidy) || exit 1; \ + done +.PHONY: update-mock-aries +update-mock-aries: + @mkdir -p .build + @rm -rf ./build/aries + @git clone -b sdjwt-issuance-v5 git@github.com:skynet2/aries-framework-go.git ./.build/local-aries diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod index ea3663fcc..7bb5d1bce 100644 --- a/cmd/vc-rest/go.mod +++ b/cmd/vc-rest/go.mod @@ -120,11 +120,12 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect @@ -247,4 +248,6 @@ replace ( github.com/trustbloc/vcs/pkg/profile/reader => ../../component/profile/reader/file ) +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + go 1.19 diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum index 03e0e72b9..62e028d15 100644 --- a/cmd/vc-rest/go.sum +++ b/cmd/vc-rest/go.sum @@ -574,8 +574,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -586,16 +584,18 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221213152252-f0c83a5a922c/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 h1:6pkyx5TMJEZpau/HsDNSndZy+MrX9hJmWAtGM1UaGuI= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4/go.mod h1:SCS+CWl/U4qRgy540BAKvSlLHAUXrw29pmuhp3nMzbY= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod index eb5feff9c..466d82546 100644 --- a/component/credentialstatus/go.mod +++ b/component/credentialstatus/go.mod @@ -70,11 +70,11 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect @@ -168,4 +168,6 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + replace github.com/trustbloc/vcs => ../../ diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum index 1aae6a605..14e0cc0bd 100644 --- a/component/credentialstatus/go.sum +++ b/component/credentialstatus/go.sum @@ -503,8 +503,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 h1:MbWVC1HQEAn5yw5DLs4D7kdcM06y6ZiN4r3ZtvDzxWE= @@ -513,16 +511,16 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/component/event/go.mod b/component/event/go.mod index 2f38cacc6..053eb6831 100644 --- a/component/event/go.mod +++ b/component/event/go.mod @@ -71,11 +71,11 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect @@ -169,4 +169,6 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + replace github.com/trustbloc/vcs => ../../ diff --git a/component/event/go.sum b/component/event/go.sum index e332e10ff..acb507587 100644 --- a/component/event/go.sum +++ b/component/event/go.sum @@ -503,24 +503,22 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 h1:AiQyIn1EJd8FN/2nxk3Z3zIMI5ZOgqV+HWRK2uN2Ktg= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod index 81a8c482f..b57683d54 100644 --- a/component/profile/reader/file/go.mod +++ b/component/profile/reader/file/go.mod @@ -70,11 +70,11 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect @@ -170,4 +170,6 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) +replace github.com/hyperledger/aries-framework-go => ./../../../../.build/local-aries + replace github.com/trustbloc/vcs => ../../../../ diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum index 45fc4a14e..1432d7d91 100644 --- a/component/profile/reader/file/go.sum +++ b/component/profile/reader/file/go.sum @@ -504,8 +504,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -516,16 +514,16 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221213152252-f0c83a5a922c/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod index cdc1e1a80..fd303de83 100644 --- a/component/wallet-cli/go.mod +++ b/component/wallet-cli/go.mod @@ -6,6 +6,8 @@ module github.com/trustbloc/vcs/component/wallet-cli go 1.19 +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + require ( github.com/cli/browser v1.1.0 github.com/golang/mock v1.6.0 @@ -16,7 +18,7 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 @@ -85,10 +87,11 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum index 9992b90d6..6522c8ba0 100644 --- a/component/wallet-cli/go.sum +++ b/component/wallet-cli/go.sum @@ -537,8 +537,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -549,20 +547,22 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 h1:6pkyx5TMJEZpau/HsDNSndZy+MrX9hJmWAtGM1UaGuI= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4/go.mod h1:SCS+CWl/U4qRgy540BAKvSlLHAUXrw29pmuhp3nMzbY= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3/go.mod h1:i/bnCdoiv0a9fgHQtd+EiAxmCdaJKE3JYrgDUACKgyE= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/go.mod b/go.mod index af54e1593..a53f497e3 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,8 @@ module github.com/trustbloc/vcs go 1.19 +replace github.com/hyperledger/aries-framework-go => ./.build/local-aries + require ( github.com/alexliesenfeld/health v0.6.0 github.com/aws/aws-sdk-go-v2 v1.17.7 @@ -24,7 +26,7 @@ require ( github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 github.com/jinzhu/copier v0.3.5 @@ -123,9 +125,10 @@ require ( github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/imdario/mergo v0.3.13 // indirect diff --git a/go.sum b/go.sum index 92b0841c7..947c0192c 100644 --- a/go.sum +++ b/go.sum @@ -577,24 +577,24 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 h1:AiQyIn1EJd8FN/2nxk3Z3zIMI5ZOgqV+HWRK2uN2Ktg= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 h1:6pkyx5TMJEZpau/HsDNSndZy+MrX9hJmWAtGM1UaGuI= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4/go.mod h1:SCS+CWl/U4qRgy540BAKvSlLHAUXrw29pmuhp3nMzbY= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/test/bdd/go.mod b/test/bdd/go.mod index dcac1c549..eb665d5c4 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -27,6 +27,8 @@ require ( golang.org/x/oauth2 v0.7.0 ) +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect github.com/PaesslerAG/gval v1.2.0 // indirect @@ -93,12 +95,13 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 10be9b288..18d39aa8f 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -570,8 +570,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -582,20 +580,22 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 h1:6pkyx5TMJEZpau/HsDNSndZy+MrX9hJmWAtGM1UaGuI= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4/go.mod h1:SCS+CWl/U4qRgy540BAKvSlLHAUXrw29pmuhp3nMzbY= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3/go.mod h1:i/bnCdoiv0a9fgHQtd+EiAxmCdaJKE3JYrgDUACKgyE= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= diff --git a/test/stress/go.mod b/test/stress/go.mod index 95af2aa93..2543df2fd 100644 --- a/test/stress/go.mod +++ b/test/stress/go.mod @@ -21,6 +21,8 @@ require ( golang.org/x/oauth2 v0.7.0 ) +replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries + require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect github.com/PaesslerAG/gval v1.2.0 // indirect @@ -88,13 +90,14 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 // indirect github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect - github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect + github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f // indirect + github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect diff --git a/test/stress/go.sum b/test/stress/go.sum index 69a8de1d0..09b500eff 100644 --- a/test/stress/go.sum +++ b/test/stress/go.sum @@ -551,8 +551,6 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 h1:k4aJZwdsvI8R21B1yjQ8ROUoU1IuZ7V6OWO854GwyJs= -github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44/go.mod h1:lVZsfDolr9NnW+vXdlSH5BS7TZcesgyzc3lMImU+CcA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -563,20 +561,22 @@ github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.202 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49/go.mod h1:nBzEBfVKX/+N9tHyDYwlOMxA55FdSiU6Y2cVdtNVN7I= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 h1:lLClFk/2sgr8B15E854dtgxK9b6R+B8qPJXin4mgTFo= github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122/go.mod h1:kHGEwgl2Wo1dYj0rs6u8Kk/GjHmmwZI7445lU+9CJtI= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f h1:oR0B9TdQ8ZLNq/XyYeJL/DZFtTPiZimQN0rc7yHd/M8= -github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230523135653-2f2e9595514f/go.mod h1:UNGeS/ssGkx12NCQssoigDfsiAl2rprMxmsif6TOqEk= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 h1:6pkyx5TMJEZpau/HsDNSndZy+MrX9hJmWAtGM1UaGuI= +github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4/go.mod h1:SCS+CWl/U4qRgy540BAKvSlLHAUXrw29pmuhp3nMzbY= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 h1:x7Lt4FAPmMNyKQCUhnUOYeDpskaHnRNrtZj4rKfSKfU= +github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44 h1:v282PXBbRyIHakPvSRhU0XYsfFB1Rb/aXkDLh6wAl1w= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230615070726-b02a3e01fc44/go.mod h1:jT27JJU7l/hYvidk1vuRdSMzcHacu5M4Bww8dqqeBUY= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3/go.mod h1:i/bnCdoiv0a9fgHQtd+EiAxmCdaJKE3JYrgDUACKgyE= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f h1:XDQWMjxaKEkmcGqoRNz11YzOlC8uBjt3nzxClpdXKkU= -github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230523135653-2f2e9595514f/go.mod h1:RDk++K+JPqj0nuIONRgKz9Mzn/4rC+R3BUkykhvuMVw= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= +github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539/go.mod h1:ikK4+HFhhxw//uBPSUgnMmqyzGUjbgUu2kbJCLBYMCE= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 h1:xohFDAv9+SbJD0t75QhSAdY0ZnxUf+k7wj2Jty+Sw7Y= github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250/go.mod h1:oryUyWb23l/a3tAP9KW+GBbfcfqp9tZD4y5hSkFrkqI= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20220509181817-261c3746d03e h1:Jw8qXxl32lfdkxqUOjwLEhsQC2+lT/YtcM7MuOd9+7k= From a333e6d29647aa48b7d7bed18ca10355d6c9c19e Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Mon, 7 Aug 2023 13:02:33 +0200 Subject: [PATCH 02/20] fix: git url for ci Signed-off-by: Stas D --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0f1109ff9..e19f0be28 100644 --- a/Makefile +++ b/Makefile @@ -200,4 +200,4 @@ tidy-modules: update-mock-aries: @mkdir -p .build @rm -rf ./build/aries - @git clone -b sdjwt-issuance-v5 git@github.com:skynet2/aries-framework-go.git ./.build/local-aries + @git clone -b sdjwt-issuance-v5 https://github.com/skynet2/aries-framework-go.git ./.build/local-aries From 0540db36e8a55a6f768151b8ae03ffee43878df7 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Mon, 7 Aug 2023 13:23:26 +0200 Subject: [PATCH 03/20] feat: more replaces Signed-off-by: Stas D --- Makefile | 8 ++++---- cmd/vc-rest/go.mod | 6 ++++-- cmd/vc-rest/go.sum | 6 ++---- component/credentialstatus/go.mod | 5 ++++- component/credentialstatus/go.sum | 4 ++-- component/event/go.mod | 6 ++++-- component/event/go.sum | 6 ++---- component/oidc/fosite/go.mod | 2 +- component/oidc/fosite/go.sum | 4 ++-- component/profile/reader/file/go.mod | 5 ++++- component/profile/reader/file/go.sum | 4 ++-- component/wallet-cli/go.mod | 6 ++++-- component/wallet-cli/go.sum | 6 ++---- go.mod | 6 ++++-- go.sum | 6 ++---- test/bdd/go.mod | 6 ++++-- test/bdd/go.sum | 6 ++---- test/stress/go.mod | 5 +++-- test/stress/go.sum | 6 ++---- 19 files changed, 54 insertions(+), 49 deletions(-) diff --git a/Makefile b/Makefile index e19f0be28..d1dc1d9e9 100644 --- a/Makefile +++ b/Makefile @@ -191,13 +191,13 @@ update-aries: .PHONY: tidy-modules tidy-modules: - @find . -type d \( -name .build -prune \) -o -name go.mod -print | while read -r gomod_path; do \ + @find . -type d \( -name build -prune \) -o -name go.mod -print | while read -r gomod_path; do \ dir_path=$$(dirname "$$gomod_path"); \ echo "Executing 'go mod tidy' in directory: $$dir_path"; \ (cd "$$dir_path" && go mod tidy) || exit 1; \ done .PHONY: update-mock-aries update-mock-aries: - @mkdir -p .build - @rm -rf ./build/aries - @git clone -b sdjwt-issuance-v5 https://github.com/skynet2/aries-framework-go.git ./.build/local-aries + @mkdir -p build + @rm -rf ./build/local-aries + @git clone -b sdjwt-issuance-v5 https://github.com/skynet2/aries-framework-go.git ./build/local-aries diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod index 7bb5d1bce..da4a8f9dc 100644 --- a/cmd/vc-rest/go.mod +++ b/cmd/vc-rest/go.mod @@ -217,7 +217,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect @@ -248,6 +248,8 @@ replace ( github.com/trustbloc/vcs/pkg/profile/reader => ../../component/profile/reader/file ) -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models go 1.19 diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum index 62e028d15..302298ac9 100644 --- a/cmd/vc-rest/go.sum +++ b/cmd/vc-rest/go.sum @@ -590,8 +590,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1230,8 +1228,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod index 466d82546..db2173f36 100644 --- a/component/credentialstatus/go.mod +++ b/component/credentialstatus/go.mod @@ -153,6 +153,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -168,6 +169,8 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models replace github.com/trustbloc/vcs => ../../ diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum index 14e0cc0bd..43c19960b 100644 --- a/component/credentialstatus/go.sum +++ b/component/credentialstatus/go.sum @@ -515,8 +515,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1076,6 +1074,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/event/go.mod b/component/event/go.mod index 053eb6831..c340bb7f8 100644 --- a/component/event/go.mod +++ b/component/event/go.mod @@ -153,7 +153,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -169,6 +169,8 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models replace github.com/trustbloc/vcs => ../../ diff --git a/component/event/go.sum b/component/event/go.sum index acb507587..b94d63f79 100644 --- a/component/event/go.sum +++ b/component/event/go.sum @@ -513,8 +513,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1078,8 +1076,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/oidc/fosite/go.mod b/component/oidc/fosite/go.mod index 841dd192b..ebf0e6123 100644 --- a/component/oidc/fosite/go.mod +++ b/component/oidc/fosite/go.mod @@ -94,7 +94,7 @@ require ( go.opentelemetry.io/otel/metric v0.35.0 // indirect go.opentelemetry.io/otel/trace v1.14.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect diff --git a/component/oidc/fosite/go.sum b/component/oidc/fosite/go.sum index 18b42e034..136f22fe7 100644 --- a/component/oidc/fosite/go.sum +++ b/component/oidc/fosite/go.sum @@ -401,8 +401,8 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod index b57683d54..c8676a4a3 100644 --- a/component/profile/reader/file/go.mod +++ b/component/profile/reader/file/go.mod @@ -155,6 +155,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -170,6 +171,8 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../../../build/local-aries/component/models replace github.com/trustbloc/vcs => ../../../../ diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum index 1432d7d91..80eba0809 100644 --- a/component/profile/reader/file/go.sum +++ b/component/profile/reader/file/go.sum @@ -518,8 +518,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1081,6 +1079,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod index fd303de83..60947cbc9 100644 --- a/component/wallet-cli/go.mod +++ b/component/wallet-cli/go.mod @@ -6,7 +6,9 @@ module github.com/trustbloc/vcs/component/wallet-cli go 1.19 -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models require ( github.com/cli/browser v1.1.0 @@ -174,7 +176,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum index 6522c8ba0..4689dd545 100644 --- a/component/wallet-cli/go.sum +++ b/component/wallet-cli/go.sum @@ -553,8 +553,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= @@ -1165,8 +1163,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/go.mod b/go.mod index a53f497e3..e8166b18f 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,9 @@ module github.com/trustbloc/vcs go 1.19 -replace github.com/hyperledger/aries-framework-go => ./.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./build/local-aries/component/models require ( github.com/alexliesenfeld/health v0.6.0 @@ -203,7 +205,7 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.8.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/go.sum b/go.sum index 947c0192c..54c372e66 100644 --- a/go.sum +++ b/go.sum @@ -589,8 +589,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1230,8 +1228,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= -golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/test/bdd/go.mod b/test/bdd/go.mod index eb665d5c4..64a4daf8b 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -27,7 +27,9 @@ require ( golang.org/x/oauth2 v0.7.0 ) -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect @@ -188,7 +190,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 18d39aa8f..6cd25e2d3 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -586,8 +586,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= @@ -1212,8 +1210,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o= -golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/test/stress/go.mod b/test/stress/go.mod index 2543df2fd..17b9cfcef 100644 --- a/test/stress/go.mod +++ b/test/stress/go.mod @@ -21,7 +21,8 @@ require ( golang.org/x/oauth2 v0.7.0 ) -replace github.com/hyperledger/aries-framework-go => ./../../.build/local-aries +replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries +replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect @@ -189,7 +190,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/test/stress/go.sum b/test/stress/go.sum index 09b500eff..f8fd5cfad 100644 --- a/test/stress/go.sum +++ b/test/stress/go.sum @@ -567,8 +567,6 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= @@ -1193,8 +1191,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 h1:5llv2sWeaMSnA3w2kS57ouQQ4pudlXrR0dCgw51QK9o= -golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= From ee63a56cf0e202445a12e60ff00d62a490946883 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 12:36:14 +0200 Subject: [PATCH 04/20] feat: go mod 1.20 + replacements Signed-off-by: Stas D --- Makefile | 5 +- cmd/vc-rest/go.mod | 2 +- cmd/vc-rest/go.sum | 4 +- component/credentialstatus/go.mod | 2 +- component/credentialstatus/go.sum | 4 +- component/event/go.mod | 2 +- component/event/go.sum | 4 +- component/profile/reader/file/go.mod | 2 +- component/profile/reader/file/go.sum | 4 +- component/wallet-cli/go.mod | 2 +- component/wallet-cli/go.sum | 4 +- .../pkg/walletrunner/wallet_runner_oidc4vp.go | 4 +- go.mod | 4 +- go.sum | 4 +- test/bdd/features/oidc4vc_api.feature | 212 +++++++++--------- test/bdd/go.mod | 2 +- test/bdd/go.sum | 4 +- test/bdd/pkg/v1/oidc4vc/steps.go | 6 + test/stress/go.mod | 3 +- test/stress/go.sum | 4 +- 20 files changed, 144 insertions(+), 134 deletions(-) diff --git a/Makefile b/Makefile index d1dc1d9e9..504608761 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ endif # Tool commands (overridable) ALPINE_VER ?= 3.16.5 GO_ALPINE_VER ?= 3.16 -GO_VER ?= 1.19 +GO_VER ?= 1.20 OS := $(shell uname) ifeq ($(OS),$(filter $(OS),Darwin Linux)) @@ -47,8 +47,9 @@ all: checks unit-test bdd-test .PHONY: checks checks: license lint -.PHONY: generate +#.PHONY: generate generate: update-mock-aries +generate: @GOBIN=$(GOBIN_PATH) go install github.com/golang/mock/mockgen@$(MOCK_VERSION) @GOBIN=$(GOBIN_PATH) go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPIGEN_VERSION) @go generate ./... diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod index da4a8f9dc..1c95fb9ec 100644 --- a/cmd/vc-rest/go.mod +++ b/cmd/vc-rest/go.mod @@ -73,7 +73,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/consensys/bavard v0.1.13 // indirect diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum index 302298ac9..18210bdec 100644 --- a/cmd/vc-rest/go.sum +++ b/cmd/vc-rest/go.sum @@ -201,8 +201,8 @@ github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= github.com/bsm/gomega v1.20.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk= github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod index db2173f36..e2ed41212 100644 --- a/component/credentialstatus/go.mod +++ b/component/credentialstatus/go.mod @@ -39,7 +39,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum index 43c19960b..4444e7ce6 100644 --- a/component/credentialstatus/go.sum +++ b/component/credentialstatus/go.sum @@ -174,8 +174,8 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/component/event/go.mod b/component/event/go.mod index c340bb7f8..8fb3ea730 100644 --- a/component/event/go.mod +++ b/component/event/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/component/event/go.sum b/component/event/go.sum index b94d63f79..40542c899 100644 --- a/component/event/go.sum +++ b/component/event/go.sum @@ -174,8 +174,8 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod index c8676a4a3..35d00dabe 100644 --- a/component/profile/reader/file/go.mod +++ b/component/profile/reader/file/go.mod @@ -38,7 +38,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum index 80eba0809..4fd7fce6a 100644 --- a/component/profile/reader/file/go.sum +++ b/component/profile/reader/file/go.sum @@ -174,8 +174,8 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod index 60947cbc9..fabf85a4b 100644 --- a/component/wallet-cli/go.mod +++ b/component/wallet-cli/go.mod @@ -55,7 +55,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum index 4689dd545..d34acb921 100644 --- a/component/wallet-cli/go.sum +++ b/component/wallet-cli/go.sum @@ -174,8 +174,8 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go b/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go index 8cb13c43c..5a4c9dffa 100644 --- a/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go +++ b/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go @@ -20,6 +20,8 @@ import ( "github.com/google/uuid" "github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk" + "github.com/valyala/fastjson" + "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/doc/jose" "github.com/hyperledger/aries-framework-go/pkg/doc/jwt" @@ -28,7 +30,6 @@ import ( "github.com/hyperledger/aries-framework-go/pkg/kms" didkey "github.com/hyperledger/aries-framework-go/pkg/vdr/key" "github.com/hyperledger/aries-framework-go/pkg/wallet" - "github.com/valyala/fastjson" "github.com/trustbloc/vcs/component/wallet-cli/internal/httputil" "github.com/trustbloc/vcs/pkg/doc/vc" @@ -294,6 +295,7 @@ func (e *VPFlowExecutor) QueryCredentialFromWalletSingleVP() error { return fmt.Errorf("presentation definition marshal: %w", err) } + fmt.Println(string(pdBytes)) // This query will always return one VP - so far no plans to change this vps, err := e.wallet.Query(e.walletToken, &wallet.QueryParams{ Type: "PresentationExchange", diff --git a/go.mod b/go.mod index e8166b18f..0975f3087 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ module github.com/trustbloc/vcs -go 1.19 +go 1.20 replace github.com/hyperledger/aries-framework-go => ./build/local-aries @@ -16,7 +16,7 @@ require ( github.com/aws/aws-sdk-go-v2/config v1.18.4 github.com/aws/aws-sdk-go-v2/service/kms v1.20.0 github.com/aws/aws-sdk-go-v2/service/s3 v1.31.0 - github.com/btcsuite/btcd v0.22.1 + github.com/btcsuite/btcd v0.22.3 github.com/cenkalti/backoff v2.2.1+incompatible github.com/cenkalti/backoff/v4 v4.2.0 github.com/deepmap/oapi-codegen v1.11.0 diff --git a/go.sum b/go.sum index 54c372e66..0a4196c90 100644 --- a/go.sum +++ b/go.sum @@ -195,8 +195,8 @@ github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= github.com/bsm/gomega v1.20.0/go.mod h1:JifAceMQ4crZIWYUKrlGcmbN3bqHogVTADMD2ATsbwk= github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/test/bdd/features/oidc4vc_api.feature b/test/bdd/features/oidc4vc_api.feature index 05b4467ea..6ff005fa1 100644 --- a/test/bdd/features/oidc4vc_api.feature +++ b/test/bdd/features/oidc4vc_api.feature @@ -8,94 +8,94 @@ @oidc4vc_rest Feature: OIDC4VC REST API - Scenario Outline: OIDC credential issuance and verification Auth flow - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "" is authorized as a Profile user - And User holds credential "" with templateID "" - - When User interacts with Wallet to initiate credential issuance using authorization code flow with client registration method "" - Then credential is issued - Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" - And Verifier from organization "test_org" retrieves interactions claims - Then we wait 2 seconds - And Verifier form organization "test_org" requests deleted interactions claims - - Examples: - | issuerProfile | credentialType | clientRegistrationMethod | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -# SDJWT issuer, JWT verifier, no limit disclosure in PD query. - | bank_issuer/v1.0 | UniversityDegreeCredential | dynamic | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | -# SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. - | bank_issuer/v1.0 | CrudeProductCredential | discoverable | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -# JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. - | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | pre-registered | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | -# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. - | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | pre-registered | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | - - Scenario Outline: OIDC credential issuance and verification Pre Auth flow - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "" is authorized as a Profile user - And User holds credential "" with templateID "" - - When User interacts with Wallet to initiate credential issuance using pre authorization code flow - Then credential is issued - Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" - And Verifier from organization "test_org" retrieves interactions claims - Then we wait 2 seconds - And Verifier form organization "test_org" requests deleted interactions claims - - Examples: - | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -# SDJWT issuer, JWT verifier, no limit disclosure in PD query. - | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | -# SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. - | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -# JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. - | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,commuter_classification,registration_city | -# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. - | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | - -# Error cases - Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Claims) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user - Then User interacts with Wallet to initiate credential issuance using pre authorization code flow with invalid claims - - Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Field in Presentation Definition) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "i_myprofile_ud_es256k_jwt/v1.0" is authorized as a Profile user - And User holds credential "CrudeProductCredential" with templateID "crudeProductCredentialTemplateID" - When User interacts with Wallet to initiate credential issuance using pre authorization code flow - Then credential is issued - And User interacts with Verifier and initiate OIDC4VP interaction under "v_myprofile_jwt/v1.0" profile for organization "test_org" with presentation definition ID "32f54163-no-limit-disclosure-optional-fields" and fields "lpr_category_id,commuter_classification,invalidfield" and receives "field invalidfield not found" error - - Scenario: OIDC credential issuance and verification Auth flow (Malicious attacker stealing auth code & calling token endpoint with it) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user - And User holds credential "UniversityDegreeCredential" with templateID "universityDegreeTemplateID" - Then Malicious attacker stealing auth code from User and using "malicious_attacker_id" ClientID makes /token request and receives "invalid_client" error - - Scenario: OIDC credential issuance and verification Pre Auth flow (issuer has pre-authorized_grant_anonymous_access_supported disabled) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "i_disabled_preauth_without_client_id/v1.0" is authorized as a Profile user - And User holds credential "VerifiedEmployee" with templateID "templateID" - Then User interacts with Wallet to initiate credential issuance using pre authorization code flow and receives "invalid_client" error - - Scenario Outline: OIDC credential issuance and verification Auth flow (Claims Expiry) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "" is authorized as a Profile user - And User holds credential "" with templateID "" - When User interacts with Wallet to initiate credential issuance using authorization code flow with wallet-initiated - Then credential is issued - Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" - And Verifier form organization "test_org" waits for interaction succeeded event - Then we wait 15 seconds - And Verifier form organization "test_org" requests expired interactions claims - - Examples: - | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | - | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | - | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | - | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | +# Scenario Outline: OIDC credential issuance and verification Auth flow +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "" is authorized as a Profile user +# And User holds credential "" with templateID "" +# +# When User interacts with Wallet to initiate credential issuance using authorization code flow with client registration method "" +# Then credential is issued +# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" +# And Verifier from organization "test_org" retrieves interactions claims +# Then we wait 2 seconds +# And Verifier form organization "test_org" requests deleted interactions claims +# +# Examples: +# | issuerProfile | credentialType | clientRegistrationMethod | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +## SDJWT issuer, JWT verifier, no limit disclosure in PD query. +# | bank_issuer/v1.0 | UniversityDegreeCredential | dynamic | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | +## SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. +# | bank_issuer/v1.0 | CrudeProductCredential | discoverable | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +## JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. +# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | pre-registered | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | +## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. +# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | pre-registered | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | +# +# Scenario Outline: OIDC credential issuance and verification Pre Auth flow +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "" is authorized as a Profile user +# And User holds credential "" with templateID "" +# +# When User interacts with Wallet to initiate credential issuance using pre authorization code flow +# Then credential is issued +# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" +# And Verifier from organization "test_org" retrieves interactions claims +# Then we wait 2 seconds +# And Verifier form organization "test_org" requests deleted interactions claims +# +# Examples: +# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +## SDJWT issuer, JWT verifier, no limit disclosure in PD query. +# | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | +## SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. +# | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +## JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. +# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,commuter_classification,registration_city | +## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. +# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | +# +## Error cases +# Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Claims) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user +# Then User interacts with Wallet to initiate credential issuance using pre authorization code flow with invalid claims +# +# Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Field in Presentation Definition) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "i_myprofile_ud_es256k_jwt/v1.0" is authorized as a Profile user +# And User holds credential "CrudeProductCredential" with templateID "crudeProductCredentialTemplateID" +# When User interacts with Wallet to initiate credential issuance using pre authorization code flow +# Then credential is issued +# And User interacts with Verifier and initiate OIDC4VP interaction under "v_myprofile_jwt/v1.0" profile for organization "test_org" with presentation definition ID "32f54163-no-limit-disclosure-optional-fields" and fields "lpr_category_id,commuter_classification,invalidfield" and receives "field invalidfield not found" error +# +# Scenario: OIDC credential issuance and verification Auth flow (Malicious attacker stealing auth code & calling token endpoint with it) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user +# And User holds credential "UniversityDegreeCredential" with templateID "universityDegreeTemplateID" +# Then Malicious attacker stealing auth code from User and using "malicious_attacker_id" ClientID makes /token request and receives "invalid_client" error +# +# Scenario: OIDC credential issuance and verification Pre Auth flow (issuer has pre-authorized_grant_anonymous_access_supported disabled) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "i_disabled_preauth_without_client_id/v1.0" is authorized as a Profile user +# And User holds credential "VerifiedEmployee" with templateID "templateID" +# Then User interacts with Wallet to initiate credential issuance using pre authorization code flow and receives "invalid_client" error +# +# Scenario Outline: OIDC credential issuance and verification Auth flow (Claims Expiry) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "" is authorized as a Profile user +# And User holds credential "" with templateID "" +# When User interacts with Wallet to initiate credential issuance using authorization code flow with wallet-initiated +# Then credential is issued +# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" +# And Verifier form organization "test_org" waits for interaction succeeded event +# Then we wait 15 seconds +# And Verifier form organization "test_org" requests expired interactions claims +# +# Examples: +# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +# | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | +# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | +# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" @@ -114,21 +114,21 @@ Feature: OIDC4VC REST API | i_myprofile_ud_es256k_jwt/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | # LDP issuer, LDP verifier, limit disclosure enabled in PD query. | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | - - Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "" is authorized as a Profile user - And User holds credential "" with templateID "" - - When User interacts with Wallet to initiate credential issuance using pre authorization code flow - Then credential is issued - And wallet configured to use hardcoded vp_token format "jwt" for OIDC4VP interaction - And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "profile does not support jwt vp_token format" error - Then we wait 15 seconds - And Verifier form organization "test_org" requests expired interactions claims - - Examples: - | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. - | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | - +# +# Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "" is authorized as a Profile user +# And User holds credential "" with templateID "" +# +# When User interacts with Wallet to initiate credential issuance using pre authorization code flow +# Then credential is issued +# And wallet configured to use hardcoded vp_token format "jwt" for OIDC4VP interaction +# And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "profile does not support jwt vp_token format" error +# Then we wait 15 seconds +# And Verifier form organization "test_org" requests expired interactions claims +# +# Examples: +# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. +# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | +# diff --git a/test/bdd/go.mod b/test/bdd/go.mod index 64a4daf8b..c2c16e60f 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -52,7 +52,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 6cd25e2d3..a02101563 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -175,8 +175,8 @@ github.com/blakesmith/ar v0.0.0-20190502131153-809d4375e1fb/go.mod h1:PkYb9DJNAw github.com/bluele/gcache v0.0.2 h1:WcbfdXICg7G/DGBh1PFfcirkWOQV+v077yF1pSy3DGw= github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0t/fp0= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= diff --git a/test/bdd/pkg/v1/oidc4vc/steps.go b/test/bdd/pkg/v1/oidc4vc/steps.go index 677b2e932..62454533b 100644 --- a/test/bdd/pkg/v1/oidc4vc/steps.go +++ b/test/bdd/pkg/v1/oidc4vc/steps.go @@ -12,6 +12,7 @@ import ( "net/http/cookiejar" "github.com/cucumber/godog" + "github.com/hyperledger/aries-framework-go/pkg/doc/ld" "github.com/trustbloc/vcs/component/wallet-cli/pkg/walletrunner" @@ -67,6 +68,11 @@ func (s *Steps) ResetAndSetup() error { return fmt.Errorf("init cookie jar: %w", err) } + if s.walletRunner != nil { + if s.walletRunner.GetWallet() != nil { + _ = s.walletRunner.GetWallet().Close() + } + } walletRunner, err := walletrunner.New(vcprovider.ProviderVCS, func(c *vcprovider.Config) { c.DidKeyType = "ECDSAP384DER" diff --git a/test/stress/go.mod b/test/stress/go.mod index 17b9cfcef..f48607c1d 100644 --- a/test/stress/go.mod +++ b/test/stress/go.mod @@ -22,6 +22,7 @@ require ( ) replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries + replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models require ( @@ -45,7 +46,7 @@ require ( github.com/aws/smithy-go v1.13.5 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd v0.22.3 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.2.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect diff --git a/test/stress/go.sum b/test/stress/go.sum index f8fd5cfad..c8e708b24 100644 --- a/test/stress/go.sum +++ b/test/stress/go.sum @@ -176,8 +176,8 @@ github.com/bluele/gcache v0.0.2/go.mod h1:m15KV+ECjptwSPxKhOhQoAFQVtUFjTVkc3H8o0 github.com/bsm/ginkgo/v2 v2.7.0 h1:ItPMPH90RbmZJt5GtkcNvIRuGEdwlBItdNVoyzaNQao= github.com/bsm/gomega v1.26.0 h1:LhQm+AFcgV2M0WyKroMASzAzCAJVpAxQXv4SaI9a69Y= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg= +github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= From 88514cff32c33a4ba89f856e6d35547f874b0989 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 14:31:47 +0200 Subject: [PATCH 05/20] feat: temp cred sdjwt Signed-off-by: Stas D --- pkg/doc/vc/crypto/crypto.go | 39 +++- pkg/doc/vc/sdjwt.go | 13 +- pkg/doc/vc/signer.go | 1 + pkg/profile/api.go | 25 ++- pkg/restapi/v1/issuer/controller.go | 17 +- .../issuecredential_service.go | 3 +- pkg/service/oidc4ci/api.go | 1 + pkg/service/oidc4ci/oidc4ci_service.go | 4 +- test/bdd/features/oidc4vc_api.feature | 73 +++---- test/bdd/fixtures/profile/profiles.json | 187 ++++++++++++++++++ 10 files changed, 305 insertions(+), 58 deletions(-) diff --git a/pkg/doc/vc/crypto/crypto.go b/pkg/doc/vc/crypto/crypto.go index a6bd553fa..74c93f122 100644 --- a/pkg/doc/vc/crypto/crypto.go +++ b/pkg/doc/vc/crypto/crypto.go @@ -7,11 +7,12 @@ SPDX-License-Identifier: Apache-2.0 package crypto import ( - "crypto" "fmt" "strings" "time" + "github.com/piprate/json-gold/ld" + "github.com/hyperledger/aries-framework-go/pkg/doc/did" "github.com/hyperledger/aries-framework-go/pkg/doc/signature/jsonld" ariessigner "github.com/hyperledger/aries-framework-go/pkg/doc/signature/signer" @@ -23,7 +24,6 @@ import ( "github.com/hyperledger/aries-framework-go/pkg/doc/signature/suite/jsonwebsignature2020" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" vdrapi "github.com/hyperledger/aries-framework-go/pkg/framework/aries/api/vdr" - "github.com/piprate/json-gold/ld" "github.com/trustbloc/vcs/pkg/doc/vc" "github.com/trustbloc/vcs/pkg/doc/vc/jws" @@ -92,6 +92,7 @@ type signingOpts struct { Created *time.Time Challenge string Domain string + SDJWTTemplateData *vc.SelectiveDisclosureTemplate } // SigningOpts is signing credential option. @@ -104,6 +105,12 @@ func WithVerificationMethod(verificationMethod string) SigningOpts { } } +func WithSDJWTTemplateData(template *vc.SelectiveDisclosureTemplate) SigningOpts { + return func(opts *signingOpts) { + opts.SDJWTTemplateData = template + } +} + // WithPurpose is an option to pass proof purpose option for signing. func WithPurpose(purpose string) SigningOpts { return func(opts *signingOpts) { @@ -198,7 +205,9 @@ func (c *Crypto) signCredentialLDP( // signCredentialJWT returns vc in JWT format including the signature section. func (c *Crypto) signCredentialJWT( - signerData *vc.Signer, credential *verifiable.Credential, opts ...SigningOpts) (*verifiable.Credential, error) { + signerData *vc.Signer, + credential *verifiable.Credential, + opts ...SigningOpts) (*verifiable.Credential, error) { signOpts := &signingOpts{} // apply opts for _, opt := range opts { @@ -238,7 +247,21 @@ func (c *Crypto) signCredentialJWT( } if signerData.SDJWT.Enable { - return c.getSDJWTSignedCredential(credential, s, jwsAlgo, signerData.SDJWT.HashAlg, method) + options := []verifiable.MakeSDJWTOption{ + verifiable.MakeSDJWTWithHash(signerData.SDJWT.HashAlg), + } + + if signOpts.SDJWTTemplateData != nil { + options = append(options, + verifiable.MakeSDJWTWithVersion(signOpts.SDJWTTemplateData.Version), + verifiable.MakeSDJWTWithRecursiveClaimsObjects(signOpts.SDJWTTemplateData.RecursiveClaims), + verifiable.MakeSDJWTWithAlwaysIncludeObjects(signOpts.SDJWTTemplateData.AlwaysInclude), + verifiable.MakeSDJWTWithNonSelectivelyDisclosableClaims( + signOpts.SDJWTTemplateData.NonSelectivelyDisclosable), + ) + } + + return c.getSDJWTSignedCredential(credential, s, jwsAlgo, method, options...) } return c.getJWTSignedCredential(credential, s, jwsAlgo, method) @@ -268,8 +291,9 @@ func (c *Crypto) getSDJWTSignedCredential( credential *verifiable.Credential, signer vc.SignerAlgorithm, jwsAlgo verifiable.JWSAlgorithm, - digestHashAlgo crypto.Hash, - signingKeyID string) (*verifiable.Credential, error) { + signingKeyID string, + options ...verifiable.MakeSDJWTOption, +) (*verifiable.Credential, error) { jwsAlgName, err := jwsAlgo.Name() if err != nil { return nil, fmt.Errorf("getting JWS algo name error: %w", err) @@ -277,7 +301,8 @@ func (c *Crypto) getSDJWTSignedCredential( joseSigner := jws.NewSigner(signingKeyID, jwsAlgName, signer) - sdjwt, err := credential.MakeSDJWT(joseSigner, signingKeyID, verifiable.MakeSDJWTWithHash(digestHashAlgo)) + // + sdjwt, err := credential.MakeSDJWT(joseSigner, signingKeyID, options...) if err != nil { return nil, fmt.Errorf("make SDJWT credential error: %w", err) } diff --git a/pkg/doc/vc/sdjwt.go b/pkg/doc/vc/sdjwt.go index 39d6245ee..60dcb8725 100644 --- a/pkg/doc/vc/sdjwt.go +++ b/pkg/doc/vc/sdjwt.go @@ -6,10 +6,21 @@ SPDX-License-Identifier: Apache-2.0 package vc -import "crypto" +import ( + "crypto" + + "github.com/hyperledger/aries-framework-go/component/models/sdjwt/common" +) // SDJWT represents the SD-JWT configuration. type SDJWT struct { Enable bool `json:"enable,omitempty"` HashAlg crypto.Hash `json:"hashAlg,omitempty"` } + +type SelectiveDisclosureTemplate struct { // todo + Version common.SDJWTVersion `json:"version"` + AlwaysInclude []string `json:"alwaysInclude"` + RecursiveClaims []string `json:"recursiveClaims"` + NonSelectivelyDisclosable []string `json:"nonSelectivelyDisclosable"` +} diff --git a/pkg/doc/vc/signer.go b/pkg/doc/vc/signer.go index 46535c77f..411115511 100644 --- a/pkg/doc/vc/signer.go +++ b/pkg/doc/vc/signer.go @@ -33,4 +33,5 @@ type Signer struct { KMS keyManager VCStatusListType StatusType // Type of VC status list SDJWT SDJWT + SDJWTemplateData SelectiveDisclosureTemplate } diff --git a/pkg/profile/api.go b/pkg/profile/api.go index 5e5dcbb6a..1b165bcb9 100644 --- a/pkg/profile/api.go +++ b/pkg/profile/api.go @@ -11,6 +11,8 @@ import ( "time" "github.com/hyperledger/aries-framework-go-ext/component/vdr/orb" + + "github.com/hyperledger/aries-framework-go/component/models/sdjwt/common" "github.com/hyperledger/aries-framework-go/pkg/doc/presexch" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" "github.com/hyperledger/aries-framework-go/pkg/kms" @@ -24,7 +26,8 @@ import ( type ( ID = string // ID of the Profile. Version = string // Profile version. - Method string // DID method of the Profile. + + Method string // DID method of the Profile. ) const ( @@ -52,12 +55,20 @@ type Issuer struct { } type CredentialTemplate struct { - Contexts []string `json:"contexts"` - ID string `json:"id"` - Type string `json:"type"` - CredentialSubject json.RawMessage `json:"credentialSubject"` - CredentialDefaultExpirationDuration *time.Duration `json:"credentialDefaultExpirationDuration"` - Checks CredentialTemplateChecks `json:"checks"` + Contexts []string `json:"contexts"` + ID string `json:"id"` + Type string `json:"type"` + CredentialSubject json.RawMessage `json:"credentialSubject"` + CredentialDefaultExpirationDuration *time.Duration `json:"credentialDefaultExpirationDuration"` + Checks CredentialTemplateChecks `json:"checks"` + SdJWT *SelectiveDisclosureTemplate `json:"sdJWT"` +} + +type SelectiveDisclosureTemplate struct { + Version common.SDJWTVersion `json:"version"` + AlwaysInclude []string `json:"alwaysInclude"` + RecursiveClaims []string `json:"recursiveClaims"` + NonSelectivelyDisclosable []string `json:"nonSelectivelyDisclosable"` } type CredentialTemplateChecks struct { diff --git a/pkg/restapi/v1/issuer/controller.go b/pkg/restapi/v1/issuer/controller.go index 373dc346a..dfb41b451 100644 --- a/pkg/restapi/v1/issuer/controller.go +++ b/pkg/restapi/v1/issuer/controller.go @@ -20,15 +20,16 @@ import ( "time" "github.com/google/uuid" - "github.com/hyperledger/aries-framework-go/component/models/ld/validator" - "github.com/hyperledger/aries-framework-go/pkg/doc/jsonld" - util2 "github.com/hyperledger/aries-framework-go/pkg/doc/util" - "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" "github.com/labstack/echo/v4" "github.com/piprate/json-gold/ld" "github.com/samber/lo" "go.opentelemetry.io/otel/trace" + "github.com/hyperledger/aries-framework-go/component/models/ld/validator" + "github.com/hyperledger/aries-framework-go/pkg/doc/jsonld" + util2 "github.com/hyperledger/aries-framework-go/pkg/doc/util" + "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" + "github.com/trustbloc/vcs/pkg/doc/vc" "github.com/trustbloc/vcs/pkg/doc/vc/crypto" vcsverifiable "github.com/trustbloc/vcs/pkg/doc/verifiable" @@ -654,7 +655,13 @@ func (c *Controller) PrepareCredential(e echo.Context) error { return err } - signedCredential, err := c.signCredential(ctx, result.Credential, nil, profile) + var signOpts []crypto.SigningOpts + if result.CredentialTemplate != nil && result.CredentialTemplate.SdJWT != nil { + cast := vc.SelectiveDisclosureTemplate(*result.CredentialTemplate.SdJWT) + signOpts = append(signOpts, crypto.WithSDJWTTemplateData(&cast)) + } + + signedCredential, err := c.signCredential(ctx, result.Credential, signOpts, profile) if err != nil { return err } diff --git a/pkg/service/issuecredential/issuecredential_service.go b/pkg/service/issuecredential/issuecredential_service.go index 8a7f86cd1..fb15ab6cd 100644 --- a/pkg/service/issuecredential/issuecredential_service.go +++ b/pkg/service/issuecredential/issuecredential_service.go @@ -64,7 +64,8 @@ func (s *Service) IssueCredential( ctx context.Context, credential *verifiable.Credential, issuerSigningOpts []crypto.SigningOpts, - profile *profileapi.Issuer) (*verifiable.Credential, error) { + profile *profileapi.Issuer, +) (*verifiable.Credential, error) { kms, err := s.kmsRegistry.GetKeyManager(profile.KMSConfig) if err != nil { return nil, fmt.Errorf("get kms: %w", err) diff --git a/pkg/service/oidc4ci/api.go b/pkg/service/oidc4ci/api.go index 988c0efee..f756f77b5 100644 --- a/pkg/service/oidc4ci/api.go +++ b/pkg/service/oidc4ci/api.go @@ -165,6 +165,7 @@ type PrepareCredentialResult struct { Retry bool EnforceStrictValidation bool OidcFormat vcsverifiable.OIDCFormat + CredentialTemplate *profileapi.CredentialTemplate } type InsertOptions struct { diff --git a/pkg/service/oidc4ci/oidc4ci_service.go b/pkg/service/oidc4ci/oidc4ci_service.go index 89bdbd0e6..94b080ada 100644 --- a/pkg/service/oidc4ci/oidc4ci_service.go +++ b/pkg/service/oidc4ci/oidc4ci_service.go @@ -18,9 +18,10 @@ import ( "time" "github.com/google/uuid" + "github.com/trustbloc/logutil-go/pkg/log" + "github.com/hyperledger/aries-framework-go/pkg/doc/util" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" - "github.com/trustbloc/logutil-go/pkg/log" "github.com/trustbloc/vcs/pkg/dataprotect" "github.com/trustbloc/vcs/pkg/event/spi" @@ -488,6 +489,7 @@ func (s *Service) PrepareCredential( OidcFormat: tx.OIDCCredentialFormat, Retry: false, EnforceStrictValidation: tx.CredentialTemplate.Checks.Strict, + CredentialTemplate: tx.CredentialTemplate, }, nil } diff --git a/test/bdd/features/oidc4vc_api.feature b/test/bdd/features/oidc4vc_api.feature index 6ff005fa1..a519a224b 100644 --- a/test/bdd/features/oidc4vc_api.feature +++ b/test/bdd/features/oidc4vc_api.feature @@ -31,29 +31,30 @@ Feature: OIDC4VC REST API ## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. # | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | pre-registered | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | # -# Scenario Outline: OIDC credential issuance and verification Pre Auth flow -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "" is authorized as a Profile user -# And User holds credential "" with templateID "" -# -# When User interacts with Wallet to initiate credential issuance using pre authorization code flow -# Then credential is issued -# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" -# And Verifier from organization "test_org" retrieves interactions claims -# Then we wait 2 seconds -# And Verifier form organization "test_org" requests deleted interactions claims -# -# Examples: -# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -## SDJWT issuer, JWT verifier, no limit disclosure in PD query. + Scenario Outline: OIDC credential issuance and verification Pre Auth flow + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "" is authorized as a Profile user + And User holds credential "" with templateID "" + + When User interacts with Wallet to initiate credential issuance using pre authorization code flow + Then credential is issued + Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" + And Verifier from organization "test_org" retrieves interactions claims + Then we wait 2 seconds + And Verifier form organization "test_org" requests deleted interactions claims + + Examples: + | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +# SDJWT issuer, JWT verifier, no limit disclosure in PD query. # | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | -## SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. -# | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +# SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. +# | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | + | bank_issuer_sdjwt_v5/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | ## JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. # | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,commuter_classification,registration_city | ## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. # | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | -# + ## Error cases # Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Claims) # Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" @@ -97,25 +98,25 @@ Feature: OIDC4VC REST API # | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | # | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | - Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) - Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" - And Issuer with id "" is authorized as a Profile user - And User holds credential "" with templateID "" - - When User interacts with Wallet to initiate credential issuance using pre authorization code flow - Then credential is issued - And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "verifiable credential doesn't contains proof" error - Then we wait 15 seconds - And Verifier form organization "test_org" requests expired interactions claims - - Examples: - | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -# JWT issuer, JWT verifier, limit disclosure enabled in PD query. - | i_myprofile_ud_es256k_jwt/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -# LDP issuer, LDP verifier, limit disclosure enabled in PD query. - | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +# Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) +# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" +# And Issuer with id "" is authorized as a Profile user +# And User holds credential "" with templateID "" +# +# When User interacts with Wallet to initiate credential issuance using pre authorization code flow +# Then credential is issued +# And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "verifiable credential doesn't contains proof" error +# Then we wait 15 seconds +# And Verifier form organization "test_org" requests expired interactions claims # -# Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) +# Examples: +# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +## JWT issuer, JWT verifier, limit disclosure enabled in PD query. +# | i_myprofile_ud_es256k_jwt/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +## LDP issuer, LDP verifier, limit disclosure enabled in PD query. +# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +## +## Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) # Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" # And Issuer with id "" is authorized as a Profile user # And User holds credential "" with templateID "" diff --git a/test/bdd/fixtures/profile/profiles.json b/test/bdd/fixtures/profile/profiles.json index 8abc2e00c..1db59a3a2 100644 --- a/test/bdd/fixtures/profile/profiles.json +++ b/test/bdd/fixtures/profile/profiles.json @@ -834,6 +834,193 @@ "didDomain": "https://testnet.orb.local", "didServiceAuthToken": "tk1" }, + { + "issuer": { + "id": "bank_issuer_sdjwt_v5", + "version": "v1.0", + "groupID": "group_bank_issuer", + "name": "Bank Issuer", + "organizationID": "f13d1va9lp403pb9lyj89vk55", + "url": "http://vc-rest-echo.trustbloc.local:8075", + "active": true, + "vcConfig": { + "signingAlgorithm": "JsonWebSignature2020", + "signatureRepresentation": 0, + "keyType": "ECDSASecp256k1DER", + "format": "jwt", + "didMethod": "orb", + "status": { + "type": "StatusList2021Entry" + }, + "sdjwt": { + "enable": true, + "hashAlg": 6 + } + }, + "oidcConfig": { + "client_id": "7d4u50e7w6nfq8tfayhzplgjf", + "client_secret_handle": "282ks4fkuqfosus5k0x30abnv", + "issuer_well_known": "http://cognito-mock.trustbloc.local:9229/local_5a9GzRvB/.well-known/openid-configuration", + "scopes_supported": [ + "openid", + "profile" + ], + "grant_types_supported": [ + "authorization_code" + ], + "response_types_supported": [ + "code" + ], + "token_endpoint_auth_methods_supported": [ + "none" + ], + "enable_dynamic_client_registration": true, + "enable_discoverable_client_id_scheme": true, + "pre-authorized_grant_anonymous_access_supported": true, + "wallet_initiated_auth_flow_supported": true, + "claims_endpoint": "https://mock-login-consent.example.com:8099/claim-data?credentialType=UniversityDegreeCredential" + }, + "credentialTemplates": [ + { + "contexts": [ + "https://www.w3.org/2018/credentials/v1", + "https://www.w3.org/2018/credentials/examples/v1" + ], + "type": "UniversityDegreeCredential", + "id": "universityDegreeTemplateID", + "issuer": "did:orb:bank_issuer", + "checks": { + "strict": true + } + }, + { + "contexts": [ + "https://www.w3.org/2018/credentials/v1", + "https://www.w3.org/2018/credentials/examples/v1" + ], + "type": "VerifiedEmployee", + "id": "templateID", + "issuer": "did:orb:bank_issuer", + "checks": { + "strict": true + } + }, + { + "contexts": [ + "https://www.w3.org/2018/credentials/v1", + "https://w3id.org/citizenship/v1" + ], + "type": "PermanentResidentCard", + "id": "permanentResidentCardTemplateID", + "issuer": "did:orb:bank_issuer", + "checks": { + "strict": true + } + }, + { + "contexts": [ + "https://www.w3.org/2018/credentials/v1", + "https://trustbloc.github.io/context/vc/examples-crude-product-v1.jsonld" + ], + "type": "CrudeProductCredential", + "id": "crudeProductCredentialTemplateID", + "issuer": "did:orb:bank_issuer", + "checks": { + "strict": true + }, + "sdJWT" : { + "version" : 5, + "recursiveClaims" : ["chemicalSpecs"], + "nonSelectivelyDisclosable" : ["address"] + } + } + ], + "credentialMetadata": { + "credentials_supported": [ + { + "format": "jwt_vc_json-ld", + "id": "VerifiedEmployee_JWT", + "types": [ + "VerifiableCredential", + "VerifiedEmployee" + ], + "display": [ + { + "name": "Verified Employee", + "locale": "en-US", + "logo": { + "url": "https://example.com/public/logo.png", + "alt_text": "a square logo of a employee verification" + }, + "background_color": "#12107c", + "text_color": "#FFFFFF" + } + ], + "credentialSubject": { + "displayName": { + "display": [ + { + "name": "Employee", + "locale": "en-US" + } + ] + }, + "givenName": { + "display": [ + { + "name": "Given Name", + "locale": "en-US" + } + ] + }, + "jobTitle": { + "display": [ + { + "name": "Job Title", + "locale": "en-US" + } + ] + }, + "surname": { + "display": [ + { + "name": "Surname", + "locale": "en-US" + } + ] + }, + "preferredLanguage": { + "display": [ + { + "name": "Preferred Language", + "locale": "en-US" + } + ] + }, + "mail": { + "display": [ + { + "name": "Mail", + "locale": "en-US" + } + ] + }, + "photo": { + "display": [ + { + "name": "Photo" + } + ] + } + } + } + ] + } + }, + "createDID": true, + "didDomain": "https://testnet.orb.local", + "didServiceAuthToken": "tk1" + }, { "issuer": { "id": "issuer_without_oidc", From 1cc95de02bb3803d9a0227a98640911262e83007 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 15:48:15 +0200 Subject: [PATCH 06/20] feat: update go Signed-off-by: Stas D --- .github/workflows/build.yml | 8 +- .github/workflows/publish.yaml | 6 +- test/bdd/features/oidc4vc_api.feature | 146 +++++++++++++------------- 3 files changed, 80 insertions(+), 80 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e971f527..b93e90dc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ name: "build" env: - GO_VERSION: 1.19 + GO_VERSION: 1.20 on: push: @@ -86,10 +86,10 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - name: Setup Go 1.19 + - name: Setup Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 - uses: actions/checkout@v2 with: { fetch-depth: 0 } @@ -135,7 +135,7 @@ jobs: platforms: linux/amd64,linux/arm64 build-args: | ALPINE_VER=3.15 - GO_VER=1.19 + GO_VER=1.20 push: true tags: | ${{ env.VCS_IMAGE_PREFIX }}:${{ env.IMAGE_TAG }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 312ef5f95..a5be28aad 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -17,10 +17,10 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Setup Go 1.19 + - name: Setup Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.19 + go-version: 1.20 id: go - name: Set ENV vars @@ -49,7 +49,7 @@ jobs: platforms: linux/amd64,linux/arm64 build-args: | ALPINE_VER=3.15 - GO_VER=1.19 + GO_VER=1.20 push: true tags: | ${{ env.VCS_IMAGE_PREFIX }}:${{ env.IMAGE_TAG }} diff --git a/test/bdd/features/oidc4vc_api.feature b/test/bdd/features/oidc4vc_api.feature index a519a224b..acab37427 100644 --- a/test/bdd/features/oidc4vc_api.feature +++ b/test/bdd/features/oidc4vc_api.feature @@ -8,29 +8,29 @@ @oidc4vc_rest Feature: OIDC4VC REST API -# Scenario Outline: OIDC credential issuance and verification Auth flow -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "" is authorized as a Profile user -# And User holds credential "" with templateID "" -# -# When User interacts with Wallet to initiate credential issuance using authorization code flow with client registration method "" -# Then credential is issued -# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" -# And Verifier from organization "test_org" retrieves interactions claims -# Then we wait 2 seconds -# And Verifier form organization "test_org" requests deleted interactions claims -# -# Examples: -# | issuerProfile | credentialType | clientRegistrationMethod | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -## SDJWT issuer, JWT verifier, no limit disclosure in PD query. -# | bank_issuer/v1.0 | UniversityDegreeCredential | dynamic | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | -## SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. -# | bank_issuer/v1.0 | CrudeProductCredential | discoverable | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -## JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. -# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | pre-registered | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | -## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. -# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | pre-registered | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | -# + Scenario Outline: OIDC credential issuance and verification Auth flow + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "" is authorized as a Profile user + And User holds credential "" with templateID "" + + When User interacts with Wallet to initiate credential issuance using authorization code flow with client registration method "" + Then credential is issued + Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" + And Verifier from organization "test_org" retrieves interactions claims + Then we wait 2 seconds + And Verifier form organization "test_org" requests deleted interactions claims + + Examples: + | issuerProfile | credentialType | clientRegistrationMethod | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +# SDJWT issuer, JWT verifier, no limit disclosure in PD query. + | bank_issuer/v1.0 | UniversityDegreeCredential | dynamic | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | +# SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. + | bank_issuer/v1.0 | CrudeProductCredential | discoverable | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +# JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. + | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | pre-registered | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | +# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. + | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | pre-registered | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | + Scenario Outline: OIDC credential issuance and verification Pre Auth flow Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" And Issuer with id "" is authorized as a Profile user @@ -44,59 +44,59 @@ Feature: OIDC4VC REST API And Verifier form organization "test_org" requests deleted interactions claims Examples: - | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | + | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | # SDJWT issuer, JWT verifier, no limit disclosure in PD query. -# | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | + | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | # SDJWT issuer, JWT verifier, limit disclosure and optional fields in PD query. -# | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | - | bank_issuer_sdjwt_v5/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -## JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. -# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,commuter_classification,registration_city | -## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. -# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | + | bank_issuer/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | + | bank_issuer_sdjwt_v5/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +# JWT issuer, JWT verifier, no limit disclosure and optional fields in PD query. + | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,commuter_classification,registration_city | +# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. + | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | -## Error cases -# Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Claims) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user -# Then User interacts with Wallet to initiate credential issuance using pre authorization code flow with invalid claims -# -# Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Field in Presentation Definition) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "i_myprofile_ud_es256k_jwt/v1.0" is authorized as a Profile user -# And User holds credential "CrudeProductCredential" with templateID "crudeProductCredentialTemplateID" -# When User interacts with Wallet to initiate credential issuance using pre authorization code flow -# Then credential is issued -# And User interacts with Verifier and initiate OIDC4VP interaction under "v_myprofile_jwt/v1.0" profile for organization "test_org" with presentation definition ID "32f54163-no-limit-disclosure-optional-fields" and fields "lpr_category_id,commuter_classification,invalidfield" and receives "field invalidfield not found" error -# -# Scenario: OIDC credential issuance and verification Auth flow (Malicious attacker stealing auth code & calling token endpoint with it) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user -# And User holds credential "UniversityDegreeCredential" with templateID "universityDegreeTemplateID" -# Then Malicious attacker stealing auth code from User and using "malicious_attacker_id" ClientID makes /token request and receives "invalid_client" error -# -# Scenario: OIDC credential issuance and verification Pre Auth flow (issuer has pre-authorized_grant_anonymous_access_supported disabled) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "i_disabled_preauth_without_client_id/v1.0" is authorized as a Profile user -# And User holds credential "VerifiedEmployee" with templateID "templateID" -# Then User interacts with Wallet to initiate credential issuance using pre authorization code flow and receives "invalid_client" error -# -# Scenario Outline: OIDC credential issuance and verification Auth flow (Claims Expiry) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "" is authorized as a Profile user -# And User holds credential "" with templateID "" -# When User interacts with Wallet to initiate credential issuance using authorization code flow with wallet-initiated -# Then credential is issued -# Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" -# And Verifier form organization "test_org" waits for interaction succeeded event -# Then we wait 15 seconds -# And Verifier form organization "test_org" requests expired interactions claims -# -# Examples: -# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -# | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | -# | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | -# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | +# Error cases + Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Claims) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user + Then User interacts with Wallet to initiate credential issuance using pre authorization code flow with invalid claims + + Scenario: OIDC credential issuance and verification Pre Auth flow (Invalid Field in Presentation Definition) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "i_myprofile_ud_es256k_jwt/v1.0" is authorized as a Profile user + And User holds credential "CrudeProductCredential" with templateID "crudeProductCredentialTemplateID" + When User interacts with Wallet to initiate credential issuance using pre authorization code flow + Then credential is issued + And User interacts with Verifier and initiate OIDC4VP interaction under "v_myprofile_jwt/v1.0" profile for organization "test_org" with presentation definition ID "32f54163-no-limit-disclosure-optional-fields" and fields "lpr_category_id,commuter_classification,invalidfield" and receives "field invalidfield not found" error + + Scenario: OIDC credential issuance and verification Auth flow (Malicious attacker stealing auth code & calling token endpoint with it) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "bank_issuer/v1.0" is authorized as a Profile user + And User holds credential "UniversityDegreeCredential" with templateID "universityDegreeTemplateID" + Then Malicious attacker stealing auth code from User and using "malicious_attacker_id" ClientID makes /token request and receives "invalid_client" error + + Scenario: OIDC credential issuance and verification Pre Auth flow (issuer has pre-authorized_grant_anonymous_access_supported disabled) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "i_disabled_preauth_without_client_id/v1.0" is authorized as a Profile user + And User holds credential "VerifiedEmployee" with templateID "templateID" + Then User interacts with Wallet to initiate credential issuance using pre authorization code flow and receives "invalid_client" error + + Scenario Outline: OIDC credential issuance and verification Auth flow (Claims Expiry) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "" is authorized as a Profile user + And User holds credential "" with templateID "" + When User interacts with Wallet to initiate credential issuance using authorization code flow with wallet-initiated + Then credential is issued + Then User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" + And Verifier form organization "test_org" waits for interaction succeeded event + Then we wait 15 seconds + And Verifier form organization "test_org" requests expired interactions claims + + Examples: + | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | + | bank_issuer/v1.0 | UniversityDegreeCredential | universityDegreeTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-single-field | degree_type_id | + | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | + | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | # Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) # Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" From ddf67652a1692d63ca886be836a7e56bc87fa412 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 16:08:13 +0200 Subject: [PATCH 07/20] feat: escape Signed-off-by: Stas D --- .github/workflows/build.yml | 8 ++++---- .github/workflows/publish.yaml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b93e90dc9..2e718d073 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -31,7 +31,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ${{ env.GO_VERSION }} + go-version: '${{ env.GO_VERSION }}' - name: Run checks run: | echo $PATH @@ -47,7 +47,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ${{ env.GO_VERSION }} + go-version: '${{ env.GO_VERSION }}' - name: Run unit tests run: make unit-test - name: Upload coverage to Codecov @@ -64,7 +64,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v2 with: - go-version: ${{ env.GO_VERSION }} + go-version: '${{ env.GO_VERSION }}' - name: Run BDD tests run: | echo '127.0.0.1 testnet.orb.local' | sudo tee -a /etc/hosts @@ -89,7 +89,7 @@ jobs: - name: Setup Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' - uses: actions/checkout@v2 with: { fetch-depth: 0 } diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a5be28aad..892de047e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -20,7 +20,7 @@ jobs: - name: Setup Go 1.20 uses: actions/setup-go@v2 with: - go-version: 1.20 + go-version: '1.20' id: go - name: Set ENV vars From 1fc5ad64af22e4483ef4935b23dc82a78f3a6d17 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 16:14:15 +0200 Subject: [PATCH 08/20] fix: version Signed-off-by: Stas D --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2e718d073..617ea0307 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ name: "build" env: - GO_VERSION: 1.20 + GO_VERSION: '1.20' on: push: From 3c0d8b9aaba54c377762241cd6c62510c05b1f46 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 18:27:21 +0200 Subject: [PATCH 09/20] feat: update linter Signed-off-by: Stas D --- scripts/check_lint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/check_lint.sh b/scripts/check_lint.sh index cdae9286c..f79aff767 100755 --- a/scripts/check_lint.sh +++ b/scripts/check_lint.sh @@ -10,7 +10,7 @@ set -e echo "Running $0" DOCKER_CMD=${DOCKER_CMD:-docker} -GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.50.1" +GOLANGCI_LINT_IMAGE="golangci/golangci-lint:v1.53.3" if [ ! $(command -v ${DOCKER_CMD}) ]; then exit 0 From de7aed2d96411b346ed0b40905aa350027be5357 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Tue, 8 Aug 2023 18:36:52 +0200 Subject: [PATCH 10/20] feat: cleanup Signed-off-by: Stas D --- test/bdd/fixtures/profile/profiles.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/bdd/fixtures/profile/profiles.json b/test/bdd/fixtures/profile/profiles.json index 1db59a3a2..7b4cd3dd3 100644 --- a/test/bdd/fixtures/profile/profiles.json +++ b/test/bdd/fixtures/profile/profiles.json @@ -838,8 +838,8 @@ "issuer": { "id": "bank_issuer_sdjwt_v5", "version": "v1.0", - "groupID": "group_bank_issuer", - "name": "Bank Issuer", + "groupID": "group_bank_issuer_sdjwt_v5", + "name": "Bank Issuer SDJWT v5", "organizationID": "f13d1va9lp403pb9lyj89vk55", "url": "http://vc-rest-echo.trustbloc.local:8075", "active": true, @@ -888,7 +888,7 @@ ], "type": "UniversityDegreeCredential", "id": "universityDegreeTemplateID", - "issuer": "did:orb:bank_issuer", + "issuer": "did:orb:bank_issuer_sdjwt_v5", "checks": { "strict": true } @@ -900,7 +900,7 @@ ], "type": "VerifiedEmployee", "id": "templateID", - "issuer": "did:orb:bank_issuer", + "issuer": "did:orb:bank_issuer_sdjwt_v5", "checks": { "strict": true } @@ -912,7 +912,7 @@ ], "type": "PermanentResidentCard", "id": "permanentResidentCardTemplateID", - "issuer": "did:orb:bank_issuer", + "issuer": "did:orb:bank_issuer_sdjwt_v5", "checks": { "strict": true } @@ -924,7 +924,7 @@ ], "type": "CrudeProductCredential", "id": "crudeProductCredentialTemplateID", - "issuer": "did:orb:bank_issuer", + "issuer": "did:orb:bank_issuer_sdjwt_v5", "checks": { "strict": true }, From 928c68476511170cb0e5dfb226864fad3db8855a Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Wed, 9 Aug 2023 11:25:04 +0200 Subject: [PATCH 11/20] feat: cleanup Signed-off-by: Stas D --- pkg/cslmanager/cslmanager_test.go | 19 +++++++------- pkg/doc/vc/crypto/crypto.go | 26 +++++-------------- pkg/doc/vc/sdjwt.go | 12 +++------ pkg/doc/vc/signer.go | 1 - pkg/internal/mock/status/status.go | 12 ++++----- .../wrappers/oidc4vp/oidc4vp_wrapper.go | 9 +++---- .../verifycredential_wrapper.go | 9 +++---- pkg/restapi/v1/issuer/controller.go | 4 --- .../issuecredential_service_test.go | 7 ++--- pkg/service/oidc4ci/oidc4ci_service.go | 6 +---- pkg/service/oidc4vp/oidc4vp_service.go | 11 ++++---- pkg/service/oidc4vp/oidc4vp_service_test.go | 13 +++++----- pkg/service/verifycredential/linkeddomain.go | 8 ++---- .../s3/cslvcstore/csl_vc_store_test.go | 8 ++++-- 14 files changed, 58 insertions(+), 87 deletions(-) diff --git a/pkg/cslmanager/cslmanager_test.go b/pkg/cslmanager/cslmanager_test.go index e2ccc7b60..782488221 100644 --- a/pkg/cslmanager/cslmanager_test.go +++ b/pkg/cslmanager/cslmanager_test.go @@ -22,6 +22,8 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" + "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/pkg/common/model" ariescrypto "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/doc/did" @@ -31,7 +33,6 @@ import ( cryptomock "github.com/hyperledger/aries-framework-go/pkg/mock/crypto" mockkms "github.com/hyperledger/aries-framework-go/pkg/mock/kms" vdrmock "github.com/hyperledger/aries-framework-go/pkg/mock/vdr" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/pkg/doc/vc" "github.com/trustbloc/vcs/pkg/doc/vc/bitstring" @@ -455,7 +456,7 @@ func newMockCSLIndexStore(opts ...func(*mockCSLIndexStore)) *mockCSLIndexStore { return s } -func (m *mockCSLIndexStore) Upsert(ctx context.Context, cslURL string, +func (m *mockCSLIndexStore) Upsert(_ context.Context, cslURL string, cslWrapper *credentialstatus.CSLIndexWrapper) error { if m.createErr != nil { return m.createErr @@ -466,7 +467,7 @@ func (m *mockCSLIndexStore) Upsert(ctx context.Context, cslURL string, return nil } -func (m *mockCSLIndexStore) Get(ctx context.Context, cslURL string) (*credentialstatus.CSLIndexWrapper, error) { +func (m *mockCSLIndexStore) Get(_ context.Context, cslURL string) (*credentialstatus.CSLIndexWrapper, error) { if m.findErr != nil { return nil, m.findErr } @@ -488,14 +489,14 @@ func (m *mockCSLIndexStore) createLatestListID() error { return nil } -func (m *mockCSLIndexStore) UpdateLatestListID(ctx context.Context, id credentialstatus.ListID) error { +func (m *mockCSLIndexStore) UpdateLatestListID(_ context.Context, _ credentialstatus.ListID) error { if m.updateLatestListIDErr != nil { return m.updateLatestListIDErr } return m.createLatestListID() } -func (m *mockCSLIndexStore) GetLatestListID(ctx context.Context) (credentialstatus.ListID, error) { +func (m *mockCSLIndexStore) GetLatestListID(_ context.Context) (credentialstatus.ListID, error) { if m.getLatestListIDErr != nil { return "", m.getLatestListIDErr } @@ -545,7 +546,7 @@ func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper * return nil } -func (m *mockCSLVCStore) Get(ctx context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { +func (m *mockCSLVCStore) Get(_ context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { if m.findErr != nil { return nil, m.findErr } @@ -569,7 +570,7 @@ func newMockVCStatusStore() *mockVCStore { } } -func (m *mockVCStore) Get(ctx context.Context, profileID, profileVersion, vcID string) (*verifiable.TypedID, error) { +func (m *mockVCStore) Get(_ context.Context, profileID, profileVersion, vcID string) (*verifiable.TypedID, error) { v, ok := m.s[fmt.Sprintf("%s_%s_%s", profileID, profileVersion, vcID)] if !ok { return nil, errors.New("data not found") @@ -604,11 +605,11 @@ func (m *mockKMS) SupportedKeyTypes() []kms.KeyType { return nil } -func (m *mockKMS) CreateJWKKey(keyType kms.KeyType) (string, *jwk.JWK, error) { +func (m *mockKMS) CreateJWKKey(_ kms.KeyType) (string, *jwk.JWK, error) { return "", nil, nil } -func (m *mockKMS) CreateCryptoKey(keyType kms.KeyType) (string, interface{}, error) { +func (m *mockKMS) CreateCryptoKey(_ kms.KeyType) (string, interface{}, error) { return "", nil, nil } diff --git a/pkg/doc/vc/crypto/crypto.go b/pkg/doc/vc/crypto/crypto.go index 74c93f122..45177ff7f 100644 --- a/pkg/doc/vc/crypto/crypto.go +++ b/pkg/doc/vc/crypto/crypto.go @@ -92,7 +92,6 @@ type signingOpts struct { Created *time.Time Challenge string Domain string - SDJWTTemplateData *vc.SelectiveDisclosureTemplate } // SigningOpts is signing credential option. @@ -105,12 +104,6 @@ func WithVerificationMethod(verificationMethod string) SigningOpts { } } -func WithSDJWTTemplateData(template *vc.SelectiveDisclosureTemplate) SigningOpts { - return func(opts *signingOpts) { - opts.SDJWTTemplateData = template - } -} - // WithPurpose is an option to pass proof purpose option for signing. func WithPurpose(purpose string) SigningOpts { return func(opts *signingOpts) { @@ -249,16 +242,7 @@ func (c *Crypto) signCredentialJWT( if signerData.SDJWT.Enable { options := []verifiable.MakeSDJWTOption{ verifiable.MakeSDJWTWithHash(signerData.SDJWT.HashAlg), - } - - if signOpts.SDJWTTemplateData != nil { - options = append(options, - verifiable.MakeSDJWTWithVersion(signOpts.SDJWTTemplateData.Version), - verifiable.MakeSDJWTWithRecursiveClaimsObjects(signOpts.SDJWTTemplateData.RecursiveClaims), - verifiable.MakeSDJWTWithAlwaysIncludeObjects(signOpts.SDJWTTemplateData.AlwaysInclude), - verifiable.MakeSDJWTWithNonSelectivelyDisclosableClaims( - signOpts.SDJWTTemplateData.NonSelectivelyDisclosable), - ) + verifiable.MakeSDJWTWithVersion(signerData.SDJWT.Version), } return c.getSDJWTSignedCredential(credential, s, jwsAlgo, method, options...) @@ -412,8 +396,12 @@ func (c *Crypto) getLinkedDataProofContext(signerData *vc.Signer, km keyManager, // verificationMethod from opts takes priority to create signer and verification method. // //nolint:unparam -func (c *Crypto) getSigner(kmsKeyID string, km keyManager, opts *signingOpts, - signatureType vcsverifiable.SignatureType) (vc.SignerAlgorithm, string, error) { +func (c *Crypto) getSigner( + kmsKeyID string, + km keyManager, + _ *signingOpts, + signatureType vcsverifiable.SignatureType, +) (vc.SignerAlgorithm, string, error) { s, err := km.NewVCSigner(kmsKeyID, signatureType) return s, kmsKeyID, err diff --git a/pkg/doc/vc/sdjwt.go b/pkg/doc/vc/sdjwt.go index 60dcb8725..072281fdb 100644 --- a/pkg/doc/vc/sdjwt.go +++ b/pkg/doc/vc/sdjwt.go @@ -14,13 +14,7 @@ import ( // SDJWT represents the SD-JWT configuration. type SDJWT struct { - Enable bool `json:"enable,omitempty"` - HashAlg crypto.Hash `json:"hashAlg,omitempty"` -} - -type SelectiveDisclosureTemplate struct { // todo - Version common.SDJWTVersion `json:"version"` - AlwaysInclude []string `json:"alwaysInclude"` - RecursiveClaims []string `json:"recursiveClaims"` - NonSelectivelyDisclosable []string `json:"nonSelectivelyDisclosable"` + Enable bool `json:"enable,omitempty"` + HashAlg crypto.Hash `json:"hashAlg,omitempty"` + Version common.SDJWTVersion `json:"version,omitempty"` } diff --git a/pkg/doc/vc/signer.go b/pkg/doc/vc/signer.go index 411115511..46535c77f 100644 --- a/pkg/doc/vc/signer.go +++ b/pkg/doc/vc/signer.go @@ -33,5 +33,4 @@ type Signer struct { KMS keyManager VCStatusListType StatusType // Type of VC status list SDJWT SDJWT - SDJWTemplateData SelectiveDisclosureTemplate } diff --git a/pkg/internal/mock/status/status.go b/pkg/internal/mock/status/status.go index c2630dfba..0b0d29434 100644 --- a/pkg/internal/mock/status/status.go +++ b/pkg/internal/mock/status/status.go @@ -17,7 +17,7 @@ type MockStatusProcessorGetter struct { Err error } -func (m *MockStatusProcessorGetter) GetMockStatusProcessor(vcStatusListType vc.StatusType) (vc.StatusProcessor, error) { +func (m *MockStatusProcessorGetter) GetMockStatusProcessor(_ vc.StatusType) (vc.StatusProcessor, error) { return m.StatusProcessor, m.Err } @@ -33,23 +33,23 @@ type MockVCStatusProcessor struct { VCContext string } -func (m *MockVCStatusProcessor) ValidateStatus(vcStatus *verifiable.TypedID) error { +func (m *MockVCStatusProcessor) ValidateStatus(_ *verifiable.TypedID) error { return m.ValidateErr } -func (m *MockVCStatusProcessor) GetStatusVCURI(vcStatus *verifiable.TypedID) (string, error) { +func (m *MockVCStatusProcessor) GetStatusVCURI(_ *verifiable.TypedID) (string, error) { return m.StatusVCURI, m.GetStatusVCURIErr } -func (m *MockVCStatusProcessor) GetStatusListIndex(vcStatus *verifiable.TypedID) (int, error) { +func (m *MockVCStatusProcessor) GetStatusListIndex(_ *verifiable.TypedID) (int, error) { return m.StatusListIndex, m.GetStatusListIndexErr } -func (m *MockVCStatusProcessor) CreateVC(vcID string, size int, profile *vc.Signer) (*verifiable.Credential, error) { +func (m *MockVCStatusProcessor) CreateVC(_ string, _ int, _ *vc.Signer) (*verifiable.Credential, error) { return m.VC, m.CreateVCErr } -func (m *MockVCStatusProcessor) CreateVCStatus(statusListIndex string, vcID string) *verifiable.TypedID { +func (m *MockVCStatusProcessor) CreateVCStatus(_ string, _ string) *verifiable.TypedID { return m.VCStatus } diff --git a/pkg/observability/tracing/wrappers/oidc4vp/oidc4vp_wrapper.go b/pkg/observability/tracing/wrappers/oidc4vp/oidc4vp_wrapper.go index 4397e9951..34413691e 100644 --- a/pkg/observability/tracing/wrappers/oidc4vp/oidc4vp_wrapper.go +++ b/pkg/observability/tracing/wrappers/oidc4vp/oidc4vp_wrapper.go @@ -12,10 +12,11 @@ package oidc4vp import ( "context" - "github.com/hyperledger/aries-framework-go/pkg/doc/presexch" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" + "github.com/hyperledger/aries-framework-go/pkg/doc/presexch" + "github.com/trustbloc/vcs/pkg/observability/tracing/attributeutil" profileapi "github.com/trustbloc/vcs/pkg/profile" "github.com/trustbloc/vcs/pkg/service/oidc4vp" @@ -55,11 +56,7 @@ func (w *Wrapper) VerifyOIDCVerifiablePresentation(ctx context.Context, txID oid span.SetAttributes(attribute.String("tx_id", string(txID))) span.SetAttributes(attributeutil.JSON("token", token, attributeutil.WithRedacted("#.Presentation"))) - if err := w.svc.VerifyOIDCVerifiablePresentation(ctx, txID, token); err != nil { - return err - } - - return nil + return w.svc.VerifyOIDCVerifiablePresentation(ctx, txID, token) } func (w *Wrapper) GetTx(ctx context.Context, id oidc4vp.TxID) (*oidc4vp.Transaction, error) { diff --git a/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go b/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go index 9d984fdf1..323583a43 100644 --- a/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go +++ b/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go @@ -12,10 +12,11 @@ package verifycredential import ( "context" - "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" + "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" + "github.com/trustbloc/vcs/pkg/observability/tracing/attributeutil" profileapi "github.com/trustbloc/vcs/pkg/profile" "github.com/trustbloc/vcs/pkg/service/verifycredential" @@ -85,9 +86,5 @@ func (w *Wrapper) ValidateLinkedDomain(ctx context.Context, signingDID string) e span.SetAttributes(attribute.String("signingDID", signingDID)) - if err := w.svc.ValidateLinkedDomain(ctx, signingDID); err != nil { - return err - } - - return nil + return w.svc.ValidateLinkedDomain(ctx, signingDID) } diff --git a/pkg/restapi/v1/issuer/controller.go b/pkg/restapi/v1/issuer/controller.go index dfb41b451..f9b8a5be7 100644 --- a/pkg/restapi/v1/issuer/controller.go +++ b/pkg/restapi/v1/issuer/controller.go @@ -656,10 +656,6 @@ func (c *Controller) PrepareCredential(e echo.Context) error { } var signOpts []crypto.SigningOpts - if result.CredentialTemplate != nil && result.CredentialTemplate.SdJWT != nil { - cast := vc.SelectiveDisclosureTemplate(*result.CredentialTemplate.SdJWT) - signOpts = append(signOpts, crypto.WithSDJWTTemplateData(&cast)) - } signedCredential, err := c.signCredential(ctx, result.Credential, signOpts, profile) if err != nil { diff --git a/pkg/service/issuecredential/issuecredential_service_test.go b/pkg/service/issuecredential/issuecredential_service_test.go index 28a072332..4bdba68af 100644 --- a/pkg/service/issuecredential/issuecredential_service_test.go +++ b/pkg/service/issuecredential/issuecredential_service_test.go @@ -17,6 +17,8 @@ import ( "time" "github.com/golang/mock/gomock" + "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/pkg/common/model" ariescrypto "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/crypto/tinkcrypto" @@ -30,7 +32,6 @@ import ( ariesmockstorage "github.com/hyperledger/aries-framework-go/pkg/mock/storage" vdrmock "github.com/hyperledger/aries-framework-go/pkg/mock/vdr" "github.com/hyperledger/aries-framework-go/pkg/secretlock/noop" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/pkg/doc/vc" vccrypto "github.com/trustbloc/vcs/pkg/doc/vc/crypto" @@ -454,9 +455,9 @@ func (m *mockVCSKeyManager) NewVCSigner(creator string, signatureType vcs.Signat func (m *mockVCSKeyManager) SupportedKeyTypes() []kms.KeyType { return nil } -func (m *mockVCSKeyManager) CreateJWKKey(keyType kms.KeyType) (string, *jwk.JWK, error) { +func (m *mockVCSKeyManager) CreateJWKKey(_ kms.KeyType) (string, *jwk.JWK, error) { return "", nil, nil } -func (m *mockVCSKeyManager) CreateCryptoKey(keyType kms.KeyType) (string, interface{}, error) { +func (m *mockVCSKeyManager) CreateCryptoKey(_ kms.KeyType) (string, interface{}, error) { return "", nil, nil } diff --git a/pkg/service/oidc4ci/oidc4ci_service.go b/pkg/service/oidc4ci/oidc4ci_service.go index 94b080ada..ef843fa5d 100644 --- a/pkg/service/oidc4ci/oidc4ci_service.go +++ b/pkg/service/oidc4ci/oidc4ci_service.go @@ -158,11 +158,7 @@ func (s *Service) PushAuthorizationDetails( return fmt.Errorf("find tx by op state: %w", err) } - if err = s.updateAuthorizationDetails(ctx, ad, tx); err != nil { - return err - } - - return nil + return s.updateAuthorizationDetails(ctx, ad, tx) } func (s *Service) checkScopes(reqScopes []string, txScopes []string) error { diff --git a/pkg/service/oidc4vp/oidc4vp_service.go b/pkg/service/oidc4vp/oidc4vp_service.go index e71fc48f2..da91ef993 100644 --- a/pkg/service/oidc4vp/oidc4vp_service.go +++ b/pkg/service/oidc4vp/oidc4vp_service.go @@ -17,15 +17,16 @@ import ( "time" "github.com/google/uuid" + "github.com/piprate/json-gold/ld" + "github.com/samber/lo" + "github.com/trustbloc/logutil-go/pkg/log" + "github.com/valyala/fastjson" + "github.com/hyperledger/aries-framework-go/pkg/doc/jose" "github.com/hyperledger/aries-framework-go/pkg/doc/jwt" "github.com/hyperledger/aries-framework-go/pkg/doc/presexch" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" kmsapi "github.com/hyperledger/aries-framework-go/pkg/kms" - "github.com/piprate/json-gold/ld" - "github.com/samber/lo" - "github.com/trustbloc/logutil-go/pkg/log" - "github.com/valyala/fastjson" "github.com/trustbloc/vcs/internal/logfields" "github.com/trustbloc/vcs/pkg/doc/vc" @@ -400,7 +401,7 @@ func (s *Service) VerifyOIDCVerifiablePresentation(ctx context.Context, txID TxI return nil } -func (s *Service) GetTx(ctx context.Context, id TxID) (*Transaction, error) { +func (s *Service) GetTx(_ context.Context, id TxID) (*Transaction, error) { return s.transactionManager.Get(id) } diff --git a/pkg/service/oidc4vp/oidc4vp_service_test.go b/pkg/service/oidc4vp/oidc4vp_service_test.go index 793d6299a..a35f5f2b3 100644 --- a/pkg/service/oidc4vp/oidc4vp_service_test.go +++ b/pkg/service/oidc4vp/oidc4vp_service_test.go @@ -17,6 +17,10 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" + "github.com/jinzhu/copier" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/component/storageutil/mem" ariescrypto "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/crypto/tinkcrypto" @@ -36,9 +40,6 @@ import ( ariesmockstorage "github.com/hyperledger/aries-framework-go/pkg/mock/storage" "github.com/hyperledger/aries-framework-go/pkg/secretlock/noop" "github.com/hyperledger/aries-framework-go/pkg/vdr/fingerprint" - "github.com/jinzhu/copier" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/pkg/doc/vc" vcsverifiable "github.com/trustbloc/vcs/pkg/doc/verifiable" @@ -772,10 +773,10 @@ func (m *mockVCSKeyManager) NewVCSigner(creator string, func (m *mockVCSKeyManager) SupportedKeyTypes() []kms.KeyType { return []kms.KeyType{kms.ED25519Type} } -func (m *mockVCSKeyManager) CreateJWKKey(keyType kms.KeyType) (string, *jwk.JWK, error) { +func (m *mockVCSKeyManager) CreateJWKKey(_ kms.KeyType) (string, *jwk.JWK, error) { return "", nil, nil } -func (m *mockVCSKeyManager) CreateCryptoKey(keyType kms.KeyType) (string, interface{}, error) { +func (m *mockVCSKeyManager) CreateCryptoKey(_ kms.KeyType) (string, interface{}, error) { return "", nil, nil } @@ -783,7 +784,7 @@ type mockEvent struct { err error } -func (m *mockEvent) Publish(ctx context.Context, topic string, messages ...*spi.Event) error { +func (m *mockEvent) Publish(_ context.Context, _ string, _ ...*spi.Event) error { if m.err != nil { return m.err } diff --git a/pkg/service/verifycredential/linkeddomain.go b/pkg/service/verifycredential/linkeddomain.go index 000d94f05..b30118e04 100644 --- a/pkg/service/verifycredential/linkeddomain.go +++ b/pkg/service/verifycredential/linkeddomain.go @@ -52,12 +52,8 @@ func (s *Service) ValidateLinkedDomain(ctx context.Context, signingDID string) e didconfig.WithHTTPClient(s.httpClient), ) - if err = didConfigurationClient.VerifyDIDAndDomain(signingDID, - strings.TrimSuffix(serviceEndpoint.Origins[0], "/")); err != nil { - return err - } - - return nil + return didConfigurationClient.VerifyDIDAndDomain(signingDID, + strings.TrimSuffix(serviceEndpoint.Origins[0], "/")) } return fmt.Errorf("no LinkedDomains service in DID %s", signingDID) diff --git a/pkg/storage/s3/cslvcstore/csl_vc_store_test.go b/pkg/storage/s3/cslvcstore/csl_vc_store_test.go index 285add516..3d6f1a393 100644 --- a/pkg/storage/s3/cslvcstore/csl_vc_store_test.go +++ b/pkg/storage/s3/cslvcstore/csl_vc_store_test.go @@ -17,10 +17,11 @@ import ( "github.com/aws/aws-sdk-go-v2/service/s3" "github.com/aws/aws-sdk-go-v2/service/s3/types" - "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" + "github.com/trustbloc/vcs/pkg/internal/testutil" "github.com/trustbloc/vcs/pkg/service/credentialstatus" ) @@ -65,7 +66,10 @@ func (m *mockS3Uploader) PutObject( } func (m *mockS3Uploader) GetObject( - ctx context.Context, input *s3.GetObjectInput, opts ...func(*s3.Options)) (*s3.GetObjectOutput, error) { + _ context.Context, + input *s3.GetObjectInput, + _ ...func(*s3.Options), +) (*s3.GetObjectOutput, error) { if m.getErr != nil { return nil, m.getErr } From 428430252ec148410a6e9c41f10965efea03c9ef Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Wed, 9 Aug 2023 11:32:12 +0200 Subject: [PATCH 12/20] feat: more cleanup Signed-off-by: Stas D --- pkg/cslmanager/cslmanager_test.go | 2 +- pkg/internal/mock/storage/store.go | 4 ++-- pkg/kms/key/creator_test.go | 5 +++-- pkg/observability/health/mongo/check.go | 6 +----- .../verifycredential/verifycredential_wrapper.go | 12 ++---------- .../eventhandler/eventhandler_service_test.go | 13 +++++++------ .../didconfiguration/didconfiguration_service.go | 2 +- pkg/service/verifycredential/linkeddomain.go | 2 +- .../verifycredential/verifycredential_service.go | 5 +++-- pkg/storage/s3/cslvcstore/csl_vc_store_test.go | 5 ++++- test/bdd/fixtures/profile/profiles.json | 6 +----- 11 files changed, 26 insertions(+), 36 deletions(-) diff --git a/pkg/cslmanager/cslmanager_test.go b/pkg/cslmanager/cslmanager_test.go index 782488221..233313eb1 100644 --- a/pkg/cslmanager/cslmanager_test.go +++ b/pkg/cslmanager/cslmanager_test.go @@ -536,7 +536,7 @@ func (m *mockCSLVCStore) GetCSLURL(issuerURL, issuerID string, listID credential return url.JoinPath(issuerURL, "issuer/profiles", issuerID, "credentials/status", string(listID)) } -func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { +func (m *mockCSLVCStore) Upsert(_ context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { if m.createErr != nil { return m.createErr } diff --git a/pkg/internal/mock/storage/store.go b/pkg/internal/mock/storage/store.go index a4e63392f..227f838c9 100644 --- a/pkg/internal/mock/storage/store.go +++ b/pkg/internal/mock/storage/store.go @@ -32,12 +32,12 @@ func (m *MockProvider) OpenStore(name string) (storage.Store, error) { } // SetStoreConfig is not implemented. -func (m *MockProvider) SetStoreConfig(name string, config storage.StoreConfiguration) error { +func (m *MockProvider) SetStoreConfig(_ string, _ storage.StoreConfiguration) error { panic("implement me") } // GetStoreConfig is not implemented. -func (m *MockProvider) GetStoreConfig(name string) (storage.StoreConfiguration, error) { +func (m *MockProvider) GetStoreConfig(_ string) (storage.StoreConfiguration, error) { panic("implement me") } diff --git a/pkg/kms/key/creator_test.go b/pkg/kms/key/creator_test.go index 6b9fd6500..fd8e259c4 100644 --- a/pkg/kms/key/creator_test.go +++ b/pkg/kms/key/creator_test.go @@ -12,12 +12,13 @@ import ( "errors" "testing" + "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/component/storageutil/mem" "github.com/hyperledger/aries-framework-go/pkg/crypto/primitive/bbs12381g2pub" "github.com/hyperledger/aries-framework-go/pkg/framework/aries" "github.com/hyperledger/aries-framework-go/pkg/kms" mockkms "github.com/hyperledger/aries-framework-go/pkg/mock/kms" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/pkg/kms/key" ) @@ -143,6 +144,6 @@ func newKMS(t *testing.T) kms.KeyManager { type kmsMock struct { } -func (m *kmsMock) CreateAndExportPubKeyBytes(kt kms.KeyType, opts ...kms.KeyOpts) (string, []byte, error) { +func (m *kmsMock) CreateAndExportPubKeyBytes(_ kms.KeyType, _ ...kms.KeyOpts) (string, []byte, error) { return "k1", []byte{}, nil } diff --git a/pkg/observability/health/mongo/check.go b/pkg/observability/health/mongo/check.go index d952762a0..9e90bb57c 100644 --- a/pkg/observability/health/mongo/check.go +++ b/pkg/observability/health/mongo/check.go @@ -26,10 +26,6 @@ func New(uri string) func(ctx context.Context) error { return fmt.Errorf("failed to ping mongodb: %w", err) } - if err = client.Disconnect(ctx); err != nil { - return err - } - - return nil + return client.Disconnect(ctx) } } diff --git a/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go b/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go index 323583a43..ce865493d 100644 --- a/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go +++ b/pkg/observability/tracing/wrappers/verifycredential/verifycredential_wrapper.go @@ -59,11 +59,7 @@ func (w *Wrapper) ValidateCredentialProof(ctx context.Context, vcByte []byte, pr span.SetAttributes(attribute.Bool("vc_in_vp_validation", vcInVPValidation)) span.SetAttributes(attribute.Bool("is_jwt", isJWT)) - if err := w.svc.ValidateCredentialProof(ctx, vcByte, proofChallenge, proofDomain, vcInVPValidation, isJWT); err != nil { - return err - } - - return nil + return w.svc.ValidateCredentialProof(ctx, vcByte, proofChallenge, proofDomain, vcInVPValidation, isJWT) } func (w *Wrapper) ValidateVCStatus(ctx context.Context, vcStatus *verifiable.TypedID, issuer string) error { @@ -73,11 +69,7 @@ func (w *Wrapper) ValidateVCStatus(ctx context.Context, vcStatus *verifiable.Typ span.SetAttributes(attributeutil.JSON("vc_status", vcStatus)) span.SetAttributes(attribute.String("issuer", issuer)) - if err := w.svc.ValidateVCStatus(ctx, vcStatus, issuer); err != nil { - return err - } - - return nil + return w.svc.ValidateVCStatus(ctx, vcStatus, issuer) } func (w *Wrapper) ValidateLinkedDomain(ctx context.Context, signingDID string) error { diff --git a/pkg/service/credentialstatus/eventhandler/eventhandler_service_test.go b/pkg/service/credentialstatus/eventhandler/eventhandler_service_test.go index d94c6254a..d6cc1c212 100644 --- a/pkg/service/credentialstatus/eventhandler/eventhandler_service_test.go +++ b/pkg/service/credentialstatus/eventhandler/eventhandler_service_test.go @@ -17,6 +17,9 @@ import ( "time" "github.com/golang/mock/gomock" + "github.com/piprate/json-gold/ld" + "github.com/stretchr/testify/require" + ariescrypto "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/doc/did" "github.com/hyperledger/aries-framework-go/pkg/doc/jose/jwk" @@ -25,8 +28,6 @@ import ( cryptomock "github.com/hyperledger/aries-framework-go/pkg/mock/crypto" mockkms "github.com/hyperledger/aries-framework-go/pkg/mock/kms" vdrmock "github.com/hyperledger/aries-framework-go/pkg/mock/vdr" - "github.com/piprate/json-gold/ld" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/pkg/doc/vc" "github.com/trustbloc/vcs/pkg/doc/vc/bitstring" @@ -690,7 +691,7 @@ func (m *mockCSLVCStore) GetCSLURL(issuerURL, issuerID string, listID credential return url.JoinPath(issuerURL, "issuer/profiles", issuerID, "credentials/status", string(listID)) } -func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { +func (m *mockCSLVCStore) Upsert(_ context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { if m.createErr != nil { return m.createErr } @@ -700,7 +701,7 @@ func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper * return nil } -func (m *mockCSLVCStore) Get(ctx context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { +func (m *mockCSLVCStore) Get(_ context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { if m.findErr != nil { return nil, m.findErr } @@ -789,10 +790,10 @@ func (m *mockKMS) SupportedKeyTypes() []kms.KeyType { return nil } -func (m *mockKMS) CreateJWKKey(keyType kms.KeyType) (string, *jwk.JWK, error) { +func (m *mockKMS) CreateJWKKey(_ kms.KeyType) (string, *jwk.JWK, error) { return "", nil, nil } -func (m *mockKMS) CreateCryptoKey(keyType kms.KeyType) (string, interface{}, error) { +func (m *mockKMS) CreateCryptoKey(_ kms.KeyType) (string, interface{}, error) { return "", nil, nil } diff --git a/pkg/service/didconfiguration/didconfiguration_service.go b/pkg/service/didconfiguration/didconfiguration_service.go index 8d937fc2c..ee6589f20 100644 --- a/pkg/service/didconfiguration/didconfiguration_service.go +++ b/pkg/service/didconfiguration/didconfiguration_service.go @@ -91,7 +91,7 @@ func New( //nolint:funlen func (s *Service) DidConfig( - ctx context.Context, + _ context.Context, profileType ProfileType, profileID string, profileVersion string, diff --git a/pkg/service/verifycredential/linkeddomain.go b/pkg/service/verifycredential/linkeddomain.go index b30118e04..7903e42ca 100644 --- a/pkg/service/verifycredential/linkeddomain.go +++ b/pkg/service/verifycredential/linkeddomain.go @@ -23,7 +23,7 @@ type serviceEndpoint struct { Origins []string `json:"origins"` } -func (s *Service) ValidateLinkedDomain(ctx context.Context, signingDID string) error { +func (s *Service) ValidateLinkedDomain(_ context.Context, signingDID string) error { didDocResolution, vdrErr := s.vdr.Resolve(signingDID) if vdrErr != nil { return fmt.Errorf("failed to resolve DID %s, err: %w", signingDID, vdrErr) diff --git a/pkg/service/verifycredential/verifycredential_service.go b/pkg/service/verifycredential/verifycredential_service.go index 5a413ebdb..9be17fe25 100644 --- a/pkg/service/verifycredential/verifycredential_service.go +++ b/pkg/service/verifycredential/verifycredential_service.go @@ -15,9 +15,10 @@ import ( "fmt" "net/http" + "github.com/piprate/json-gold/ld" + "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" vdrapi "github.com/hyperledger/aries-framework-go/pkg/framework/aries/api/vdr" - "github.com/piprate/json-gold/ld" "github.com/trustbloc/vcs/pkg/doc/vc" "github.com/trustbloc/vcs/pkg/doc/vc/bitstring" @@ -129,7 +130,7 @@ func (s *Service) parseAndVerifyVC(vcBytes []byte, isJWT bool) (*verifiable.Cred } // ValidateCredentialProof validate credential proof. -func (s *Service) ValidateCredentialProof(ctx context.Context, vcByte []byte, proofChallenge, proofDomain string, +func (s *Service) ValidateCredentialProof(_ context.Context, vcByte []byte, proofChallenge, proofDomain string, vcInVPValidation, isJWT bool) error { // nolint: lll,gocyclo credential, err := s.parseAndVerifyVC(vcByte, isJWT) if err != nil { diff --git a/pkg/storage/s3/cslvcstore/csl_vc_store_test.go b/pkg/storage/s3/cslvcstore/csl_vc_store_test.go index 3d6f1a393..e5f50ccf1 100644 --- a/pkg/storage/s3/cslvcstore/csl_vc_store_test.go +++ b/pkg/storage/s3/cslvcstore/csl_vc_store_test.go @@ -47,7 +47,10 @@ type mockS3Uploader struct { } func (m *mockS3Uploader) PutObject( - ctx context.Context, input *s3.PutObjectInput, opts ...func(*s3.Options)) (*s3.PutObjectOutput, error) { + _ context.Context, + input *s3.PutObjectInput, + _ ...func(*s3.Options), +) (*s3.PutObjectOutput, error) { if m.putErr != nil { return nil, m.putErr } diff --git a/test/bdd/fixtures/profile/profiles.json b/test/bdd/fixtures/profile/profiles.json index 7b4cd3dd3..3233c0e22 100644 --- a/test/bdd/fixtures/profile/profiles.json +++ b/test/bdd/fixtures/profile/profiles.json @@ -853,6 +853,7 @@ "type": "StatusList2021Entry" }, "sdjwt": { + "version" : 5, "enable": true, "hashAlg": 6 } @@ -927,11 +928,6 @@ "issuer": "did:orb:bank_issuer_sdjwt_v5", "checks": { "strict": true - }, - "sdJWT" : { - "version" : 5, - "recursiveClaims" : ["chemicalSpecs"], - "nonSelectivelyDisclosable" : ["address"] } } ], From e79388e915b02e45b0117170f36c47267a5adb4f Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Wed, 9 Aug 2023 13:31:32 +0200 Subject: [PATCH 13/20] fix: bdd tests Signed-off-by: Stas D --- component/profile/reader/file/creator.go | 25 ++++++--- component/profile/reader/file/reader.go | 9 ++-- test/bdd/features/oidc4vc_api.feature | 68 ++++++++++++------------ 3 files changed, 58 insertions(+), 44 deletions(-) diff --git a/component/profile/reader/file/creator.go b/component/profile/reader/file/creator.go index 617710ebd..4a77b4c83 100644 --- a/component/profile/reader/file/creator.go +++ b/component/profile/reader/file/creator.go @@ -13,6 +13,7 @@ import ( "github.com/hyperledger/aries-framework-go-ext/component/vdr/longform" "github.com/hyperledger/aries-framework-go-ext/component/vdr/orb" + "github.com/hyperledger/aries-framework-go/pkg/common/model" "github.com/hyperledger/aries-framework-go/pkg/doc/did" "github.com/hyperledger/aries-framework-go/pkg/doc/jose/jwk" @@ -92,8 +93,12 @@ func (c *Creator) publicDID(method profileapi.Method, verificationMethodType vcs return methodFn(verificationMethodType, keyType, km, didDomain, difDidOrigin) } -func (c *Creator) createDID(verificationMethodType vcsverifiable.SignatureType, keyType kms.KeyType, - km KeysCreator, didDomain, difDidOrigin string) (*createResult, error) { //nolint: unparam +func (c *Creator) createDID( + verificationMethodType vcsverifiable.SignatureType, + keyType kms.KeyType, + km KeysCreator, + _, _ string, +) (*createResult, error) { //nolint: unparam methods, err := newVerMethods(3, km, verificationMethodType, keyType) // nolint:gomnd if err != nil { return nil, fmt.Errorf("did:orb: failed to create verification methods: %w", err) @@ -143,8 +148,12 @@ func (c *Creator) createDID(verificationMethodType vcsverifiable.SignatureType, }, nil } -func (c *Creator) keyDID(verificationMethodType vcsverifiable.SignatureType, keyType kms.KeyType, - km KeysCreator, didDomain, difDidOrigin string) (*createResult, error) { //nolint: unparam +func (c *Creator) keyDID( + verificationMethodType vcsverifiable.SignatureType, + keyType kms.KeyType, + km KeysCreator, + _, _ string, +) (*createResult, error) { //nolint: unparam verMethod, err := newVerMethods(1, km, verificationMethodType, keyType) if err != nil { return nil, fmt.Errorf("did:key: failed to create new ver method: %w", err) @@ -168,8 +177,12 @@ func (c *Creator) keyDID(verificationMethodType vcsverifiable.SignatureType, key }, nil } -func (c *Creator) jwkDID(verificationMethodType vcsverifiable.SignatureType, keyType kms.KeyType, - km KeysCreator, didDomain, difDidOrigin string) (*createResult, error) { //nolint: unparam +func (c *Creator) jwkDID( + verificationMethodType vcsverifiable.SignatureType, + keyType kms.KeyType, + km KeysCreator, + _, _ string, +) (*createResult, error) { //nolint: unparam verMethod, err := newVerMethods(1, km, verificationMethodType, keyType) if err != nil { return nil, fmt.Errorf("did:key: failed to create new ver method: %w", err) diff --git a/component/profile/reader/file/reader.go b/component/profile/reader/file/reader.go index 2b52d3e0d..7469670ee 100644 --- a/component/profile/reader/file/reader.go +++ b/component/profile/reader/file/reader.go @@ -19,11 +19,12 @@ import ( "github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk" "github.com/hyperledger/aries-framework-go-ext/component/vdr/longform" "github.com/hyperledger/aries-framework-go-ext/component/vdr/orb" - vdrpkg "github.com/hyperledger/aries-framework-go/pkg/vdr" - "github.com/hyperledger/aries-framework-go/pkg/vdr/key" "github.com/spf13/cobra" cmdutils "github.com/trustbloc/cmdutil-go/pkg/utils/cmd" //nolint:typecheck "github.com/trustbloc/logutil-go/pkg/log" //nolint:typecheck + + vdrpkg "github.com/hyperledger/aries-framework-go/pkg/vdr" + "github.com/hyperledger/aries-framework-go/pkg/vdr/key" vcskms "github.com/trustbloc/vcs/pkg/kms" profileapi "github.com/trustbloc/vcs/pkg/profile" ) @@ -134,7 +135,7 @@ func (p *IssuerReader) GetProfile( } // GetAllProfiles returns all profiles with given organization id. -func (p *IssuerReader) GetAllProfiles(orgID string) ([]*profileapi.Issuer, error) { +func (p *IssuerReader) GetAllProfiles(_ string) ([]*profileapi.Issuer, error) { return nil, nil } @@ -195,7 +196,7 @@ func (p *VerifierReader) GetProfile( } // GetAllProfiles returns all profiles with given organization id. -func (p *verifierProfile) GetAllProfiles(orgID string) ([]*profileapi.Verifier, error) { +func (p *verifierProfile) GetAllProfiles(_ string) ([]*profileapi.Verifier, error) { return nil, nil } diff --git a/test/bdd/features/oidc4vc_api.feature b/test/bdd/features/oidc4vc_api.feature index acab37427..269482c7b 100644 --- a/test/bdd/features/oidc4vc_api.feature +++ b/test/bdd/features/oidc4vc_api.feature @@ -98,38 +98,38 @@ Feature: OIDC4VC REST API | i_myprofile_ud_es256k_jwt/v1.0 | PermanentResidentCard | permanentResidentCardTemplateID | v_myprofile_jwt/v1.0 | 32f54163-no-limit-disclosure-optional-fields | lpr_category_id,registration_city,commuter_classification | | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | -# Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "" is authorized as a Profile user -# And User holds credential "" with templateID "" -# -# When User interacts with Wallet to initiate credential issuance using pre authorization code flow -# Then credential is issued -# And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "verifiable credential doesn't contains proof" error -# Then we wait 15 seconds -# And Verifier form organization "test_org" requests expired interactions claims -# -# Examples: -# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -## JWT issuer, JWT verifier, limit disclosure enabled in PD query. -# | i_myprofile_ud_es256k_jwt/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -## LDP issuer, LDP verifier, limit disclosure enabled in PD query. -# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | -## -## Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) -# Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" -# And Issuer with id "" is authorized as a Profile user -# And User holds credential "" with templateID "" -# -# When User interacts with Wallet to initiate credential issuance using pre authorization code flow -# Then credential is issued -# And wallet configured to use hardcoded vp_token format "jwt" for OIDC4VP interaction -# And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "profile does not support jwt vp_token format" error -# Then we wait 15 seconds -# And Verifier form organization "test_org" requests expired interactions claims -# -# Examples: -# | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | -## LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. -# | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | + Scenario Outline: OIDC credential issuance and verification Pre Auth flow (Limit Disclosures enabled for JWT and LDP VC) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "" is authorized as a Profile user + And User holds credential "" with templateID "" + + When User interacts with Wallet to initiate credential issuance using pre authorization code flow + Then credential is issued + And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "query vc using presentation definition: no result found" error + Then we wait 15 seconds + And Verifier form organization "test_org" requests expired interactions claims + + Examples: + | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +# JWT issuer, JWT verifier, limit disclosure enabled in PD query. + | i_myprofile_ud_es256k_jwt/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_jwt/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | +# LDP issuer, LDP verifier, limit disclosure enabled in PD query. + | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | 3c8b1d9a-limit-disclosure-optional-fields | unit_of_measure_barrel,api_gravity,category,supplier_address | # + Scenario Outline: OIDC credential issuance and verification Pre Auth flow (OIDC4VP flow - unsupported vp_token format) + Given Organization "test_org" has been authorized with client id "f13d1va9lp403pb9lyj89vk55" and secret "ejqxi9jb1vew2jbdnogpjcgrz" + And Issuer with id "" is authorized as a Profile user + And User holds credential "" with templateID "" + + When User interacts with Wallet to initiate credential issuance using pre authorization code flow + Then credential is issued + And wallet configured to use hardcoded vp_token format "jwt" for OIDC4VP interaction + And User interacts with Verifier and initiate OIDC4VP interaction under "" profile for organization "test_org" with presentation definition ID "" and fields "" and receives "profile does not support jwt vp_token format" error + Then we wait 15 seconds + And Verifier form organization "test_org" requests expired interactions claims + + Examples: + | issuerProfile | credentialType | credentialTemplate | verifierProfile | presentationDefinitionID | fields | +# LDP issuer, LDP verifier, no limit disclosure and schema match in PD query. + | i_myprofile_cmtr_p256_ldp/v1.0 | CrudeProductCredential | crudeProductCredentialTemplateID | v_myprofile_ldp/v1.0 | lp403pb9-schema-match | schema_id | + From b090833b0ccb011d30be9bbdd1b49b99710466a4 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Wed, 9 Aug 2023 15:01:45 +0200 Subject: [PATCH 14/20] fix: lint Signed-off-by: Stas D --- .../credentialstatus_service_test.go | 25 ++++++++++--------- .../credentialstatus/identityhub_test.go | 5 ++-- component/profile/reader/file/creator.go | 7 ++++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/component/credentialstatus/credentialstatus_service_test.go b/component/credentialstatus/credentialstatus_service_test.go index 76ba6014f..64ad9577c 100644 --- a/component/credentialstatus/credentialstatus_service_test.go +++ b/component/credentialstatus/credentialstatus_service_test.go @@ -21,6 +21,9 @@ import ( "github.com/golang/mock/gomock" "github.com/google/uuid" "github.com/hyperledger/aries-framework-go-ext/component/vdr/longform" + "github.com/piprate/json-gold/ld" + "github.com/stretchr/testify/require" + ariescrypto "github.com/hyperledger/aries-framework-go/pkg/crypto" "github.com/hyperledger/aries-framework-go/pkg/doc/jose/jwk" "github.com/hyperledger/aries-framework-go/pkg/doc/verifiable" @@ -30,8 +33,6 @@ import ( mockkms "github.com/hyperledger/aries-framework-go/pkg/mock/kms" vdrmock "github.com/hyperledger/aries-framework-go/pkg/mock/vdr" vdr2 "github.com/hyperledger/aries-framework-go/pkg/vdr" - "github.com/piprate/json-gold/ld" - "github.com/stretchr/testify/require" "github.com/trustbloc/vcs/component/credentialstatus/internal/testutil" "github.com/trustbloc/vcs/pkg/cslmanager" @@ -815,7 +816,7 @@ type mockedEventPublisher struct { eventHandler eventHandler } -func (ep *mockedEventPublisher) Publish(ctx context.Context, topic string, messages ...*spi.Event) error { +func (ep *mockedEventPublisher) Publish(ctx context.Context, _ string, messages ...*spi.Event) error { var err error for _, event := range messages { @@ -911,7 +912,7 @@ func newMockCSLIndexStore() *mockCSLIndexStore { } func (m *mockCSLIndexStore) Upsert( - ctx context.Context, cslURL string, cslWrapper *credentialstatus.CSLIndexWrapper) error { + _ context.Context, cslURL string, cslWrapper *credentialstatus.CSLIndexWrapper) error { if m.createErr != nil { return m.createErr } @@ -921,7 +922,7 @@ func (m *mockCSLIndexStore) Upsert( return nil } -func (m *mockCSLIndexStore) Get(ctx context.Context, cslURL string) (*credentialstatus.CSLIndexWrapper, error) { +func (m *mockCSLIndexStore) Get(_ context.Context, cslURL string) (*credentialstatus.CSLIndexWrapper, error) { if m.findErr != nil { return nil, m.findErr } @@ -943,14 +944,14 @@ func (m *mockCSLIndexStore) createLatestListID() error { return nil } -func (m *mockCSLIndexStore) UpdateLatestListID(ctx context.Context, id credentialstatus.ListID) error { +func (m *mockCSLIndexStore) UpdateLatestListID(_ context.Context, _ credentialstatus.ListID) error { if m.updateLatestListIDErr != nil { return m.updateLatestListIDErr } return m.createLatestListID() } -func (m *mockCSLIndexStore) GetLatestListID(ctx context.Context) (credentialstatus.ListID, error) { +func (m *mockCSLIndexStore) GetLatestListID(_ context.Context) (credentialstatus.ListID, error) { if m.getLatestListIDErr != nil { return "", m.getLatestListIDErr } @@ -990,7 +991,7 @@ func (m *mockCSLVCStore) GetCSLURL(issuerURL, issuerID string, listID credential return url.JoinPath(issuerURL, "issuer/profiles", issuerID, "credentials/status", string(listID)) } -func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { +func (m *mockCSLVCStore) Upsert(_ context.Context, cslURL string, cslWrapper *credentialstatus.CSLVCWrapper) error { if m.createErr != nil { return m.createErr } @@ -1000,7 +1001,7 @@ func (m *mockCSLVCStore) Upsert(ctx context.Context, cslURL string, cslWrapper * return nil } -func (m *mockCSLVCStore) Get(ctx context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { +func (m *mockCSLVCStore) Get(_ context.Context, cslURL string) (*credentialstatus.CSLVCWrapper, error) { if m.findErr != nil { return nil, m.findErr } @@ -1024,7 +1025,7 @@ func newMockVCStatusStore() *mockVCStore { } } -func (m *mockVCStore) Get(ctx context.Context, profileID, profileVersion, vcID string) (*verifiable.TypedID, error) { +func (m *mockVCStore) Get(_ context.Context, profileID, profileVersion, vcID string) (*verifiable.TypedID, error) { v, ok := m.s[fmt.Sprintf("%s_%s_%s", profileID, profileVersion, vcID)] if !ok { return nil, errors.New("data not found") @@ -1059,10 +1060,10 @@ func (m *mockKMS) SupportedKeyTypes() []kms.KeyType { return nil } -func (m *mockKMS) CreateJWKKey(keyType kms.KeyType) (string, *jwk.JWK, error) { +func (m *mockKMS) CreateJWKKey(_ kms.KeyType) (string, *jwk.JWK, error) { return "", nil, nil } -func (m *mockKMS) CreateCryptoKey(keyType kms.KeyType) (string, interface{}, error) { +func (m *mockKMS) CreateCryptoKey(_ kms.KeyType) (string, interface{}, error) { return "", nil, nil } diff --git a/component/credentialstatus/identityhub_test.go b/component/credentialstatus/identityhub_test.go index 76232e35f..44d749e01 100644 --- a/component/credentialstatus/identityhub_test.go +++ b/component/credentialstatus/identityhub_test.go @@ -22,12 +22,13 @@ import ( "time" "github.com/hyperledger/aries-framework-go-ext/component/vdr/longform" + "github.com/stretchr/testify/require" + "github.com/hyperledger/aries-framework-go/pkg/common/model" "github.com/hyperledger/aries-framework-go/pkg/doc/did" "github.com/hyperledger/aries-framework-go/pkg/framework/aries/api/vdr" vdrmock "github.com/hyperledger/aries-framework-go/pkg/mock/vdr" vdr2 "github.com/hyperledger/aries-framework-go/pkg/vdr" - "github.com/stretchr/testify/require" ) const ( @@ -52,7 +53,7 @@ type mockHTTPClient struct { doErr error } -func (m *mockHTTPClient) Do(req *http.Request) (*http.Response, error) { +func (m *mockHTTPClient) Do(_ *http.Request) (*http.Response, error) { return m.doValue, m.doErr } diff --git a/component/profile/reader/file/creator.go b/component/profile/reader/file/creator.go index 4a77b4c83..29884c62d 100644 --- a/component/profile/reader/file/creator.go +++ b/component/profile/reader/file/creator.go @@ -231,8 +231,11 @@ type serviceEndpointData struct { Origins []string `json:"origins"` } -func (c *Creator) ionDID(verificationMethodType vcsverifiable.SignatureType, keyType kms.KeyType, - km KeysCreator, didDomain, difDidOrigin string) (*createResult, error) { //nolint:unparam +func (c *Creator) ionDID( + verificationMethodType vcsverifiable.SignatureType, + keyType kms.KeyType, + km KeysCreator, _, difDidOrigin string, +) (*createResult, error) { //nolint:unparam verMethod, err := newVerMethods(1, km, verificationMethodType, keyType) if err != nil { return nil, fmt.Errorf("did:ion failed to create new ver method: %w", err) From 109201ab695e94f50dcee379021c3080b2dff8b0 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 16:59:43 +0200 Subject: [PATCH 15/20] feat: change array credential --- test/bdd/loginconsent/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/bdd/loginconsent/server.go b/test/bdd/loginconsent/server.go index 72f5f52f4..acd492c2c 100644 --- a/test/bdd/loginconsent/server.go +++ b/test/bdd/loginconsent/server.go @@ -421,7 +421,7 @@ func (s *server) claimDataHandler(w http.ResponseWriter, r *http.Request) { "gasOilAt650To980F": "", "residAt980F": "41", "deemedButane": "1.9", - "tan": "1.05", + "tan": []string{"1.05", "1.06"}, "ron": "", "mon": "", "boilingPoint": "", From fce5663bf44033b156823e0866682752f850da96 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 17:16:16 +0200 Subject: [PATCH 16/20] feat: update aries --- Makefile | 2 +- cmd/vc-rest/go.mod | 6 +----- cmd/vc-rest/go.sum | 4 ++++ component/credentialstatus/go.mod | 7 +------ component/credentialstatus/go.sum | 6 ++++-- component/event/go.mod | 6 +----- component/event/go.sum | 4 ++++ component/profile/reader/file/go.mod | 7 +------ component/profile/reader/file/go.sum | 6 ++++-- component/wallet-cli/go.mod | 6 +----- component/wallet-cli/go.sum | 4 ++++ go.mod | 6 +----- go.sum | 4 ++++ test/bdd/go.mod | 6 +----- test/bdd/go.sum | 4 ++++ test/stress/go.mod | 6 +----- test/stress/go.sum | 4 ++++ 17 files changed, 41 insertions(+), 47 deletions(-) diff --git a/Makefile b/Makefile index 504608761..163d1fa1f 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ VC_REST_IMAGE_NAME ?= trustbloc/vc-server VCS_STRESS_IMAGE_NAME ?= trustbloc/vcs-stress WEBHOOK_IMAGE_NAME ?= vcs/sample-webhook OPENAPIGEN_VERSION ?=v1.11.0 -ARIES_FRAMEWORK_VERSION = 0445e9664e8e53e834a2d0087a7f7ae297829903 +ARIES_FRAMEWORK_VERSION = main MOCK_VERSION ?=v1.7.0-rc.1 GO_IMAGE ?=golang ALPINE_IMAGE ?=alpine diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod index 1c95fb9ec..7bb64344c 100644 --- a/cmd/vc-rest/go.mod +++ b/cmd/vc-rest/go.mod @@ -12,7 +12,7 @@ require ( github.com/deepmap/oapi-codegen v1.11.0 github.com/dgraph-io/ristretto v0.1.1 github.com/google/uuid v1.3.0 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221213152252-f0c83a5a922c @@ -248,8 +248,4 @@ replace ( github.com/trustbloc/vcs/pkg/profile/reader => ../../component/profile/reader/file ) -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - go 1.19 diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum index 18210bdec..21e74787c 100644 --- a/cmd/vc-rest/go.sum +++ b/cmd/vc-rest/go.sum @@ -574,6 +574,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -590,6 +592,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod index e2ed41212..8c087b09b 100644 --- a/component/credentialstatus/go.mod +++ b/component/credentialstatus/go.mod @@ -9,7 +9,7 @@ go 1.19 require ( github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f github.com/spf13/cobra v1.7.0 @@ -153,7 +153,6 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -169,8 +168,4 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - replace github.com/trustbloc/vcs => ../../ diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum index 4444e7ce6..762a0d179 100644 --- a/component/credentialstatus/go.sum +++ b/component/credentialstatus/go.sum @@ -503,6 +503,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 h1:MbWVC1HQEAn5yw5DLs4D7kdcM06y6ZiN4r3ZtvDzxWE= @@ -515,6 +517,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1074,8 +1078,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= -golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/event/go.mod b/component/event/go.mod index 8fb3ea730..9a5bc6f23 100644 --- a/component/event/go.mod +++ b/component/event/go.mod @@ -6,7 +6,7 @@ module github.com/trustbloc/vcs/component/event go 1.19 require ( - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f github.com/samber/lo v1.38.1 github.com/spf13/cobra v1.7.0 @@ -169,8 +169,4 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - replace github.com/trustbloc/vcs => ../../ diff --git a/component/event/go.sum b/component/event/go.sum index 40542c899..f938b32a4 100644 --- a/component/event/go.sum +++ b/component/event/go.sum @@ -503,6 +503,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 h1:AiQyIn1EJd8FN/2nxk3Z3zIMI5ZOgqV+HWRK2uN2Ktg= @@ -513,6 +515,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod index 35d00dabe..c39881792 100644 --- a/component/profile/reader/file/go.mod +++ b/component/profile/reader/file/go.mod @@ -7,7 +7,7 @@ go 1.19 require ( github.com/hashicorp/go-version v1.2.0 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221213152252-f0c83a5a922c @@ -155,7 +155,6 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect @@ -171,8 +170,4 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/hyperledger/aries-framework-go => ./../../../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../../../build/local-aries/component/models - replace github.com/trustbloc/vcs => ../../../../ diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum index 4fd7fce6a..f652a11b3 100644 --- a/component/profile/reader/file/go.sum +++ b/component/profile/reader/file/go.sum @@ -504,6 +504,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -518,6 +520,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1079,8 +1083,6 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= -golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= -golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod index fabf85a4b..67912cdc1 100644 --- a/component/wallet-cli/go.mod +++ b/component/wallet-cli/go.mod @@ -6,16 +6,12 @@ module github.com/trustbloc/vcs/component/wallet-cli go 1.19 -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - require ( github.com/cli/browser v1.1.0 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.0 github.com/henvic/httpretty v0.1.0 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum index d34acb921..624ee957c 100644 --- a/component/wallet-cli/go.sum +++ b/component/wallet-cli/go.sum @@ -537,6 +537,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -553,6 +555,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= diff --git a/go.mod b/go.mod index 0975f3087..39b4fd85f 100644 --- a/go.mod +++ b/go.mod @@ -6,10 +6,6 @@ module github.com/trustbloc/vcs go 1.20 -replace github.com/hyperledger/aries-framework-go => ./build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./build/local-aries/component/models - require ( github.com/alexliesenfeld/health v0.6.0 github.com/aws/aws-sdk-go-v2 v1.17.7 @@ -25,7 +21,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/tink/go v1.7.0 github.com/google/uuid v1.3.0 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 diff --git a/go.sum b/go.sum index 0a4196c90..f789f3f1c 100644 --- a/go.sum +++ b/go.sum @@ -577,6 +577,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 h1:AiQyIn1EJd8FN/2nxk3Z3zIMI5ZOgqV+HWRK2uN2Ktg= @@ -589,6 +591,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/test/bdd/go.mod b/test/bdd/go.mod index c2c16e60f..f0c093b38 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -11,7 +11,7 @@ require ( github.com/google/uuid v1.3.0 github.com/gorilla/mux v1.8.0 github.com/greenpau/go-calculator v1.0.1 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 github.com/jedib0t/go-pretty/v6 v6.4.6 @@ -27,10 +27,6 @@ require ( golang.org/x/oauth2 v0.7.0 ) -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect github.com/PaesslerAG/gval v1.2.0 // indirect diff --git a/test/bdd/go.sum b/test/bdd/go.sum index a02101563..a558c59bd 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -570,6 +570,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -586,6 +588,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= diff --git a/test/stress/go.mod b/test/stress/go.mod index f48607c1d..129781af1 100644 --- a/test/stress/go.mod +++ b/test/stress/go.mod @@ -9,7 +9,7 @@ go 1.19 require ( github.com/google/uuid v1.3.0 github.com/greenpau/go-calculator v1.0.1 - github.com/hyperledger/aries-framework-go v0.3.3-0.20230615070726-b02a3e01fc44 + github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/imroc/req/v3 v3.34.0 github.com/joho/godotenv v1.4.0 github.com/labstack/echo/v4 v4.9.0 @@ -21,10 +21,6 @@ require ( golang.org/x/oauth2 v0.7.0 ) -replace github.com/hyperledger/aries-framework-go => ./../../build/local-aries - -replace github.com/hyperledger/aries-framework-go/component/models => ./../../build/local-aries/component/models - require ( github.com/IBM/mathlib v0.0.3-0.20230605104224-932ab92f2ce0 // indirect github.com/PaesslerAG/gval v1.2.0 // indirect diff --git a/test/stress/go.sum b/test/stress/go.sum index c8e708b24..a8d527710 100644 --- a/test/stress/go.sum +++ b/test/stress/go.sum @@ -551,6 +551,8 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/huandu/xstrings v1.0.0/go.mod h1:4qWG/gcEcfX4z/mBDHJ++3ReCw9ibxbsNJbcucJdbSo= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 h1:Eg5haDYVi6SjyUsoITVxUsE6cmT+euGHKQTlu9/U0uk= +github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968/go.mod h1:uH0Od/EyS1bQkW1BWo8qqz8szU3VEpNK1YXR1SJgqK4= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 h1:8ja6Vnp5EUsh8Oe4mI8ZNwpJtiM7c87X/b9sO/hEFiY= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149/go.mod h1:GDANCnJONcCqBvv6QgKuk5Y2FWHyD/Hu26kyc7NTyfY= github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c h1:74wqdvAd3S9BuKolIV0obbG8PhbChtF9sQrE/ov2se0= @@ -567,6 +569,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= From 04faa67aa8e63917854984417b166c25388e9fc3 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 17:30:55 +0200 Subject: [PATCH 17/20] feat: update aries --- Makefile | 15 +++++++-------- cmd/vc-rest/go.mod | 2 +- cmd/vc-rest/go.sum | 4 ++-- component/credentialstatus/go.mod | 3 ++- component/credentialstatus/go.sum | 6 ++++-- component/event/go.mod | 2 +- component/event/go.sum | 4 ++-- component/profile/reader/file/go.mod | 3 ++- component/profile/reader/file/go.sum | 6 ++++-- component/wallet-cli/go.mod | 2 +- component/wallet-cli/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- test/bdd/go.mod | 2 +- test/bdd/go.sum | 4 ++-- test/stress/go.mod | 2 +- test/stress/go.sum | 4 ++-- 17 files changed, 37 insertions(+), 32 deletions(-) diff --git a/Makefile b/Makefile index 163d1fa1f..ee2408bd5 100644 --- a/Makefile +++ b/Makefile @@ -181,14 +181,13 @@ clean: .PHONY: update-aries update-aries: - @cd ./ && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./cmd/vc-rest && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./component/credentialstatus && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./component/event && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./component/profile/reader/file && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./component/wallet-cli && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./test/bdd && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy - @cd ./test/stress && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go mod tidy + @find . -type d \( -name build -prune \) -o -name go.mod -print | while read -r gomod_path; do \ + dir_path=$$(dirname "$$gomod_path"); \ + if grep -q "github.com/hyperledger/aries-framework-go" "$$gomod_path"; then \ + echo "Executing 'updating aries' in directory: $$dir_path"; \ + (cd "$$dir_path" && go get github.com/hyperledger/aries-framework-go@$(ARIES_FRAMEWORK_VERSION) && go get github.com/hyperledger/aries-framework-go/component/models@$(ARIES_FRAMEWORK_VERSION) && go mod tidy) || exit 1; \ + fi; \ + done .PHONY: tidy-modules tidy-modules: diff --git a/cmd/vc-rest/go.mod b/cmd/vc-rest/go.mod index 7bb64344c..82280dcb1 100644 --- a/cmd/vc-rest/go.mod +++ b/cmd/vc-rest/go.mod @@ -123,7 +123,7 @@ require ( github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect diff --git a/cmd/vc-rest/go.sum b/cmd/vc-rest/go.sum index 21e74787c..a3710d629 100644 --- a/cmd/vc-rest/go.sum +++ b/cmd/vc-rest/go.sum @@ -592,8 +592,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/component/credentialstatus/go.mod b/component/credentialstatus/go.mod index 8c087b09b..827b8640a 100644 --- a/component/credentialstatus/go.mod +++ b/component/credentialstatus/go.mod @@ -72,7 +72,7 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect @@ -153,6 +153,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/component/credentialstatus/go.sum b/component/credentialstatus/go.sum index 762a0d179..7d1966d6a 100644 --- a/component/credentialstatus/go.sum +++ b/component/credentialstatus/go.sum @@ -517,8 +517,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1078,6 +1078,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/event/go.mod b/component/event/go.mod index 9a5bc6f23..98e9c81dd 100644 --- a/component/event/go.mod +++ b/component/event/go.mod @@ -73,7 +73,7 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect diff --git a/component/event/go.sum b/component/event/go.sum index f938b32a4..70530c476 100644 --- a/component/event/go.sum +++ b/component/event/go.sum @@ -515,8 +515,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/component/profile/reader/file/go.mod b/component/profile/reader/file/go.mod index c39881792..822d6596b 100644 --- a/component/profile/reader/file/go.mod +++ b/component/profile/reader/file/go.mod @@ -72,7 +72,7 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc3.0.20221104150937-07bfbe450122 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 // indirect @@ -155,6 +155,7 @@ require ( go.uber.org/multierr v1.8.0 // indirect go.uber.org/zap v1.23.0 // indirect golang.org/x/crypto v0.11.0 // indirect + golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 // indirect golang.org/x/mod v0.12.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sync v0.3.0 // indirect diff --git a/component/profile/reader/file/go.sum b/component/profile/reader/file/go.sum index f652a11b3..2697c1783 100644 --- a/component/profile/reader/file/go.sum +++ b/component/profile/reader/file/go.sum @@ -520,8 +520,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= @@ -1083,6 +1083,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691 h1:/yRP+0AN7mf5DkD3BAI6TOFnd51gEoDEb8o35jIFtgw= +golang.org/x/exp v0.0.0-20230728194245-b0cb94b80691/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= diff --git a/component/wallet-cli/go.mod b/component/wallet-cli/go.mod index 67912cdc1..8f54011f8 100644 --- a/component/wallet-cli/go.mod +++ b/component/wallet-cli/go.mod @@ -16,7 +16,7 @@ require ( github.com/hyperledger/aries-framework-go-ext/component/vdr/jwk v0.0.0-20221213152252-f0c83a5a922c github.com/hyperledger/aries-framework-go-ext/component/vdr/longform v0.0.0-20221201213446-c4c1e76daa49 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 diff --git a/component/wallet-cli/go.sum b/component/wallet-cli/go.sum index 624ee957c..56de86ca4 100644 --- a/component/wallet-cli/go.sum +++ b/component/wallet-cli/go.sum @@ -555,8 +555,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= diff --git a/go.mod b/go.mod index 39b4fd85f..89eccd49c 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,7 @@ require ( github.com/hyperledger/aries-framework-go v0.3.3-0.20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220728172020-0a8903e45149 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v1.0.0-rc5.0.20221201213446-c4c1e76daa49 - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 github.com/hyperledger/aries-framework-go/spi v0.0.0-20230517133327-301aa0597250 github.com/jinzhu/copier v0.3.5 diff --git a/go.sum b/go.sum index f789f3f1c..cffe541b6 100644 --- a/go.sum +++ b/go.sum @@ -591,8 +591,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 h1:JGYA9l5zTlvsvfnXT9hYPpCokAjmVKX0/r7njba7OX4= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3/go.mod h1:aSG2dWjYVzu2PVBtOqsYghaChA5+UUXnBbL+MfVceYQ= github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 h1:QvqSk3CuNXZetpr/hP0bH7VUOzjJUtG16OxknXjdaYE= diff --git a/test/bdd/go.mod b/test/bdd/go.mod index f0c093b38..d640fabfa 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -96,7 +96,7 @@ require ( github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 // indirect github.com/hyperledger/aries-framework-go/component/vdr v0.0.0-20230622171716-43af8054a539 // indirect diff --git a/test/bdd/go.sum b/test/bdd/go.sum index a558c59bd..f0b1468a3 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -588,8 +588,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= diff --git a/test/stress/go.mod b/test/stress/go.mod index 129781af1..7c59d9f5d 100644 --- a/test/stress/go.mod +++ b/test/stress/go.mod @@ -91,7 +91,7 @@ require ( github.com/hyperledger/aries-framework-go/component/didconfig v0.0.0-20230622211121-852ce35730b4 // indirect github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857 // indirect github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 // indirect - github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 // indirect + github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 // indirect github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e // indirect github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 // indirect github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20230427134832-0c9969493bd3 // indirect diff --git a/test/stress/go.sum b/test/stress/go.sum index a8d527710..fc24a4255 100644 --- a/test/stress/go.sum +++ b/test/stress/go.sum @@ -569,8 +569,8 @@ github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082 github.com/hyperledger/aries-framework-go/component/kmscrypto v0.0.0-20230622082138-3ffab1691857/go.mod h1:xgNlHAVQjqwoknzHbXkeHkAJgUxRWKfHXPT3nhVhH3Q= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3 h1:x5qFQraTX86z9GCwF28IxfnPm6QH5YgHaX+4x97Jwvw= github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230427134832-0c9969493bd3/go.mod h1:CvYs4l8X2NrrF93weLOu5RTOIJeVdoZITtjEflyuTyM= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539 h1:3wjwGDB4/D2z4lZexGtD8tf13KRy/jiXqI9mtiEHmUo= -github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230622171716-43af8054a539/go.mod h1:Qklxf9WG44vpLGF+Efs1aCWeHhsVOU0HFvEslf0RDrQ= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968 h1:W8F1CA8P/bNb92P/JMYG2nWqv0bxLL58/Q8Rw9nsNyI= +github.com/hyperledger/aries-framework-go/component/models v0.0.0-20230810150537-71e132ba5968/go.mod h1:AJkRLmQB1/umL5GfXw/XIarGaH/XCQOL/6wlGtqdDpA= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e h1:/hrQfwJvHJrwV2FSmfnRp5L6yKY9DqDFqwYyb+oVuDU= github.com/hyperledger/aries-framework-go/component/storage/edv v0.0.0-20221025204933-b807371b6f1e/go.mod h1:ACGP1L+WeecDtyA0Mi2E1kqtPLIGrCWPSJ43q2elwX8= github.com/hyperledger/aries-framework-go/component/storage/leveldb v0.0.0-20221202141134-083803ecf0a3 h1:GF7p/WrgKrhq7d0d9b6nkuW/sidMOwla9Muj4g+BgSY= From 658acf91ba084a9ad3aade0fdec057aa80c909cd Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 17:45:34 +0200 Subject: [PATCH 18/20] chore: cleanup --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index ee2408bd5..9256072a4 100644 --- a/Makefile +++ b/Makefile @@ -196,8 +196,3 @@ tidy-modules: echo "Executing 'go mod tidy' in directory: $$dir_path"; \ (cd "$$dir_path" && go mod tidy) || exit 1; \ done -.PHONY: update-mock-aries -update-mock-aries: - @mkdir -p build - @rm -rf ./build/local-aries - @git clone -b sdjwt-issuance-v5 https://github.com/skynet2/aries-framework-go.git ./build/local-aries From 47fd2ef64b0c4ae3894ab2cf23eef994354ea117 Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 17:51:38 +0200 Subject: [PATCH 19/20] fix: generate --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9256072a4..9523fde35 100644 --- a/Makefile +++ b/Makefile @@ -47,8 +47,7 @@ all: checks unit-test bdd-test .PHONY: checks checks: license lint -#.PHONY: generate -generate: update-mock-aries +.PHONY: generate generate: @GOBIN=$(GOBIN_PATH) go install github.com/golang/mock/mockgen@$(MOCK_VERSION) @GOBIN=$(GOBIN_PATH) go install github.com/deepmap/oapi-codegen/cmd/oapi-codegen@$(OPENAPIGEN_VERSION) From 74d5c7394ad6478fc1dc6696f4b2164ce60d654f Mon Sep 17 00:00:00 2001 From: Stas Dm Date: Thu, 10 Aug 2023 18:07:49 +0200 Subject: [PATCH 20/20] chore: cleanup fmt --- component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go | 1 - 1 file changed, 1 deletion(-) diff --git a/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go b/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go index 5a4c9dffa..1a381d3dc 100644 --- a/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go +++ b/component/wallet-cli/pkg/walletrunner/wallet_runner_oidc4vp.go @@ -295,7 +295,6 @@ func (e *VPFlowExecutor) QueryCredentialFromWalletSingleVP() error { return fmt.Errorf("presentation definition marshal: %w", err) } - fmt.Println(string(pdBytes)) // This query will always return one VP - so far no plans to change this vps, err := e.wallet.Query(e.walletToken, &wallet.QueryParams{ Type: "PresentationExchange",