Skip to content

Commit

Permalink
chore(sdk): update upstream libraries (trustbloc#813)
Browse files Browse the repository at this point in the history
Signed-off-by: Andrii Holovko <[email protected]>
  • Loading branch information
aholovko authored Oct 16, 2024
1 parent 20daea5 commit 1f649e8
Show file tree
Hide file tree
Showing 22 changed files with 139 additions and 84 deletions.
16 changes: 13 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# SPDX-License-Identifier: Apache-2.0

GOBIN_PATH=$(abspath .)/.build/bin
GOPROXY ?= https://proxy.golang.org

OS := $(shell uname)
ifeq ($(OS),$(filter $(OS),Darwin Linux))
Expand Down Expand Up @@ -73,7 +74,16 @@ demo-app-android: generate-android-bindings copy-android-bindings
sample-webhook:
@echo "Building sample webhook server"
@mkdir -p ./build/bin
@go build -o ./build/bin/webhook-server test/integration/webhook/main.go
@go build -modfile test/integration/webhook/go.mod -o ./build/bin/webhook-server test/integration/webhook/main.go

.PHONY: sample-webhook-docker
sample-webhook-docker:
@echo "Building sample webhook server docker image"
@docker build -f ./images/mocks/webhook/Dockerfile -t wallet-sdk/sample-webhook:latest \
--build-arg GO_VER=$(GO_VER) \
--build-arg ALPINE_VER=$(GO_ALPINE_VER) \
--build-arg GO_PROXY=$(GOPROXY) \
--build-arg GO_IMAGE=$(GO_IMAGE) .

.PHONY: mock-login-consent-docker
mock-login-consent-docker:
Expand Down Expand Up @@ -101,7 +111,7 @@ mock-attestation-docker:
--build-arg GO_IMAGE=$(GO_IMAGE) .

.PHONY: integration-test
integration-test: mock-login-consent-docker mock-trust-registry-docker mock-attestation-docker generate-test-keys
integration-test: mock-login-consent-docker mock-trust-registry-docker mock-attestation-docker sample-webhook-docker generate-test-keys
@cd test/integration && go mod tidy && ENABLE_COMPOSITION=true go test -count=1 -v -cover . -p 1 -timeout=10m -race

.PHONY: build-integration-cli
Expand All @@ -111,7 +121,7 @@ build-integration-cli:
@cd test/integration/cli && go build -o ../../../build/bin/integration-cli main.go

.PHONY: prepare-integration-test-flutter
prepare-integration-test-flutter: build-integration-cli mock-login-consent-docker mock-trust-registry-docker mock-attestation-docker generate-test-keys start-integration-env-flutter
prepare-integration-test-flutter: build-integration-cli mock-login-consent-docker mock-trust-registry-docker mock-attestation-docker sample-webhook-docker generate-test-keys start-integration-env-flutter

.PHONY: start-integration-env-flutter
start-integration-env-flutter:
Expand Down
2 changes: 1 addition & 1 deletion cmd/wallet-sdk-gomobile/credential/signer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestSigner_Issue(t *testing.T) {
mockCredential, err := afgoverifiable.CreateCredential(afgoverifiable.CredentialContents{
ID: credID,
Types: []string{afgoverifiable.VCType},
Context: []string{afgoverifiable.ContextURI},
Context: []string{afgoverifiable.V1ContextURI},
Subject: []afgoverifiable.Subject{{
ID: "foo",
}},
Expand Down
8 changes: 5 additions & 3 deletions cmd/wallet-sdk-gomobile/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ require (
github.com/gowebpki/jcs v1.0.1
github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
github.com/stretchr/testify v1.8.2
github.com/trustbloc/did-go v1.3.0
github.com/trustbloc/kms-go v1.1.2
github.com/trustbloc/vc-go v1.2.0
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
github.com/trustbloc/wallet-sdk v0.0.0-00010101000000-000000000000
)

Expand Down Expand Up @@ -55,6 +55,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/samber/lo v1.47.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect
Expand All @@ -74,6 +75,7 @@ require (
golang.org/x/net v0.26.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
16 changes: 10 additions & 6 deletions cmd/wallet-sdk-gomobile/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,8 @@ github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8
github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
Expand Down Expand Up @@ -151,14 +153,14 @@ github.com/tidwall/sjson v1.1.4 h1:bTSsPLdAYF5QNLSwYsKfBKKTnlGbIuhqL3CpRsjzGhg=
github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg=
github.com/trustbloc/bbs-signature-go v1.0.2 h1:gepEsbLiZHv/vva9FKG5gF38mGtOIyGez7desZxiI1o=
github.com/trustbloc/bbs-signature-go v1.0.2/go.mod h1:xYotcXHAbcE0TO+SteW0J6XI3geQaXq4wdnXR2k+XCU=
github.com/trustbloc/did-go v1.3.0 h1:vfiY/dewd9cORo3U5c+eoWgNIQnKsuQYn5PV0CRu1o0=
github.com/trustbloc/did-go v1.3.0/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwys=
github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70 h1:5GOoXZcKYDTsobaTCeFUEBjbognYbjBh38fCjkvClU4=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88 h1:k3KNf9tE4TBVdpEtImmZIbUWFZRoL/96GPR7FSqCr9k=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/sidetree-go v1.1.0 h1:ZNCtYTut5MHVXJR26FvOPSo8uCGDR0YTNeA155s/QIo=
github.com/trustbloc/sidetree-go v1.1.0/go.mod h1:IQ1iX/gLe/YL+M6kzenc5Oi14uzaYqfL7KgMyNuSGvI=
github.com/trustbloc/vc-go v1.2.0 h1:/2blMr1hnw4xwQSO7RwMQC3boVC9ADm39MS+NAAtGoA=
github.com/trustbloc/vc-go v1.2.0/go.mod h1:o14xyB2I5GgJlsrH+Doh6NbKDStGmJ1R5nnlEV781IE=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd h1:QhdCHSW1/oosJbzBTEYLU6xcKxXbQzzqFnhCtW2UWbA=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd/go.mod h1:D1wnviyjdmcF8AO5Y9kVGU6OGuvXUMGiE0Auo/fYRYo=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
Expand Down Expand Up @@ -196,6 +198,8 @@ golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
Expand Down
8 changes: 5 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ require (
github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f
github.com/stretchr/testify v1.8.2
github.com/trustbloc/bbs-signature-go v1.0.2
github.com/trustbloc/did-go v1.3.0
github.com/trustbloc/kms-go v1.1.2
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88
github.com/trustbloc/sidetree-go v1.1.0
github.com/trustbloc/vc-go v1.2.0
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
golang.org/x/oauth2 v0.13.0
)

Expand Down Expand Up @@ -55,6 +55,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/pquerna/cachecontrol v0.1.0 // indirect
github.com/samber/lo v1.47.0 // indirect
github.com/shopspring/decimal v1.3.1 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect
Expand All @@ -71,6 +72,7 @@ require (
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.17.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
16 changes: 10 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ github.com/pquerna/cachecontrol v0.1.0 h1:yJMy84ti9h/+OEWa752kBTKv4XC30OtVVHYv/8
github.com/pquerna/cachecontrol v0.1.0/go.mod h1:NrUG3Z7Rdu85UNR3vm7SOsl1nFIeSiQnrHV5K9mBcUI=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/samber/lo v1.47.0 h1:z7RynLwP5nbyRscyvcD043DWYoOcYRv3mV8lBeqOCLc=
github.com/samber/lo v1.47.0/go.mod h1:RmDH9Ct32Qy3gduHQuKJ3gW1fMHAnE/fAzQuf6He5cU=
github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
Expand Down Expand Up @@ -148,14 +150,14 @@ github.com/tidwall/sjson v1.1.4 h1:bTSsPLdAYF5QNLSwYsKfBKKTnlGbIuhqL3CpRsjzGhg=
github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg=
github.com/trustbloc/bbs-signature-go v1.0.2 h1:gepEsbLiZHv/vva9FKG5gF38mGtOIyGez7desZxiI1o=
github.com/trustbloc/bbs-signature-go v1.0.2/go.mod h1:xYotcXHAbcE0TO+SteW0J6XI3geQaXq4wdnXR2k+XCU=
github.com/trustbloc/did-go v1.3.0 h1:vfiY/dewd9cORo3U5c+eoWgNIQnKsuQYn5PV0CRu1o0=
github.com/trustbloc/did-go v1.3.0/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwys=
github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70 h1:5GOoXZcKYDTsobaTCeFUEBjbognYbjBh38fCjkvClU4=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88 h1:k3KNf9tE4TBVdpEtImmZIbUWFZRoL/96GPR7FSqCr9k=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/sidetree-go v1.1.0 h1:ZNCtYTut5MHVXJR26FvOPSo8uCGDR0YTNeA155s/QIo=
github.com/trustbloc/sidetree-go v1.1.0/go.mod h1:IQ1iX/gLe/YL+M6kzenc5Oi14uzaYqfL7KgMyNuSGvI=
github.com/trustbloc/vc-go v1.2.0 h1:/2blMr1hnw4xwQSO7RwMQC3boVC9ADm39MS+NAAtGoA=
github.com/trustbloc/vc-go v1.2.0/go.mod h1:o14xyB2I5GgJlsrH+Doh6NbKDStGmJ1R5nnlEV781IE=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd h1:QhdCHSW1/oosJbzBTEYLU6xcKxXbQzzqFnhCtW2UWbA=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd/go.mod h1:D1wnviyjdmcF8AO5Y9kVGU6OGuvXUMGiE0Auo/fYRYo=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
Expand Down Expand Up @@ -193,6 +195,8 @@ golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
Expand Down
42 changes: 22 additions & 20 deletions images/mocks/webhook/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,25 @@
ARG GO_VER
ARG ALPINE_VER

FROM golang:${GO_VER}-alpine${ALPINE_VER} as builder

RUN apk update && apk add git && apk add ca-certificates
RUN adduser -D -g '' appuser

COPY . $GOPATH/src/github.com/trustbloc/wallet-sdk/test/integration/webhook/
WORKDIR $GOPATH/src/github.com/trustbloc/wallet-sdk/test/integration/webhook/

RUN CGO_ENABLED=0 go build -o /usr/bin/webhook-server

FROM scratch

LABEL org.opencontainers.image.source https://github.com/trustbloc/wallet-sdk/test/integration/webhook

COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
COPY --from=builder /etc/passwd /etc/passwd
COPY --from=builder /usr/bin/webhook-server /usr/bin/webhook-server
USER appuser

ENTRYPOINT ["/usr/bin/webhook-server"]
FROM golang:${GO_VER}-alpine${ALPINE_VER} AS golang
RUN apk add --no-cache \
bash \
gcc \
git \
libtool \
make \
musl-dev;
COPY . $GOPATH/src/github.com/trustbloc/wallet-sdk/
WORKDIR $GOPATH/src/github.com/trustbloc/wallet-sdk
ENV EXECUTABLES go git

FROM golang AS wallet-sdk
ARG GO_TAGS
ARG GO_PROXY
RUN GO_TAGS=${GO_TAGS} GOPROXY=${GO_PROXY} make sample-webhook

FROM alpine:${ALPINE_VER} AS base
LABEL org.opencontainers.image.source=https://github.com/trustbloc/wallet-sdk
COPY --from=wallet-sdk /go/src/github.com/trustbloc/wallet-sdk/build/bin/webhook-server /usr/local/bin

ENTRYPOINT ["webhook-server"]
4 changes: 2 additions & 2 deletions pkg/credentialsigner/signer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestSigner_Issue(t *testing.T) {
mockCredential, cErr := verifiable.CreateCredential(verifiable.CredentialContents{
ID: "foo",
Types: []string{verifiable.VCType},
Context: []string{verifiable.ContextURI},
Context: []string{verifiable.V1ContextURI},
Subject: []verifiable.Subject{{
ID: "foo",
}},
Expand Down Expand Up @@ -161,7 +161,7 @@ func TestSigner_Issue(t *testing.T) {
badCredential, cErr := verifiable.CreateCredential(verifiable.CredentialContents{
ID: "foo",
Types: []string{verifiable.VCType},
Context: []string{verifiable.ContextURI},
Context: []string{verifiable.V1ContextURI},
Subject: []verifiable.Subject{},
Issuer: &verifiable.Issuer{
ID: "did:foo:bar",
Expand Down
10 changes: 5 additions & 5 deletions pkg/openid4vp/openid4vp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ func TestOpenID4VP_PresentCredential(t *testing.T) {
ID: uuid.NewString(),
Schema: []*presexch.Schema{
{
URI: fmt.Sprintf("%s#%s", verifiable.ContextID, verifiable.VCType),
URI: fmt.Sprintf("%s#%s", verifiable.V1ContextID, verifiable.VCType),
},
},
},
Expand Down Expand Up @@ -446,7 +446,7 @@ func TestOpenID4VP_PresentCredential(t *testing.T) {
InputDescriptors: []*presexch.InputDescriptor{{
ID: uuid.NewString(),
Schema: []*presexch.Schema{{
URI: fmt.Sprintf("%s#%s", verifiable.ContextID, verifiable.VCType),
URI: fmt.Sprintf("%s#%s", verifiable.V1ContextID, verifiable.VCType),
}},
// These constraints aren't satisfied by the provided VC...
Constraints: &presexch.Constraints{
Expand Down Expand Up @@ -527,7 +527,7 @@ func TestOpenID4VP_PresentCredential(t *testing.T) {
vc: []verifiable.CredentialContents{
{
ID: "foo",
Context: []string{verifiable.ContextURI},
Context: []string{verifiable.V1ContextURI},
Types: []string{verifiable.VCType},
},
},
Expand All @@ -536,12 +536,12 @@ func TestOpenID4VP_PresentCredential(t *testing.T) {
vc: []verifiable.CredentialContents{
{
ID: "foo",
Context: []string{verifiable.ContextURI},
Context: []string{verifiable.V1ContextURI},
Types: []string{verifiable.VCType},
},
{
ID: "bar",
Context: []string{verifiable.ContextURI},
Context: []string{verifiable.V1ContextURI},
Types: []string{verifiable.VCType},
},
},
Expand Down
6 changes: 3 additions & 3 deletions test/integration/attestation/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ require (
github.com/google/uuid v1.3.0
github.com/gorilla/mux v1.8.0
github.com/trustbloc/cmdutil-go v1.0.0
github.com/trustbloc/did-go v1.3.0
github.com/trustbloc/kms-go v1.1.2
github.com/trustbloc/vc-go v1.2.0
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5
github.com/trustbloc/wallet-sdk v0.0.0-00010101000000-000000000000
)

Expand Down
12 changes: 6 additions & 6 deletions test/integration/attestation/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -149,16 +149,16 @@ github.com/trustbloc/bbs-signature-go v1.0.2 h1:gepEsbLiZHv/vva9FKG5gF38mGtOIyGe
github.com/trustbloc/bbs-signature-go v1.0.2/go.mod h1:xYotcXHAbcE0TO+SteW0J6XI3geQaXq4wdnXR2k+XCU=
github.com/trustbloc/cmdutil-go v1.0.0 h1:QCe7wVEIASWmy9ZDD0l0tsQCEsX6fx+kBFX5UqCVRdk=
github.com/trustbloc/cmdutil-go v1.0.0/go.mod h1:o/v7C1z6d/5UrjaC6GAUc1hk0XVuE3M4tpyvsMMUw5k=
github.com/trustbloc/did-go v1.3.0 h1:vfiY/dewd9cORo3U5c+eoWgNIQnKsuQYn5PV0CRu1o0=
github.com/trustbloc/did-go v1.3.0/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.2 h1:nAlhDoHkSyX1eQFRz/sJsdgmJuNadyX7FJEy/9ROwys=
github.com/trustbloc/kms-go v1.1.2/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70 h1:5GOoXZcKYDTsobaTCeFUEBjbognYbjBh38fCjkvClU4=
github.com/trustbloc/did-go v1.3.1-0.20240910130808-bf0188fdfe70/go.mod h1:packTRoBoo8DrwOE7QKsI98xXS3Vf6ovUXYD4FUAcB4=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88 h1:k3KNf9tE4TBVdpEtImmZIbUWFZRoL/96GPR7FSqCr9k=
github.com/trustbloc/kms-go v1.1.3-0.20241001141623-8d9510c6bb88/go.mod h1:OKOtsLbE6W5s4mpjWkvk8XEqcmt9vTgVmDNkHELpWO0=
github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42 h1:Mzg9wvEoUIWPoI/GHz3YlVbd4nKWeSPGc6+3l95eOZU=
github.com/trustbloc/logutil-go v0.0.0-20221124174025-c46110e3ea42/go.mod h1:HRaXVV1caceumbDBwLO3ByiCcAc18KwrNvZ7JQBvDIQ=
github.com/trustbloc/sidetree-go v1.1.0 h1:ZNCtYTut5MHVXJR26FvOPSo8uCGDR0YTNeA155s/QIo=
github.com/trustbloc/sidetree-go v1.1.0/go.mod h1:IQ1iX/gLe/YL+M6kzenc5Oi14uzaYqfL7KgMyNuSGvI=
github.com/trustbloc/vc-go v1.2.0 h1:/2blMr1hnw4xwQSO7RwMQC3boVC9ADm39MS+NAAtGoA=
github.com/trustbloc/vc-go v1.2.0/go.mod h1:o14xyB2I5GgJlsrH+Doh6NbKDStGmJ1R5nnlEV781IE=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5 h1:k+C+8dfvi/0EOwr6Yjlei5yCYkg2jxPXYgWUYXE7hYU=
github.com/trustbloc/vc-go v1.2.1-0.20240927095859-a58759112df5/go.mod h1:LJTZ+GIYr/HeklpmhzlNfz9zAd/t4mj4Kylr9+ubHnc=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd h1:QhdCHSW1/oosJbzBTEYLU6xcKxXbQzzqFnhCtW2UWbA=
github.com/veraison/go-cose v1.1.1-0.20240126165338-2300d5c96dbd/go.mod h1:D1wnviyjdmcF8AO5Y9kVGU6OGuvXUMGiE0Auo/fYRYo=
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=
Expand Down
2 changes: 1 addition & 1 deletion test/integration/attestation/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ func (s *server) evaluateWalletProofJWT(
func (s *server) attestationVC(ctx context.Context, walletDID string, ses *sessionMetadata) (string, error) {
vcc := verifiable.CredentialContents{
Context: []string{
verifiable.ContextURI,
verifiable.V1ContextURI,
"https://w3c-ccg.github.io/lds-jws2020/contexts/lds-jws2020-v1.json",
},
ID: uuid.New().String(),
Expand Down
2 changes: 1 addition & 1 deletion test/integration/credentialapi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func TestCredentialAPI(t *testing.T) {
templateCredential, err := afgoverifiable.CreateCredential(afgoverifiable.CredentialContents{
ID: "cred-ID",
Types: []string{afgoverifiable.VCType},
Context: []string{afgoverifiable.ContextURI},
Context: []string{afgoverifiable.V1ContextURI},
Subject: []afgoverifiable.Subject{{
ID: "foo",
}},
Expand Down
9 changes: 9 additions & 0 deletions test/integration/fixtures/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,15 @@ services:
networks:
- bdd_net

vcs.webhook.example.com:
container_name: vcs.webhook.example.com
image: wallet-sdk/sample-webhook:latest
environment:
- WEBHOOK_PORT=8180
ports:
- 8180:8180
networks:
- bdd_net

did-resolver.trustbloc.local:
container_name: did-resolver.trustbloc.local
Expand Down
Loading

0 comments on commit 1f649e8

Please sign in to comment.