From 3960e3e2f1530e9d665b59d671a800c0d8342365 Mon Sep 17 00:00:00 2001 From: Firas Qutishat Date: Fri, 26 Aug 2022 04:47:20 -0400 Subject: [PATCH] chore: update to latest orb Signed-off-by: Firas Qutishat --- component/vdr/orb/go.mod | 4 ++-- component/vdr/orb/go.sum | 8 ++++---- .../ldcontext/data/activity-anchors-v1.json | 14 ++++++++++++-- test/bdd/vdr/orb/fixtures/orb/.env | 2 +- test/bdd/vdr/orb/fixtures/orb/docker-compose.yml | 6 +++--- test/bdd/vdr/orb/go.mod | 4 ++-- test/bdd/vdr/orb/go.sum | 8 ++++---- 7 files changed, 28 insertions(+), 18 deletions(-) diff --git a/component/vdr/orb/go.mod b/component/vdr/orb/go.mod index 61da9a8f..877b1674 100644 --- a/component/vdr/orb/go.mod +++ b/component/vdr/orb/go.mod @@ -13,7 +13,7 @@ require ( github.com/opentracing/opentracing-go v1.1.0 github.com/piprate/json-gold v0.4.1 github.com/stretchr/testify v1.7.5 - github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352 + github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd ) @@ -65,7 +65,7 @@ require ( github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693 // indirect github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect github.com/trustbloc/edge-core v0.1.8 // indirect - github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc // indirect + github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect diff --git a/component/vdr/orb/go.sum b/component/vdr/orb/go.sum index 3e40b5ff..022c69a7 100644 --- a/component/vdr/orb/go.sum +++ b/component/vdr/orb/go.sum @@ -1433,12 +1433,12 @@ github.com/trustbloc/edge-core v0.1.7/go.mod h1:nQnH3CcEHTRXsWZe/vgj+J0JxxjwFK9I github.com/trustbloc/edge-core v0.1.8 h1:m4X5XNDwiHJjGf8gHnpo6aLkBYuqDyNRq+npjxLc5cY= github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHYn+87f+TBQ8M= github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA= -github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352 h1:Myn0BGYvyQEgcwRCweh6O/D864NeXinIz2O3Cx0nCOc= -github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352/go.mod h1:T8yf5LTScDLice5ZjIJcrgKMNW2xlTM3P6v3Gvmq6y8= +github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a h1:xK0ROwXdkUmXdnDHD5czOWdylAgamUcGeWl2/xEsi1I= +github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a/go.mod h1:4w8kHl1LmZZvqJHuc5uSejjWzBB+GLGXVCsZyEJNW5s= github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5 h1:v32O23Ox/uwrwros6Zk6XZHdZT7MAO/2pFTU7xcmfoU= github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ= -github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc h1:NgHlfCFyERnxYHEKxdnLXWT2c8Uos1ufjvtiyiuKOXc= -github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc/go.mod h1:lGK5QNUTJRVUf47HEqTYBC+raauPVp2yfZOIo29XmDI= +github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820 h1:UacXj0M5TPAdwgZNYfHX9LpWMJjXg7949Ude/mHpIwU= +github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820/go.mod h1:lGK5QNUTJRVUf47HEqTYBC+raauPVp2yfZOIo29XmDI= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= diff --git a/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json b/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json index 5ee1791c..5c1952fd 100644 --- a/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json +++ b/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json @@ -31,8 +31,18 @@ "type": "@type" } }, - "anchor": "https://w3id.org/activityanchors#anchor", - "profile": "https://w3id.org/activityanchors#profile" + "AnchorLink": { + "@id": "https://w3id.org/activityanchors#AnchorLink", + "@context": { + "@version": 1.1, + "@protected": true, + "type": "@type", + "href": "https://w3id.org/activityanchors#href", + "anchor": "https://w3id.org/activityanchors#anchor", + "profile": "https://w3id.org/activityanchors#profile", + "rel": "https://w3id.org/activityanchors#rel" + } + } } } } diff --git a/test/bdd/vdr/orb/fixtures/orb/.env b/test/bdd/vdr/orb/fixtures/orb/.env index 762a34d5..d3576d64 100644 --- a/test/bdd/vdr/orb/fixtures/orb/.env +++ b/test/bdd/vdr/orb/fixtures/orb/.env @@ -5,7 +5,7 @@ # ORB_IMAGE=ghcr.io/trustbloc-cicd/orb -ORB_IMAGE_TAG=v1.0.0-rc3-snapshot-17aec9f +ORB_IMAGE_TAG=v1.0.0-rc3-snapshot-b08eed0 # MongoDB settings MONGODB_IMAGE=mongo diff --git a/test/bdd/vdr/orb/fixtures/orb/docker-compose.yml b/test/bdd/vdr/orb/fixtures/orb/docker-compose.yml index e7c3c052..9c256d7f 100644 --- a/test/bdd/vdr/orb/fixtures/orb/docker-compose.yml +++ b/test/bdd/vdr/orb/fixtures/orb/docker-compose.yml @@ -110,7 +110,7 @@ services: orb.trillian.log.server: container_name: orb.trillian.log.server - image: ghcr.io/trustbloc-cicd/vct-log-server:v1.0.0-rc3-snapshot-03b2f10 + image: ghcr.io/trustbloc-cicd/vct-log-server:v1.0.0-rc3-snapshot-c395321 restart: always command: - --quota_system=noop @@ -125,7 +125,7 @@ services: orb.trillian.log.signer: container_name: orb.trillian.log.signer - image: ghcr.io/trustbloc-cicd/vct-log-signer:v1.0.0-rc3-snapshot-03b2f10 + image: ghcr.io/trustbloc-cicd/vct-log-signer:v1.0.0-rc3-snapshot-c395321 restart: always command: - --quota_system=noop @@ -161,7 +161,7 @@ services: orb.vct: container_name: orb.vct - image: ghcr.io/trustbloc-cicd/vct:v1.0.0-rc3-snapshot-03b2f10 + image: ghcr.io/trustbloc-cicd/vct:v1.0.0-rc3-snapshot-c395321 restart: always environment: - VCT_API_HOST=0.0.0.0:8077 diff --git a/test/bdd/vdr/orb/go.mod b/test/bdd/vdr/orb/go.mod index f792d650..74774466 100644 --- a/test/bdd/vdr/orb/go.mod +++ b/test/bdd/vdr/orb/go.mod @@ -88,8 +88,8 @@ require ( github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693 // indirect github.com/stretchr/testify v1.7.5 // indirect github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 // indirect - github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352 // indirect - github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc // indirect + github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a // indirect + github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820 // indirect github.com/x448/float16 v0.8.4 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect github.com/xdg-go/scram v1.1.1 // indirect diff --git a/test/bdd/vdr/orb/go.sum b/test/bdd/vdr/orb/go.sum index 1e1f4e73..35f320d6 100644 --- a/test/bdd/vdr/orb/go.sum +++ b/test/bdd/vdr/orb/go.sum @@ -1681,12 +1681,12 @@ github.com/trustbloc/edge-core v0.1.7/go.mod h1:nQnH3CcEHTRXsWZe/vgj+J0JxxjwFK9I github.com/trustbloc/edge-core v0.1.8 h1:m4X5XNDwiHJjGf8gHnpo6aLkBYuqDyNRq+npjxLc5cY= github.com/trustbloc/edge-core v0.1.8/go.mod h1:gfoyG/xquRXyHkww0ldM2jwOTuKKZpHYn+87f+TBQ8M= github.com/trustbloc/kms v0.1.9-0.20220526151939-d46e46e8f7e1/go.mod h1:a6XvGLZgwVqBAt47550cQeRKm04X2Nn1M8DE0PVb0XA= -github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352 h1:Myn0BGYvyQEgcwRCweh6O/D864NeXinIz2O3Cx0nCOc= -github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352/go.mod h1:T8yf5LTScDLice5ZjIJcrgKMNW2xlTM3P6v3Gvmq6y8= +github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a h1:xK0ROwXdkUmXdnDHD5czOWdylAgamUcGeWl2/xEsi1I= +github.com/trustbloc/orb v1.0.0-rc2.0.20220826005428-b08eed04243a/go.mod h1:4w8kHl1LmZZvqJHuc5uSejjWzBB+GLGXVCsZyEJNW5s= github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5 h1:v32O23Ox/uwrwros6Zk6XZHdZT7MAO/2pFTU7xcmfoU= github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5/go.mod h1:SYCYxrsviTcRoUCoM6VosXF+sqWkKpk8C1dqD0doRYQ= -github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc h1:NgHlfCFyERnxYHEKxdnLXWT2c8Uos1ufjvtiyiuKOXc= -github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc/go.mod h1:lGK5QNUTJRVUf47HEqTYBC+raauPVp2yfZOIo29XmDI= +github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820 h1:UacXj0M5TPAdwgZNYfHX9LpWMJjXg7949Ude/mHpIwU= +github.com/trustbloc/vct v1.0.0-rc2.0.20220825171642-c395321b4820/go.mod h1:lGK5QNUTJRVUf47HEqTYBC+raauPVp2yfZOIo29XmDI= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=