diff --git a/component/vdr/orb/go.mod b/component/vdr/orb/go.mod index 5ef9163c..61da9a8f 100644 --- a/component/vdr/orb/go.mod +++ b/component/vdr/orb/go.mod @@ -7,13 +7,13 @@ go 1.17 require ( github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce - github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617 + github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0 github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc2.0.20220729203359-da1de2fa21ce - github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1 + github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85 github.com/opentracing/opentracing-go v1.1.0 github.com/piprate/json-gold v0.4.1 - github.com/stretchr/testify v1.7.2 - github.com/trustbloc/orb v1.0.0-rc2.0.20220811160855-64ffb892b32b + github.com/stretchr/testify v1.7.5 + github.com/trustbloc/orb v1.0.0-rc2.0.20220822191829-17aec9f17352 github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd ) @@ -22,7 +22,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -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 // indirect + github.com/trustbloc/vct v1.0.0-rc2.0.20220820075241-03b2f1075dbc // 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 57c4c228..3e40b5ff 100644 --- a/component/vdr/orb/go.sum +++ b/component/vdr/orb/go.sum @@ -230,8 +230,11 @@ github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx2 github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod h1:HQhVmdUf7dBNwIIdBTivnCDxcf6IZY3/zrb+uKSJz6Y= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +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/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= 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= github.com/btcsuite/btcutil v1.0.1/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= @@ -781,10 +784,9 @@ github.com/hyperledger/aries-framework-go v0.1.7/go.mod h1:uve8/q23AUnq4EM0vBkEr github.com/hyperledger/aries-framework-go v0.1.8-0.20220217153004-1622c70e5767/go.mod h1:rBMOJVwyHyYbOqbb3IB/ExBkHyvFLht/W81s24GmjcE= github.com/hyperledger/aries-framework-go v0.1.8-0.20220322085443-50e8f9bd208b/go.mod h1:bqeLa1s8fQ7YueGOOk0Q+r48FGF7sd8GEaS/CyEo/iY= github.com/hyperledger/aries-framework-go v0.1.8/go.mod h1:7ilurt17sjWruVIBxZSrwn8qUbROq8LXYYY+O7dNxIM= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220526205258-18d510d84955/go.mod h1:7ilurt17sjWruVIBxZSrwn8qUbROq8LXYYY+O7dNxIM= github.com/hyperledger/aries-framework-go v0.1.9-0.20220714220520-d96b693387a7/go.mod h1:NHOXYxR3jOtO6Uf+WGRreOSrutWSzbIf6g4lmEtaQuU= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617 h1:XT+AkZb78EnO0IMXpUpsZtx2NPTQfDh9xZGPIS9MBqg= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617/go.mod h1:28aD9QTgVjeAl86vHNFwkOYwQwZiTrrODMpjE2PYz3M= +github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0 h1:qbqWv5zvNB0dvwKvAb8sSs6W9tdVqCQjdsdIkuDPusA= +github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0/go.mod h1:28aD9QTgVjeAl86vHNFwkOYwQwZiTrrODMpjE2PYz3M= github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20220428163625-96d8261511e1/go.mod h1:q8qjsQpYo7AYG0pqQg1zgEoIVc+Hrpf5S0WciiwPDQA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220428163625-96d8261511e1/go.mod h1:rO6A/9mCSo2pPQqMVmhgGvOkFX/7FVLgoanqazkiKSc= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220615170242-cda5092b4faf h1:F12zbOSRsye3IWK3Zb6prgrqQQFYnz5zjGSCh9pfYzk= @@ -808,8 +810,8 @@ github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-202203080 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b/go.mod h1:yLgRpVlZ2heeeOpTgvEnG/yHL9q1keUu5ILQ6s2qpLU= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220324201531-18c87667df19/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220330133350-1c2d9d65aea4/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= -github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1 h1:WSKq2EIrwKbBiN4ljdf10b5PjtVWzCyhuMldYNOeuwU= -github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= +github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85 h1:P82lZe6zDjaP2j87nDYQBSBYrB6Nq6nc9MtyNMC3K4A= +github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210320144851-40976de98ccf/go.mod h1:fDr9wW00GJJl1lR1SFHmJW8utIocdvjO5RNhAYS05EY= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210322152545-e6ebe2c79a2a/go.mod h1:fDr9wW00GJJl1lR1SFHmJW8utIocdvjO5RNhAYS05EY= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210409151411-eeeb8508bd87/go.mod h1:dBYKKD8U8U9o0g5BdNFFaRtjt9KTkiAYfQt+TTp+w1o= @@ -832,6 +834,7 @@ github.com/hyperledger/aries-framework-go/spi v0.0.0-20220324201531-18c87667df19 github.com/hyperledger/aries-framework-go/spi v0.0.0-20220330133350-1c2d9d65aea4/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220330140627-07042d78580c/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220606124520-53422361c38c/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= +github.com/hyperledger/aries-framework-go/spi v0.0.0-20220610133818-119077b0ec85/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220614152730-3d817acfa48b h1:wSUDDrB87VuaxOmyb0CmA3wB8vvgZ3p9Te4Dnsi6NXs= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220614152730-3d817acfa48b/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20210324232048-34ff560ed041/go.mod h1:eKGEEe+PJNDQo7kVif3sUKBWwnsQDkE3gD/QlpmukcQ= @@ -1398,8 +1401,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tencentcloud/tencentcloud-sdk-go v3.0.171+incompatible/go.mod h1:0PfYow01SHPMhKY31xa+EFz2RStxIqj6JFAJS+IkCi4= @@ -1429,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.20220811160855-64ffb892b32b h1:lWbbe9PIx8mTXi+zR6r67dDcreePdoalWy7yQWOzGRc= -github.com/trustbloc/orb v1.0.0-rc2.0.20220811160855-64ffb892b32b/go.mod h1:WN2/ZXjYqRjrYPgWplsyWWxkag6WTRxD26tw1iLPRgM= +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/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 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac= -github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po= +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/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 a3bf25f6..5ee1791c 100644 --- a/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json +++ b/component/vdr/orb/internal/ldcontext/data/activity-anchors-v1.json @@ -6,45 +6,6 @@ "@protected": true, "AnchorEvent": { "@id": "https://w3id.org/activityanchors#AnchorEvent", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type", - "aa": "https://w3id.org/activityanchors#", - "as": "https://www.w3.org/ns/activitystreams#", - "parent": "aa:parent" - } - }, - "AnchorIndex": { - "@id": "https://w3id.org/activityanchors#AnchorIndex", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type", - "aa": "https://w3id.org/activityanchors#", - "as": "https://www.w3.org/ns/activitystreams#", - "resources": { - "@id": "aa:resources", - "@type": "@json" - } - } - }, - "AnchorResource": { - "@id": "https://w3id.org/activityanchors#AnchorResource", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type", - "aa": "https://w3id.org/activityanchors#", - "as": "https://www.w3.org/ns/activitystreams#", - "previousAnchor": "aa:previousAnchor" - } - }, - "AnchorCredential": { - "@id": "https://w3id.org/activityanchors#AnchorCredential", "@context": { "@version": 1.1, "@protected": true, @@ -52,8 +13,8 @@ "type": "@type" } }, - "AnchorProof": { - "@id": "https://w3id.org/activityanchors#AnchorProof", + "AnchorReceipt": { + "@id": "https://w3id.org/activityanchors#AnchorReceipt", "@context": { "@version": 1.1, "@protected": true, @@ -61,8 +22,8 @@ "type": "@type" } }, - "AnchorCredentialReference": { - "@id": "https://w3id.org/activityanchors#AnchorCredentialReference", + "AnchorCredential": { + "@id": "https://w3id.org/activityanchors#AnchorCredential", "@context": { "@version": 1.1, "@protected": true, @@ -70,17 +31,8 @@ "type": "@type" } }, - "ContentAddressedStorage": { - "@id": "https://w3id.org/activityanchors#ContentAddressedStorage", - "@context": { - "@version": 1.1, - "@protected": true, - "id": "@id", - "type": "@type", - "aa": "https://w3id.org/activityanchors#", - "cid": "aa:contentIdentifier" - } - } + "anchor": "https://w3id.org/activityanchors#anchor", + "profile": "https://w3id.org/activityanchors#profile" } } } diff --git a/test/bdd/vdr/orb/fixtures/orb/.env b/test/bdd/vdr/orb/fixtures/orb/.env index 935d1936..762a34d5 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-rc2-snapshot-0a44f37 +ORB_IMAGE_TAG=v1.0.0-rc3-snapshot-17aec9f # 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 1610bd2a..e7c3c052 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/vct-log-server:v1.0.0-rc2 + image: ghcr.io/trustbloc-cicd/vct-log-server:v1.0.0-rc3-snapshot-03b2f10 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/vct-log-signer:v1.0.0-rc2 + image: ghcr.io/trustbloc-cicd/vct-log-signer:v1.0.0-rc3-snapshot-03b2f10 restart: always command: - --quota_system=noop @@ -161,7 +161,7 @@ services: orb.vct: container_name: orb.vct - image: ghcr.io/trustbloc/vct:v1.0.0-rc2 + image: ghcr.io/trustbloc-cicd/vct:v1.0.0-rc3-snapshot-03b2f10 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 1c8c64e4..f792d650 100644 --- a/test/bdd/vdr/orb/go.mod +++ b/test/bdd/vdr/orb/go.mod @@ -9,10 +9,10 @@ go 1.17 require ( github.com/cucumber/godog v0.9.0 github.com/fsouza/go-dockerclient v1.7.4 - github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617 + github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0 github.com/hyperledger/aries-framework-go-ext/component/vdr/orb v0.0.0 github.com/hyperledger/aries-framework-go-ext/component/vdr/sidetree v1.0.0-rc2.0.20220729203359-da1de2fa21ce - github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1 + github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85 github.com/hyperledger/aries-framework-go/spi v0.0.0-20220614152730-3d817acfa48b github.com/trustbloc/edge-core v0.1.8 github.com/trustbloc/sidetree-core-go v1.0.0-rc2.0.20220729143551-6cda4cea3bf5 @@ -25,7 +25,7 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bluele/gcache v0.0.2 // indirect - github.com/btcsuite/btcd v0.22.0-beta // indirect + github.com/btcsuite/btcd v0.22.1 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cespare/xxhash/v2 v2.1.2 // indirect @@ -86,10 +86,10 @@ require ( github.com/sirupsen/logrus v1.8.1 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/square/go-jose/v3 v3.0.0-20200630053402-0a67ce9b0693 // indirect - github.com/stretchr/testify v1.7.2 // 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.20220811160855-64ffb892b32b // indirect - github.com/trustbloc/vct v1.0.0-rc2 // 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/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 8409dda2..1e1f4e73 100644 --- a/test/bdd/vdr/orb/go.sum +++ b/test/bdd/vdr/orb/go.sum @@ -271,8 +271,11 @@ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBW github.com/briankassouf/jose v0.9.2-0.20180619214549-d2569464773f/go.mod h1:HQhVmdUf7dBNwIIdBTivnCDxcf6IZY3/zrb+uKSJz6Y= github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +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/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= 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= github.com/btcsuite/btcutil v1.0.1/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= @@ -959,10 +962,9 @@ github.com/hyperledger/aries-framework-go v0.1.7/go.mod h1:uve8/q23AUnq4EM0vBkEr github.com/hyperledger/aries-framework-go v0.1.8-0.20220217153004-1622c70e5767/go.mod h1:rBMOJVwyHyYbOqbb3IB/ExBkHyvFLht/W81s24GmjcE= github.com/hyperledger/aries-framework-go v0.1.8-0.20220322085443-50e8f9bd208b/go.mod h1:bqeLa1s8fQ7YueGOOk0Q+r48FGF7sd8GEaS/CyEo/iY= github.com/hyperledger/aries-framework-go v0.1.8/go.mod h1:7ilurt17sjWruVIBxZSrwn8qUbROq8LXYYY+O7dNxIM= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220526205258-18d510d84955/go.mod h1:7ilurt17sjWruVIBxZSrwn8qUbROq8LXYYY+O7dNxIM= github.com/hyperledger/aries-framework-go v0.1.9-0.20220714220520-d96b693387a7/go.mod h1:NHOXYxR3jOtO6Uf+WGRreOSrutWSzbIf6g4lmEtaQuU= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617 h1:XT+AkZb78EnO0IMXpUpsZtx2NPTQfDh9xZGPIS9MBqg= -github.com/hyperledger/aries-framework-go v0.1.9-0.20220811152045-03f747c09617/go.mod h1:28aD9QTgVjeAl86vHNFwkOYwQwZiTrrODMpjE2PYz3M= +github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0 h1:qbqWv5zvNB0dvwKvAb8sSs6W9tdVqCQjdsdIkuDPusA= +github.com/hyperledger/aries-framework-go v0.1.9-0.20220819134023-730ac301c3c0/go.mod h1:28aD9QTgVjeAl86vHNFwkOYwQwZiTrrODMpjE2PYz3M= github.com/hyperledger/aries-framework-go-ext/component/storage/couchdb v0.0.0-20220428163625-96d8261511e1/go.mod h1:q8qjsQpYo7AYG0pqQg1zgEoIVc+Hrpf5S0WciiwPDQA= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220428163625-96d8261511e1/go.mod h1:rO6A/9mCSo2pPQqMVmhgGvOkFX/7FVLgoanqazkiKSc= github.com/hyperledger/aries-framework-go-ext/component/storage/mongodb v0.0.0-20220615170242-cda5092b4faf h1:F12zbOSRsye3IWK3Zb6prgrqQQFYnz5zjGSCh9pfYzk= @@ -986,8 +988,8 @@ github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-202203080 github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220322085443-50e8f9bd208b/go.mod h1:yLgRpVlZ2heeeOpTgvEnG/yHL9q1keUu5ILQ6s2qpLU= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220324201531-18c87667df19/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220330133350-1c2d9d65aea4/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= -github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1 h1:WSKq2EIrwKbBiN4ljdf10b5PjtVWzCyhuMldYNOeuwU= -github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220428211718-66cc046674a1/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= +github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85 h1:P82lZe6zDjaP2j87nDYQBSBYrB6Nq6nc9MtyNMC3K4A= +github.com/hyperledger/aries-framework-go/component/storageutil v0.0.0-20220610133818-119077b0ec85/go.mod h1:ryG46jQRvQUUH/0wjORghfJnxJVH1yIXIsAv1GXIWp8= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210320144851-40976de98ccf/go.mod h1:fDr9wW00GJJl1lR1SFHmJW8utIocdvjO5RNhAYS05EY= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210322152545-e6ebe2c79a2a/go.mod h1:fDr9wW00GJJl1lR1SFHmJW8utIocdvjO5RNhAYS05EY= github.com/hyperledger/aries-framework-go/spi v0.0.0-20210409151411-eeeb8508bd87/go.mod h1:dBYKKD8U8U9o0g5BdNFFaRtjt9KTkiAYfQt+TTp+w1o= @@ -1010,6 +1012,7 @@ github.com/hyperledger/aries-framework-go/spi v0.0.0-20220324201531-18c87667df19 github.com/hyperledger/aries-framework-go/spi v0.0.0-20220330133350-1c2d9d65aea4/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220330140627-07042d78580c/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220606124520-53422361c38c/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= +github.com/hyperledger/aries-framework-go/spi v0.0.0-20220610133818-119077b0ec85/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220614152730-3d817acfa48b h1:wSUDDrB87VuaxOmyb0CmA3wB8vvgZ3p9Te4Dnsi6NXs= github.com/hyperledger/aries-framework-go/spi v0.0.0-20220614152730-3d817acfa48b/go.mod h1:4bD5c5fj5K7rkQurVa/8I8+TfNcI4bxIBzaUNcxTOTg= github.com/hyperledger/aries-framework-go/test/component v0.0.0-20210324232048-34ff560ed041/go.mod h1:eKGEEe+PJNDQo7kVif3sUKBWwnsQDkE3gD/QlpmukcQ= @@ -1643,8 +1646,9 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= +github.com/stretchr/testify v1.7.5 h1:s5PTfem8p8EbKQOctVV53k6jCJt3UX4IEJzwh+C324Q= +github.com/stretchr/testify v1.7.5/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= @@ -1677,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.20220811160855-64ffb892b32b h1:lWbbe9PIx8mTXi+zR6r67dDcreePdoalWy7yQWOzGRc= -github.com/trustbloc/orb v1.0.0-rc2.0.20220811160855-64ffb892b32b/go.mod h1:WN2/ZXjYqRjrYPgWplsyWWxkag6WTRxD26tw1iLPRgM= +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/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 h1:iuoG3rLC3V0kuwGnBmnzVPGH6xAxWzpozgkW5T5Qlac= -github.com/trustbloc/vct v1.0.0-rc2/go.mod h1:k45HahHV0lr2h8ldzITXLjcWpTgXzRE8WL1avfC95po= +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/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/test/bdd/vdr/orb/pkg/context/context.go b/test/bdd/vdr/orb/pkg/context/context.go index 1affb17d..f9c9a443 100644 --- a/test/bdd/vdr/orb/pkg/context/context.go +++ b/test/bdd/vdr/orb/pkg/context/context.go @@ -12,9 +12,9 @@ import ( "fmt" "github.com/hyperledger/aries-framework-go/component/storageutil/mem" - ariescontext "github.com/hyperledger/aries-framework-go/pkg/framework/context" "github.com/hyperledger/aries-framework-go/pkg/kms" "github.com/hyperledger/aries-framework-go/pkg/kms/localkms" + "github.com/hyperledger/aries-framework-go/pkg/secretlock" "github.com/hyperledger/aries-framework-go/pkg/secretlock/noop" "github.com/hyperledger/aries-framework-go/spi/storage" tlsutils "github.com/trustbloc/edge-core/pkg/utils/tls" @@ -46,15 +46,33 @@ func NewBDDContext(caCertPaths ...string) (*BDDContext, error) { func createKMS(s storage.Provider) (kms.KeyManager, error) { sl := &noop.NoLock{} // for bdd tests, using no lock - kmsProvider, err := ariescontext.New(ariescontext.WithStorageProvider(s), ariescontext.WithSecretLock(sl)) + kmsStore, err := kms.NewAriesProviderWrapper(s) if err != nil { - return nil, fmt.Errorf("failed to create new kms provider: %w", err) + return nil, fmt.Errorf("create Aries KMS store wrapper: %w", err) } - km, err := localkms.New(masterKeyURI, kmsProvider) + kmsProv := &kmsProvider{ + storageProvider: kmsStore, + secretLockService: sl, + } + + km, err := localkms.New(masterKeyURI, kmsProv) if err != nil { return nil, fmt.Errorf("failed to create new kms: %w", err) } return km, nil } + +type kmsProvider struct { + storageProvider kms.Store + secretLockService secretlock.Service +} + +func (k *kmsProvider) StorageProvider() kms.Store { + return k.storageProvider +} + +func (k *kmsProvider) SecretLock() secretlock.Service { + return k.secretLockService +}