diff --git a/cmd/wallet-sdk-gomobile/api/diddocresolution.go b/cmd/wallet-sdk-gomobile/api/diddocresolution.go index 6a686f7d..643f0c98 100644 --- a/cmd/wallet-sdk-gomobile/api/diddocresolution.go +++ b/cmd/wallet-sdk-gomobile/api/diddocresolution.go @@ -9,7 +9,7 @@ package api import ( "fmt" - diddoc "github.com/trustbloc/vc-go/did" + diddoc "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/wallet-sdk/pkg/models" ) diff --git a/cmd/wallet-sdk-gomobile/credential/signer_test.go b/cmd/wallet-sdk-gomobile/credential/signer_test.go index d5595bd1..41e2bbef 100644 --- a/cmd/wallet-sdk-gomobile/credential/signer_test.go +++ b/cmd/wallet-sdk-gomobile/credential/signer_test.go @@ -15,8 +15,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/trustbloc/vc-go/did" - afgotime "github.com/trustbloc/vc-go/util/time" + "github.com/trustbloc/did-go/doc/did" + afgotime "github.com/trustbloc/did-go/doc/util/time" afgoverifiable "github.com/trustbloc/vc-go/verifiable" . "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/credential" diff --git a/cmd/wallet-sdk-gomobile/credential/status.go b/cmd/wallet-sdk-gomobile/credential/status.go index 98c6e307..e56357d8 100644 --- a/cmd/wallet-sdk-gomobile/credential/status.go +++ b/cmd/wallet-sdk-gomobile/credential/status.go @@ -12,7 +12,7 @@ import ( "net/http" "time" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/api" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/verifiable" diff --git a/cmd/wallet-sdk-gomobile/did/wellknown_test.go b/cmd/wallet-sdk-gomobile/did/wellknown_test.go index 1a0fa413..f403a04b 100644 --- a/cmd/wallet-sdk-gomobile/did/wellknown_test.go +++ b/cmd/wallet-sdk-gomobile/did/wellknown_test.go @@ -15,8 +15,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/trustbloc/did-go/vdr/httpbinding" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" + "github.com/trustbloc/did-go/method/httpbinding" ) //go:embed test_data/didconfig.json diff --git a/cmd/wallet-sdk-gomobile/go.mod b/cmd/wallet-sdk-gomobile/go.mod index ff065389..d0be87b3 100644 --- a/cmd/wallet-sdk-gomobile/go.mod +++ b/cmd/wallet-sdk-gomobile/go.mod @@ -13,10 +13,10 @@ require ( github.com/go-jose/go-jose/v3 v3.0.1-0.20221117193127-916db76e8214 github.com/google/uuid v1.3.0 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f - github.com/stretchr/testify v1.8.1 - github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948 - github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 - github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e + github.com/stretchr/testify v1.8.2 + github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 + github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d + github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 github.com/trustbloc/wallet-sdk v0.0.0-00010101000000-000000000000 ) @@ -27,8 +27,8 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // 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.0.2 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.9.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -36,8 +36,6 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/tink/go v1.7.0 // indirect - github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de // indirect - github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect @@ -68,8 +66,8 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.opentelemetry.io/otel v1.12.0 // indirect - go.opentelemetry.io/otel/trace v1.12.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.23.0 // indirect diff --git a/cmd/wallet-sdk-gomobile/go.sum b/cmd/wallet-sdk-gomobile/go.sum index 8f41f05b..f8d08c51 100644 --- a/cmd/wallet-sdk-gomobile/go.sum +++ b/cmd/wallet-sdk-gomobile/go.sum @@ -27,10 +27,11 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= -github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.9.1 h1:mru55qKdWl3E035hAoh1jj9d7hVnYY5pfb6tmovSmII= @@ -68,10 +69,6 @@ github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcg github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de h1:SL1mbNu73iPT/vxg/HHCJJGTdLBPh2DXVU3fuxYrIWc= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de/go.mod h1:ud/DVY5ENA3DaMuga1NwN0vsqMtaoZmGbbQYao+fKIg= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de h1:8taNuOJFN9P23vl2rcoEqhKeF2fxXuHLDpnLld69MeU= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de/go.mod h1:6QsNztGTbY1x1rLDodVk3nznsNtd0VlZWgeIHSd5rZw= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE= github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA= @@ -137,8 +134,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 h1:RBkacARv7qY5laaXGlF4wFB/tk5rnthhPb8oIBGoagY= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8/go.mod h1:9PdLyPiZIiW3UopXyRnPYyjUXSpiQNHRLu8fOsR3o8M= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= @@ -152,16 +149,16 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= 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/did-go v0.0.0-20230824183959-e9f47dff3948 h1:7ybfE2c3zVA9+ZR5epnL8TRY8dVBKb+EKmU/qV3JRwQ= -github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948/go.mod h1:fA8VeSa9D6RCXaR6nxEeMlm+gk59vul2oheDUGhc29E= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 h1:c/xUQqjexXF3LBu9KpCKUKLQCnStchF36AVdEGiFZaI= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333/go.mod h1:QX5mfoujd84Z0mw+Qt2wDZZSrgJ5CiVkfmHBCb/lj9w= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 h1:LBzlW4wcV7CE5Z6pUgjygbeR9Zx9mlTccROd6LG+hJQ= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514/go.mod h1:a6n/pyvfRPY5bnalgnj+bRB1B1SMBEMnadtlRh8esBo= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d h1:g74oJV+MT440kUsYNDsTnDt5kV96fNF70bVCl8M3lEs= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d/go.mod h1:1rvrHRuIRT7qLapB0lSpFgy1CjFunx85EyEzcZpIxG8= github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c= github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc= github.com/trustbloc/sidetree-core-go v1.0.0 h1:kzfKZOJ0sgDy9D1AYNcoR3JHutqtMtKvF2P9UwUcDjU= github.com/trustbloc/sidetree-core-go v1.0.0/go.mod h1:jdxAFuorlIwFOGVW6O455/lZqxg2mZkRHNTEolcZdDI= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e h1:+N45XxJm5fNRrK+2hYS9e6Kdhi13pxcGGWFFbQRAJ4M= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e/go.mod h1:/m+e7GTb/YSGhdLncsvL6aC62N2agCdFit7aI4uDpaI= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 h1:rpv48mIg2wnfMDDlX+jYZYXaXTopVp4H3SnvNZNjNRM= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099/go.mod h1:7x0KWtXL0cileJlBjdQYeWqX/LMunrOuqFUIar4XHIY= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -169,12 +166,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/cmd/wallet-sdk-gomobile/openid4ci/interaction.go b/cmd/wallet-sdk-gomobile/openid4ci/interaction.go index d9ceda10..ba0dcee6 100644 --- a/cmd/wallet-sdk-gomobile/openid4ci/interaction.go +++ b/cmd/wallet-sdk-gomobile/openid4ci/interaction.go @@ -53,10 +53,6 @@ func createGoAPIClientConfig(didResolver api.DIDResolver, opts *InteractionOpts) } } - if opts.kms != nil { - goAPIClientConfig.Verifier = opts.kms.GoAPILocalKMS.AriesCrypto - } - return goAPIClientConfig, nil } diff --git a/cmd/wallet-sdk-gomobile/openid4ci/issuerinitiatedinteraction_test.go b/cmd/wallet-sdk-gomobile/openid4ci/issuerinitiatedinteraction_test.go index adff8d74..6d79449b 100644 --- a/cmd/wallet-sdk-gomobile/openid4ci/issuerinitiatedinteraction_test.go +++ b/cmd/wallet-sdk-gomobile/openid4ci/issuerinitiatedinteraction_test.go @@ -19,8 +19,8 @@ import ( "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" arieskms "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/activitylogger/mem" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/api" diff --git a/cmd/wallet-sdk-gomobile/openid4vp/interaction_test.go b/cmd/wallet-sdk-gomobile/openid4vp/interaction_test.go index 957e05bc..2af70b2f 100644 --- a/cmd/wallet-sdk-gomobile/openid4vp/interaction_test.go +++ b/cmd/wallet-sdk-gomobile/openid4vp/interaction_test.go @@ -25,7 +25,7 @@ import ( "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/require" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/vc-go/presexch" afgoverifiable "github.com/trustbloc/vc-go/verifiable" diff --git a/cmd/wallet-sdk-gomobile/wrapper/resolverwrapper.go b/cmd/wallet-sdk-gomobile/wrapper/resolverwrapper.go index 43539934..d2d9f945 100644 --- a/cmd/wallet-sdk-gomobile/wrapper/resolverwrapper.go +++ b/cmd/wallet-sdk-gomobile/wrapper/resolverwrapper.go @@ -9,7 +9,7 @@ package wrapper import ( "fmt" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/api" ) diff --git a/cmd/wallet-sdk-js/go.mod b/cmd/wallet-sdk-js/go.mod index b83e8d6a..84f97ee8 100644 --- a/cmd/wallet-sdk-js/go.mod +++ b/cmd/wallet-sdk-js/go.mod @@ -10,9 +10,10 @@ toolchain go1.21.0 require ( github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f - github.com/stretchr/testify v1.8.1 - github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 - github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e + github.com/stretchr/testify v1.8.2 + github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 + github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d + github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 github.com/trustbloc/wallet-sdk v0.0.0-00010101000000-000000000000 ) @@ -23,8 +24,8 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // 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.0.2 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.9.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -34,8 +35,6 @@ require ( github.com/golang/snappy v0.0.4 // indirect github.com/google/tink/go v1.7.0 // indirect github.com/google/uuid v1.3.0 // indirect - github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de // indirect - github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect @@ -61,14 +60,13 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/sjson v1.1.4 // indirect - github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948 // indirect github.com/trustbloc/logutil-go v1.0.0-rc1 // indirect github.com/trustbloc/sidetree-core-go v1.0.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.opentelemetry.io/otel v1.12.0 // indirect - go.opentelemetry.io/otel/trace v1.12.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.23.0 // indirect diff --git a/cmd/wallet-sdk-js/go.sum b/cmd/wallet-sdk-js/go.sum index 5d923aff..a108bf88 100644 --- a/cmd/wallet-sdk-js/go.sum +++ b/cmd/wallet-sdk-js/go.sum @@ -27,10 +27,11 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= -github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.9.1 h1:mru55qKdWl3E035hAoh1jj9d7hVnYY5pfb6tmovSmII= @@ -68,10 +69,6 @@ github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcg github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de h1:SL1mbNu73iPT/vxg/HHCJJGTdLBPh2DXVU3fuxYrIWc= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de/go.mod h1:ud/DVY5ENA3DaMuga1NwN0vsqMtaoZmGbbQYao+fKIg= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de h1:8taNuOJFN9P23vl2rcoEqhKeF2fxXuHLDpnLld69MeU= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de/go.mod h1:6QsNztGTbY1x1rLDodVk3nznsNtd0VlZWgeIHSd5rZw= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE= github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA= @@ -137,8 +134,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 h1:RBkacARv7qY5laaXGlF4wFB/tk5rnthhPb8oIBGoagY= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8/go.mod h1:9PdLyPiZIiW3UopXyRnPYyjUXSpiQNHRLu8fOsR3o8M= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= @@ -152,16 +149,16 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= 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/did-go v0.0.0-20230824183959-e9f47dff3948 h1:7ybfE2c3zVA9+ZR5epnL8TRY8dVBKb+EKmU/qV3JRwQ= -github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948/go.mod h1:fA8VeSa9D6RCXaR6nxEeMlm+gk59vul2oheDUGhc29E= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 h1:c/xUQqjexXF3LBu9KpCKUKLQCnStchF36AVdEGiFZaI= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333/go.mod h1:QX5mfoujd84Z0mw+Qt2wDZZSrgJ5CiVkfmHBCb/lj9w= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 h1:LBzlW4wcV7CE5Z6pUgjygbeR9Zx9mlTccROd6LG+hJQ= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514/go.mod h1:a6n/pyvfRPY5bnalgnj+bRB1B1SMBEMnadtlRh8esBo= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d h1:g74oJV+MT440kUsYNDsTnDt5kV96fNF70bVCl8M3lEs= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d/go.mod h1:1rvrHRuIRT7qLapB0lSpFgy1CjFunx85EyEzcZpIxG8= github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c= github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc= github.com/trustbloc/sidetree-core-go v1.0.0 h1:kzfKZOJ0sgDy9D1AYNcoR3JHutqtMtKvF2P9UwUcDjU= github.com/trustbloc/sidetree-core-go v1.0.0/go.mod h1:jdxAFuorlIwFOGVW6O455/lZqxg2mZkRHNTEolcZdDI= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e h1:+N45XxJm5fNRrK+2hYS9e6Kdhi13pxcGGWFFbQRAJ4M= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e/go.mod h1:/m+e7GTb/YSGhdLncsvL6aC62N2agCdFit7aI4uDpaI= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 h1:rpv48mIg2wnfMDDlX+jYZYXaXTopVp4H3SnvNZNjNRM= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099/go.mod h1:7x0KWtXL0cileJlBjdQYeWqX/LMunrOuqFUIar4XHIY= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -169,12 +166,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/cmd/wallet-sdk-js/jsinterop/types/diddoc.go b/cmd/wallet-sdk-js/jsinterop/types/diddoc.go index 23a8fc62..90d05c04 100644 --- a/cmd/wallet-sdk-js/jsinterop/types/diddoc.go +++ b/cmd/wallet-sdk-js/jsinterop/types/diddoc.go @@ -12,7 +12,7 @@ import ( "fmt" "syscall/js" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-js/jsinterop/jssupport" ) diff --git a/cmd/wallet-sdk-js/jsinterop/types/openid4ci.go b/cmd/wallet-sdk-js/jsinterop/types/openid4ci.go index 928283fd..7035348b 100644 --- a/cmd/wallet-sdk-js/jsinterop/types/openid4ci.go +++ b/cmd/wallet-sdk-js/jsinterop/types/openid4ci.go @@ -13,7 +13,7 @@ import ( "fmt" "syscall/js" - diddoc "github.com/trustbloc/vc-go/did" + diddoc "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-js/jsinterop/jssupport" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-js/util" diff --git a/cmd/wallet-sdk-js/walletsdk/agent.go b/cmd/wallet-sdk-js/walletsdk/agent.go index 363b851e..fd05a01c 100644 --- a/cmd/wallet-sdk-js/walletsdk/agent.go +++ b/cmd/wallet-sdk-js/walletsdk/agent.go @@ -13,8 +13,8 @@ import ( "net/http" jsonld "github.com/piprate/json-gold/ld" + "github.com/trustbloc/did-go/doc/did" arieskms "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/vc-go/jwt" "github.com/trustbloc/vc-go/presexch" "github.com/trustbloc/vc-go/verifiable" diff --git a/go.mod b/go.mod index 871cef9d..f18b7dd8 100644 --- a/go.mod +++ b/go.mod @@ -7,17 +7,15 @@ module github.com/trustbloc/wallet-sdk go 1.21 -toolchain go1.21.0 - require ( github.com/go-jose/go-jose/v3 v3.0.1-0.20221117193127-916db76e8214 github.com/google/tink/go v1.7.0 github.com/google/uuid v1.3.0 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f - github.com/stretchr/testify v1.8.1 - github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948 - github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 - github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e + github.com/stretchr/testify v1.8.2 + github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 + github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d + github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 golang.org/x/oauth2 v0.7.0 ) @@ -28,16 +26,14 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // 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.0.2 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.9.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/evanphx/json-patch v4.1.0+incompatible // indirect github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect - github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de // indirect - github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect @@ -68,8 +64,8 @@ require ( github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.opentelemetry.io/otel v1.12.0 // indirect - go.opentelemetry.io/otel/trace v1.12.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.23.0 // indirect diff --git a/go.sum b/go.sum index 9acd0bb2..bc900d3f 100644 --- a/go.sum +++ b/go.sum @@ -27,10 +27,11 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= -github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.9.1 h1:mru55qKdWl3E035hAoh1jj9d7hVnYY5pfb6tmovSmII= @@ -68,10 +69,6 @@ github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcg github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de h1:SL1mbNu73iPT/vxg/HHCJJGTdLBPh2DXVU3fuxYrIWc= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de/go.mod h1:ud/DVY5ENA3DaMuga1NwN0vsqMtaoZmGbbQYao+fKIg= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de h1:8taNuOJFN9P23vl2rcoEqhKeF2fxXuHLDpnLld69MeU= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de/go.mod h1:6QsNztGTbY1x1rLDodVk3nznsNtd0VlZWgeIHSd5rZw= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE= github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA= @@ -137,8 +134,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 h1:RBkacARv7qY5laaXGlF4wFB/tk5rnthhPb8oIBGoagY= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8/go.mod h1:9PdLyPiZIiW3UopXyRnPYyjUXSpiQNHRLu8fOsR3o8M= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= @@ -152,16 +149,16 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= 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/did-go v0.0.0-20230824183959-e9f47dff3948 h1:7ybfE2c3zVA9+ZR5epnL8TRY8dVBKb+EKmU/qV3JRwQ= -github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948/go.mod h1:fA8VeSa9D6RCXaR6nxEeMlm+gk59vul2oheDUGhc29E= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 h1:c/xUQqjexXF3LBu9KpCKUKLQCnStchF36AVdEGiFZaI= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333/go.mod h1:QX5mfoujd84Z0mw+Qt2wDZZSrgJ5CiVkfmHBCb/lj9w= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 h1:LBzlW4wcV7CE5Z6pUgjygbeR9Zx9mlTccROd6LG+hJQ= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514/go.mod h1:a6n/pyvfRPY5bnalgnj+bRB1B1SMBEMnadtlRh8esBo= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d h1:g74oJV+MT440kUsYNDsTnDt5kV96fNF70bVCl8M3lEs= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d/go.mod h1:1rvrHRuIRT7qLapB0lSpFgy1CjFunx85EyEzcZpIxG8= github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c= github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc= github.com/trustbloc/sidetree-core-go v1.0.0 h1:kzfKZOJ0sgDy9D1AYNcoR3JHutqtMtKvF2P9UwUcDjU= github.com/trustbloc/sidetree-core-go v1.0.0/go.mod h1:jdxAFuorlIwFOGVW6O455/lZqxg2mZkRHNTEolcZdDI= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e h1:+N45XxJm5fNRrK+2hYS9e6Kdhi13pxcGGWFFbQRAJ4M= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e/go.mod h1:/m+e7GTb/YSGhdLncsvL6aC62N2agCdFit7aI4uDpaI= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 h1:rpv48mIg2wnfMDDlX+jYZYXaXTopVp4H3SnvNZNjNRM= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099/go.mod h1:7x0KWtXL0cileJlBjdQYeWqX/LMunrOuqFUIar4XHIY= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -169,12 +166,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/internal/testutil/document_loader.go b/internal/testutil/document_loader.go index adffb256..153f0773 100644 --- a/internal/testutil/document_loader.go +++ b/internal/testutil/document_loader.go @@ -12,10 +12,10 @@ import ( "testing" "github.com/stretchr/testify/require" - ldcontext "github.com/trustbloc/vc-go/ld/context" - lddocloader "github.com/trustbloc/vc-go/ld/documentloader" - mockldstore "github.com/trustbloc/vc-go/ld/mock" - ldstore "github.com/trustbloc/vc-go/ld/store" + ldcontext "github.com/trustbloc/did-go/doc/ld/context" + lddocloader "github.com/trustbloc/did-go/doc/ld/documentloader" + mockldstore "github.com/trustbloc/did-go/doc/ld/mock" + ldstore "github.com/trustbloc/did-go/doc/ld/store" ) var ( diff --git a/pkg/api/api.go b/pkg/api/api.go index 6e7ad2a5..e36b7580 100644 --- a/pkg/api/api.go +++ b/pkg/api/api.go @@ -10,10 +10,10 @@ package api import ( "time" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose" "github.com/trustbloc/kms-go/doc/jose/jwk" "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/vc-go/verifiable" ) diff --git a/pkg/common/doc_loader.go b/pkg/common/doc_loader.go index 88960706..ff4e3aae 100644 --- a/pkg/common/doc_loader.go +++ b/pkg/common/doc_loader.go @@ -12,10 +12,10 @@ import ( "net/http" jsonld "github.com/piprate/json-gold/ld" + ldcontext "github.com/trustbloc/did-go/doc/ld/context" + lddocloader "github.com/trustbloc/did-go/doc/ld/documentloader" + ldstore "github.com/trustbloc/did-go/doc/ld/store" "github.com/trustbloc/kms-go/spi/storage" - ldcontext "github.com/trustbloc/vc-go/ld/context" - lddocloader "github.com/trustbloc/vc-go/ld/documentloader" - ldstore "github.com/trustbloc/vc-go/ld/store" ) var ( diff --git a/pkg/common/keyresolver_test.go b/pkg/common/keyresolver_test.go index abb19ed8..648e35f6 100644 --- a/pkg/common/keyresolver_test.go +++ b/pkg/common/keyresolver_test.go @@ -12,9 +12,9 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" vdrapi "github.com/trustbloc/did-go/vdr/api" mockvdr "github.com/trustbloc/did-go/vdr/mock" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/pkg/common" ) diff --git a/pkg/credentialquery/credentialquery_test.go b/pkg/credentialquery/credentialquery_test.go index 975451c5..eb2c6f4f 100644 --- a/pkg/credentialquery/credentialquery_test.go +++ b/pkg/credentialquery/credentialquery_test.go @@ -13,7 +13,7 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/vc-go/presexch" "github.com/trustbloc/vc-go/verifiable" diff --git a/pkg/credentialsigner/signer.go b/pkg/credentialsigner/signer.go index f39116fe..87ea8cd2 100644 --- a/pkg/credentialsigner/signer.go +++ b/pkg/credentialsigner/signer.go @@ -11,9 +11,9 @@ import ( "errors" "fmt" - diddoc "github.com/trustbloc/vc-go/did" + diddoc "github.com/trustbloc/did-go/doc/did" + vdrapi "github.com/trustbloc/did-go/vdr/api" "github.com/trustbloc/vc-go/jwt/didsignjwt" - vdrspi "github.com/trustbloc/vc-go/spi/vdr" "github.com/trustbloc/vc-go/verifiable" "github.com/trustbloc/wallet-sdk/pkg/api" @@ -150,6 +150,6 @@ type didResolverWrapper struct { didResolver api.DIDResolver } -func (d *didResolverWrapper) Resolve(did string, _ ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (d *didResolverWrapper) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return d.didResolver.Resolve(did) } diff --git a/pkg/credentialsigner/signer_test.go b/pkg/credentialsigner/signer_test.go index dc415217..1e919d6d 100644 --- a/pkg/credentialsigner/signer_test.go +++ b/pkg/credentialsigner/signer_test.go @@ -14,8 +14,8 @@ import ( "time" "github.com/stretchr/testify/require" - "github.com/trustbloc/vc-go/did" - afgotime "github.com/trustbloc/vc-go/util/time" + "github.com/trustbloc/did-go/doc/did" + afgotime "github.com/trustbloc/did-go/doc/util/time" "github.com/trustbloc/vc-go/verifiable" . "github.com/trustbloc/wallet-sdk/pkg/credentialsigner" diff --git a/pkg/credentialstatus/credentialstatus.go b/pkg/credentialstatus/credentialstatus.go index d1381ed2..34bb9fee 100644 --- a/pkg/credentialstatus/credentialstatus.go +++ b/pkg/credentialstatus/credentialstatus.go @@ -12,8 +12,8 @@ import ( "fmt" "net/http" - diddoc "github.com/trustbloc/vc-go/did" - vdrspi "github.com/trustbloc/vc-go/spi/vdr" + diddoc "github.com/trustbloc/did-go/doc/did" + vdrapi "github.com/trustbloc/did-go/vdr/api" "github.com/trustbloc/vc-go/status" "github.com/trustbloc/vc-go/status/resolver" "github.com/trustbloc/vc-go/status/validator" @@ -68,19 +68,19 @@ type wrapResolver struct { resolver api.DIDResolver } -func (w *wrapResolver) Resolve(did string, _ ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (w *wrapResolver) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return w.resolver.Resolve(did) } -func (w *wrapResolver) Create(string, *diddoc.Doc, ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (w *wrapResolver) Create(string, *diddoc.Doc, ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return nil, fmt.Errorf("create operation is not supported") } -func (w *wrapResolver) Update(*diddoc.Doc, ...vdrspi.DIDMethodOption) error { +func (w *wrapResolver) Update(*diddoc.Doc, ...vdrapi.DIDMethodOption) error { return fmt.Errorf("update operation is not supported") } -func (w *wrapResolver) Deactivate(string, ...vdrspi.DIDMethodOption) error { +func (w *wrapResolver) Deactivate(string, ...vdrapi.DIDMethodOption) error { return fmt.Errorf("deactivate operation is not supported") } diff --git a/pkg/did/creator/creator.go b/pkg/did/creator/creator.go index 81307e29..50f426c7 100644 --- a/pkg/did/creator/creator.go +++ b/pkg/did/creator/creator.go @@ -12,9 +12,9 @@ import ( "fmt" "time" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose/jwk" arieskms "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/pkg/api" diderrors "github.com/trustbloc/wallet-sdk/pkg/did" diff --git a/pkg/did/creator/ion/ion.go b/pkg/did/creator/ion/ion.go index fbbfe9a9..2e736e46 100644 --- a/pkg/did/creator/ion/ion.go +++ b/pkg/did/creator/ion/ion.go @@ -10,10 +10,10 @@ package ion import ( "fmt" - "github.com/trustbloc/did-go/method/longform" + "github.com/trustbloc/did-go/doc/did" + longform "github.com/trustbloc/did-go/method/sidetreelongform" + vdrapi "github.com/trustbloc/did-go/vdr/api" "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" - vdrspi "github.com/trustbloc/vc-go/spi/vdr" "github.com/trustbloc/wallet-sdk/pkg/api" ) @@ -64,8 +64,8 @@ func (d *Creator) Create(vm *did.VerificationMethod) (*did.DocResolution, error) return d.vdr.Create( didDocArgument, - vdrspi.WithOption(longform.UpdatePublicKeyOpt, updatePK), - vdrspi.WithOption(longform.RecoveryPublicKeyOpt, recoveryPK), + vdrapi.WithOption(longform.UpdatePublicKeyOpt, updatePK), + vdrapi.WithOption(longform.RecoveryPublicKeyOpt, recoveryPK), ) } diff --git a/pkg/did/creator/ion/ion_test.go b/pkg/did/creator/ion/ion_test.go index 74260221..9c98ab7a 100644 --- a/pkg/did/creator/ion/ion_test.go +++ b/pkg/did/creator/ion/ion_test.go @@ -11,9 +11,9 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose/jwk" "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/pkg/common" . "github.com/trustbloc/wallet-sdk/pkg/did/creator/ion" diff --git a/pkg/did/creator/jwk/jwk.go b/pkg/did/creator/jwk/jwk.go index fe03d42b..a3252f8a 100644 --- a/pkg/did/creator/jwk/jwk.go +++ b/pkg/did/creator/jwk/jwk.go @@ -10,8 +10,8 @@ package jwk import ( "fmt" + "github.com/trustbloc/did-go/doc/did" jwkvdr "github.com/trustbloc/did-go/method/jwk" - "github.com/trustbloc/vc-go/did" ) // Creator creates did:jwk DID Documents. diff --git a/pkg/did/creator/jwk/jwk_test.go b/pkg/did/creator/jwk/jwk_test.go index af8ed6d4..9c89978c 100644 --- a/pkg/did/creator/jwk/jwk_test.go +++ b/pkg/did/creator/jwk/jwk_test.go @@ -15,11 +15,11 @@ import ( "testing" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose/jwk" "github.com/trustbloc/kms-go/doc/jose/jwk/jwksupport" "github.com/trustbloc/kms-go/doc/util/jwkkid" "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/pkg/did/creator" . "github.com/trustbloc/wallet-sdk/pkg/did/creator/jwk" diff --git a/pkg/did/creator/key/key.go b/pkg/did/creator/key/key.go index 8d5d0780..298cd5bc 100644 --- a/pkg/did/creator/key/key.go +++ b/pkg/did/creator/key/key.go @@ -8,8 +8,8 @@ SPDX-License-Identifier: Apache-2.0 package key import ( - "github.com/trustbloc/did-go/vdr/key" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" + "github.com/trustbloc/did-go/method/key" ) // Creator is used for creating did:key DID Documents. diff --git a/pkg/did/resolver/resolver.go b/pkg/did/resolver/resolver.go index 3b71b374..834c0d09 100644 --- a/pkg/did/resolver/resolver.go +++ b/pkg/did/resolver/resolver.go @@ -11,16 +11,15 @@ package resolver import ( "fmt" - "github.com/trustbloc/wallet-sdk/pkg/api" - + didDoc "github.com/trustbloc/did-go/doc/did" + "github.com/trustbloc/did-go/method/httpbinding" "github.com/trustbloc/did-go/method/jwk" - "github.com/trustbloc/did-go/method/longform" + "github.com/trustbloc/did-go/method/key" + longform "github.com/trustbloc/did-go/method/sidetreelongform" + "github.com/trustbloc/did-go/method/web" "github.com/trustbloc/did-go/vdr" - "github.com/trustbloc/did-go/vdr/httpbinding" - "github.com/trustbloc/did-go/vdr/key" - "github.com/trustbloc/did-go/vdr/web" - didDoc "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/wallet-sdk/pkg/api" diderrors "github.com/trustbloc/wallet-sdk/pkg/did" "github.com/trustbloc/wallet-sdk/pkg/walleterror" ) diff --git a/pkg/did/wellknown/wellknown.go b/pkg/did/wellknown/wellknown.go index 7e523396..b2d645ff 100644 --- a/pkg/did/wellknown/wellknown.go +++ b/pkg/did/wellknown/wellknown.go @@ -14,9 +14,9 @@ import ( "net/http" "strings" - didconfig "github.com/trustbloc/did-go/didconfig/client" - diddoc "github.com/trustbloc/vc-go/did" - vdrspi "github.com/trustbloc/vc-go/spi/vdr" + diddoc "github.com/trustbloc/did-go/doc/did" + vdrapi "github.com/trustbloc/did-go/vdr/api" + didconfig "github.com/trustbloc/vc-go/didconfig/client" "github.com/trustbloc/wallet-sdk/pkg/api" diderrors "github.com/trustbloc/wallet-sdk/pkg/did" @@ -119,6 +119,6 @@ type didResolverWrapper struct { didResolver api.DIDResolver } -func (d *didResolverWrapper) Resolve(did string, _ ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (d *didResolverWrapper) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return d.didResolver.Resolve(did) } diff --git a/pkg/did/wellknown/wellknown_test.go b/pkg/did/wellknown/wellknown_test.go index 37bac8fb..d3613191 100644 --- a/pkg/did/wellknown/wellknown_test.go +++ b/pkg/did/wellknown/wellknown_test.go @@ -16,8 +16,8 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/trustbloc/did-go/vdr/httpbinding" - "github.com/trustbloc/vc-go/did" + "github.com/trustbloc/did-go/doc/did" + "github.com/trustbloc/did-go/method/httpbinding" "github.com/trustbloc/wallet-sdk/internal/testutil" "github.com/trustbloc/wallet-sdk/pkg/did/resolver" diff --git a/pkg/models/verificationmethod.go b/pkg/models/verificationmethod.go index 880c3aa3..8f660f06 100644 --- a/pkg/models/verificationmethod.go +++ b/pkg/models/verificationmethod.go @@ -8,8 +8,8 @@ SPDX-License-Identifier: Apache-2.0 package models import ( + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose/jwk" - "github.com/trustbloc/vc-go/did" ) // VerificationKey holds either a JWK or a raw public key. diff --git a/pkg/openid4ci/clientconfig.go b/pkg/openid4ci/clientconfig.go index 10956900..8181fdce 100644 --- a/pkg/openid4ci/clientconfig.go +++ b/pkg/openid4ci/clientconfig.go @@ -11,11 +11,9 @@ import ( "net/http" "time" - "github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019" - "github.com/piprate/json-gold/ld" - diddoc "github.com/trustbloc/vc-go/did" - "github.com/trustbloc/vc-go/spi/vdr" + diddoc "github.com/trustbloc/did-go/doc/did" + vdrapi "github.com/trustbloc/did-go/vdr/api" noopactivitylogger "github.com/trustbloc/wallet-sdk/pkg/activitylogger/noop" "github.com/trustbloc/wallet-sdk/pkg/api" @@ -26,7 +24,7 @@ type didResolverWrapper struct { didResolver api.DIDResolver } -func (d *didResolverWrapper) Resolve(did string, _ ...vdr.DIDMethodOption) (*diddoc.DocResolution, error) { +func (d *didResolverWrapper) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return d.didResolver.Resolve(did) } @@ -45,8 +43,6 @@ type ClientConfig struct { DocumentLoader ld.DocumentLoader // If not specified, then a network-based loader will be used. NetworkDocumentLoaderHTTPTimeout *time.Duration // Only used if the default network-based loader is used. HTTPClient *http.Client - // If the Verifier field is set, then VC data integrity proof checks for JSON-LD VCs will be enabled. - Verifier ecdsa2019.Verifier } func validateRequiredParameters(config *ClientConfig) error { diff --git a/pkg/openid4ci/interaction.go b/pkg/openid4ci/interaction.go index cec4dea3..d79bcd2e 100644 --- a/pkg/openid4ci/interaction.go +++ b/pkg/openid4ci/interaction.go @@ -53,7 +53,6 @@ type interaction struct { httpClient *http.Client authCodeURLState string codeVerifier string - verifier ecdsa2019.Verifier } func (i *interaction) createAuthorizationURL(clientID, redirectURI, format string, types []string, issuerState *string, @@ -534,21 +533,18 @@ func (i *interaction) getVCsFromCredentialResponses( verifiable.WithPublicKeyFetcher(vdrKeyResolver.PublicKeyFetcher()), } - if i.verifier != nil { - opts := dataintegrity.Options{DIDResolver: i.didResolver} + opts := dataintegrity.Options{DIDResolver: i.didResolver} - dataIntegrityVerifier, err := dataintegrity.NewVerifier(&opts, - ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{ - LDDocumentLoader: i.documentLoader, - Verifier: i.verifier, - })) - if err != nil { - return nil, err - } - - credentialOpts = append(credentialOpts, verifiable.WithDataIntegrityVerifier(dataIntegrityVerifier)) + dataIntegrityVerifier, err := dataintegrity.NewVerifier(&opts, + ecdsa2019.NewVerifierInitializer(&ecdsa2019.VerifierInitializerOptions{ + LDDocumentLoader: i.documentLoader, + })) + if err != nil { + return nil, err } + credentialOpts = append(credentialOpts, verifiable.WithDataIntegrityVerifier(dataIntegrityVerifier)) + if i.disableVCProofChecks { credentialOpts = append(credentialOpts, verifiable.WithDisabledProofCheck()) } diff --git a/pkg/openid4ci/issuerinitiatedinteraction.go b/pkg/openid4ci/issuerinitiatedinteraction.go index 59e536b9..1a2f89c1 100644 --- a/pkg/openid4ci/issuerinitiatedinteraction.go +++ b/pkg/openid4ci/issuerinitiatedinteraction.go @@ -107,7 +107,6 @@ func NewIssuerInitiatedInteraction(initiateIssuanceURI string, disableVCProofChecks: config.DisableVCProofChecks, documentLoader: config.DocumentLoader, httpClient: config.HTTPClient, - verifier: config.Verifier, }, preAuthorizedCodeGrantParams: preAuthorizedCodeGrantParams, authorizationCodeGrantParams: authorizationCodeGrantParams, diff --git a/pkg/openid4ci/issuerinitiatedinteraction_test.go b/pkg/openid4ci/issuerinitiatedinteraction_test.go index 6d8c4792..3194c2ce 100644 --- a/pkg/openid4ci/issuerinitiatedinteraction_test.go +++ b/pkg/openid4ci/issuerinitiatedinteraction_test.go @@ -18,9 +18,9 @@ import ( "time" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/doc/jose" arieskms "github.com/trustbloc/kms-go/spi/kms" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/wallet-sdk/internal/testutil" "github.com/trustbloc/wallet-sdk/pkg/api" @@ -1625,7 +1625,6 @@ func getTestClientConfig(t *testing.T) *openid4ci.ClientConfig { DIDResolver: didResolver, DisableVCProofChecks: true, NetworkDocumentLoaderHTTPTimeout: &networkDocumentLoaderHTTPTimeout, - Verifier: localKMS.AriesCrypto, } } diff --git a/pkg/openid4ci/walletinitiatedinteraction.go b/pkg/openid4ci/walletinitiatedinteraction.go index 747b35fd..7bd01c8d 100644 --- a/pkg/openid4ci/walletinitiatedinteraction.go +++ b/pkg/openid4ci/walletinitiatedinteraction.go @@ -51,7 +51,6 @@ func NewWalletInitiatedInteraction(issuerURI string, config *ClientConfig) (*Wal disableVCProofChecks: config.DisableVCProofChecks, documentLoader: config.DocumentLoader, httpClient: config.HTTPClient, - verifier: config.Verifier, }, }, config.MetricsLogger.Log(&api.MetricsEvent{ Event: newInteractionEventText, diff --git a/pkg/openid4vp/openid4vp.go b/pkg/openid4vp/openid4vp.go index d827629f..6e7d76ea 100644 --- a/pkg/openid4vp/openid4vp.go +++ b/pkg/openid4vp/openid4vp.go @@ -21,14 +21,14 @@ import ( "github.com/google/uuid" "github.com/piprate/json-gold/ld" + diddoc "github.com/trustbloc/did-go/doc/did" + vdrapi "github.com/trustbloc/did-go/vdr/api" "github.com/trustbloc/kms-go/doc/jose" "github.com/trustbloc/kms-go/spi/kms" "github.com/trustbloc/vc-go/dataintegrity" "github.com/trustbloc/vc-go/dataintegrity/suite/ecdsa2019" - diddoc "github.com/trustbloc/vc-go/did" "github.com/trustbloc/vc-go/jwt" "github.com/trustbloc/vc-go/presexch" - vdrspi "github.com/trustbloc/vc-go/spi/vdr" "github.com/trustbloc/vc-go/verifiable" "github.com/trustbloc/wallet-sdk/pkg/api" @@ -53,7 +53,7 @@ type didResolverWrapper struct { didResolver api.DIDResolver } -func (d *didResolverWrapper) Resolve(did string, _ ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (d *didResolverWrapper) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return d.didResolver.Resolve(did) } @@ -74,7 +74,7 @@ type Interaction struct { didResolver api.DIDResolver crypto api.Crypto documentLoader ld.DocumentLoader - signer ecdsa2019.Signer + signer ecdsa2019.KMSSigner keyManager kms.KeyManager } @@ -148,7 +148,7 @@ func (o *Interaction) VerifierDisplayData() *VerifierDisplayData { type presentOpts struct { ignoreConstraints bool - signer ecdsa2019.Signer + signer ecdsa2019.KMSSigner kms kms.KeyManager } @@ -345,14 +345,26 @@ func createAuthorizedResponseOneCred( //nolint:funlen,gocyclo // Unable to decom return nil, fmt.Errorf("presentation VC does not have a subject ID") } + signingVM, err := getSigningVM(did, didResolver) + if err != nil { + return nil, err + } + if opts != nil && opts.signer != nil && opts.kms != nil { - err = addDataIntegrityProof(did, didResolver, documentLoader, opts.signer, opts.kms, presentation) + err = addDataIntegrityProof( + fullVMID(did, signingVM.ID), + didResolver, + documentLoader, + opts.signer, + opts.kms, + presentation, + ) if err != nil { return nil, fmt.Errorf("failed to add data integrity proof to VP: %w", err) } } - jwtSigner, err := getHolderSigner(did, didResolver, crypto) + jwtSigner, err := getHolderSigner(signingVM, crypto) if err != nil { return nil, err } @@ -391,7 +403,7 @@ func createAuthorizedResponseMultiCred( //nolint:funlen,gocyclo // Unable to dec didResolver api.DIDResolver, crypto api.Crypto, documentLoader ld.DocumentLoader, - signer ecdsa2019.Signer, + signer ecdsa2019.KMSSigner, keyManager kms.KeyManager, ) (*authorizedResponse, error) { pd := requestObject.Claims.VPToken.PresentationDefinition @@ -416,14 +428,26 @@ func createAuthorizedResponseMultiCred( //nolint:funlen,gocyclo // Unable to dec return nil, e } + signingVM, e := getSigningVM(holderDID, didResolver) + if e != nil { + return nil, e + } + if signer != nil && keyManager != nil { - err = addDataIntegrityProof(holderDID, didResolver, documentLoader, signer, keyManager, presentation) - if err != nil { - return nil, fmt.Errorf("failed to add data integrity proof to VP: %w", err) + e = addDataIntegrityProof( + fullVMID(holderDID, signingVM.ID), + didResolver, + documentLoader, + signer, + keyManager, + presentation, + ) + if e != nil { + return nil, fmt.Errorf("failed to add data integrity proof to VP: %w", e) } } - signer, e := getHolderSigner(holderDID, didResolver, crypto) + signer, e := getHolderSigner(signingVM, crypto) if e != nil { return nil, e } @@ -473,7 +497,7 @@ func createAuthorizedResponseMultiCred( //nolint:funlen,gocyclo // Unable to dec } func addDataIntegrityProof(did string, didResolver api.DIDResolver, documentLoader ld.DocumentLoader, - signer ecdsa2019.Signer, keyManager kms.KeyManager, presentation *verifiable.Presentation, + signer ecdsa2019.KMSSigner, keyManager kms.KeyManager, presentation *verifiable.Presentation, ) error { context := &verifiable.DataIntegrityProofContext{ SigningKeyID: did, @@ -485,8 +509,7 @@ func addDataIntegrityProof(did string, didResolver api.DIDResolver, documentLoad dataIntegrityVerifier, err := dataintegrity.NewSigner(&signerOpts, ecdsa2019.NewSignerInitializer(&ecdsa2019.SignerInitializerOptions{ LDDocumentLoader: documentLoader, - Signer: signer, - KMS: keyManager, + SignerGetter: ecdsa2019.WithLocalKMSSigner(keyManager, signer), })) if err != nil { return err @@ -542,7 +565,7 @@ func signToken(claims interface{}, signer api.JWTSigner) (string, error) { return tokenBytes, nil } -func getHolderSigner(holderDID string, didResolver api.DIDResolver, crypto api.Crypto) (api.JWTSigner, error) { +func getSigningVM(holderDID string, didResolver api.DIDResolver) (*diddoc.VerificationMethod, error) { docRes, err := didResolver.Resolve(holderDID) if err != nil { return nil, fmt.Errorf("resolve holder DID for signing: %w", err) @@ -556,7 +579,11 @@ func getHolderSigner(holderDID string, didResolver api.DIDResolver, crypto api.C signingVM := verificationMethods[diddoc.AssertionMethod][0].VerificationMethod - return common.NewJWSSigner(models.VerificationMethodFromDoc(&signingVM), crypto) + return &signingVM, nil +} + +func getHolderSigner(signingVM *diddoc.VerificationMethod, crypto api.Crypto) (api.JWTSigner, error) { + return common.NewJWSSigner(models.VerificationMethodFromDoc(signingVM), crypto) } func getSubjectID(vc interface{}) (string, error) { @@ -598,11 +625,27 @@ func pickRandomElement(list []string) (string, error) { return list[idx.Int64()], nil } +func fullVMID(did, vmID string) string { + if vmID == "" { + return did + } + + if vmID[0] == '#' { + return did + vmID + } + + if strings.HasPrefix(vmID, "did:") { + return vmID + } + + return did + "#" + vmID +} + type resolverAdapter struct { didResolver api.DIDResolver } -func (r *resolverAdapter) Resolve(did string, _ ...vdrspi.DIDMethodOption) (*diddoc.DocResolution, error) { +func (r *resolverAdapter) Resolve(did string, _ ...vdrapi.DIDMethodOption) (*diddoc.DocResolution, error) { return r.didResolver.Resolve(did) } diff --git a/pkg/openid4vp/openid4vp_test.go b/pkg/openid4vp/openid4vp_test.go index 99b755c2..35f57319 100644 --- a/pkg/openid4vp/openid4vp_test.go +++ b/pkg/openid4vp/openid4vp_test.go @@ -21,9 +21,9 @@ import ( "github.com/google/uuid" "github.com/stretchr/testify/require" + "github.com/trustbloc/did-go/doc/did" "github.com/trustbloc/kms-go/crypto/tinkcrypto" "github.com/trustbloc/kms-go/doc/jose" - "github.com/trustbloc/vc-go/did" "github.com/trustbloc/vc-go/presexch" "github.com/trustbloc/vc-go/verifiable" @@ -550,7 +550,7 @@ func TestOpenID4VP_PresentCredential(t *testing.T) { lddl, &presentOpts{signer: tinkCrypto, kms: localKMS.AriesLocalKMS}, ) - require.EqualError(t, err, + require.Contains(t, err.Error(), "failed to add data integrity proof to VP: data integrity proof generation error") }) t.Run("multiple credentials", func(t *testing.T) { @@ -570,7 +570,7 @@ func TestOpenID4VP_PresentCredential(t *testing.T) { lddl, &presentOpts{signer: tinkCrypto, kms: localKMS.AriesLocalKMS}, ) - require.EqualError(t, err, + require.Contains(t, err.Error(), "failed to add data integrity proof to VP: data integrity proof generation error") }) }) diff --git a/pkg/openid4vp/opts.go b/pkg/openid4vp/opts.go index f510511b..3489104c 100644 --- a/pkg/openid4vp/opts.go +++ b/pkg/openid4vp/opts.go @@ -24,7 +24,7 @@ type opts struct { metricsLogger api.MetricsLogger // If both of the below fields are set, then data integrity proofs will be added to // presentations sent to the verifier. - signer ecdsa2019.Signer + signer ecdsa2019.KMSSigner kms kms.KeyManager } @@ -59,14 +59,20 @@ func WithMetricsLogger(metricsLogger api.MetricsLogger) Opt { // WithDIProofs enables the adding of data integrity proofs to presentations sent to the verifier. It requires // a signer and a KMS to be passed in. -func WithDIProofs(signer ecdsa2019.Signer, keyManager kms.KeyManager) Opt { +func WithDIProofs(signer ecdsa2019.KMSSigner, keyManager kms.KeyManager) Opt { return func(opts *opts) { opts.signer = signer opts.kms = keyManager } } -func processOpts(options []Opt) (httpClient, api.ActivityLogger, api.MetricsLogger, ecdsa2019.Signer, kms.KeyManager) { +func processOpts(options []Opt) ( + httpClient, + api.ActivityLogger, + api.MetricsLogger, + ecdsa2019.KMSSigner, + kms.KeyManager, +) { opts := mergeOpts(options) if opts.httpClient == nil { diff --git a/test/integration/cli/go.mod b/test/integration/cli/go.mod index 172f74ce..98e90c19 100644 --- a/test/integration/cli/go.mod +++ b/test/integration/cli/go.mod @@ -15,8 +15,8 @@ require ( github.com/google/uuid v1.3.0 // indirect github.com/trustbloc/cmdutil-go v0.0.0-20221125151303-09d42adcc811 // indirect github.com/trustbloc/logutil-go v1.0.0-rc1 // indirect - go.opentelemetry.io/otel v1.12.0 // indirect - go.opentelemetry.io/otel/trace v1.12.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect go.uber.org/zap v1.23.0 // indirect diff --git a/test/integration/cli/go.sum b/test/integration/cli/go.sum index 2357e9c0..232c294e 100644 --- a/test/integration/cli/go.sum +++ b/test/integration/cli/go.sum @@ -1,36 +1,44 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/trustbloc/cmdutil-go v0.0.0-20221125151303-09d42adcc811 h1:0e1d1w9o662+e7ZnJvRYJH8yblcBXngme8qbsjTvhQc= github.com/trustbloc/cmdutil-go v0.0.0-20221125151303-09d42adcc811/go.mod h1:o/v7C1z6d/5UrjaC6GAUc1hk0XVuE3M4tpyvsMMUw5k= github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c= github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= +go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= @@ -43,6 +51,7 @@ golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= 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/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -54,3 +63,4 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/test/integration/credentialapi_test.go b/test/integration/credentialapi_test.go index cf1bd2f7..78058f78 100644 --- a/test/integration/credentialapi_test.go +++ b/test/integration/credentialapi_test.go @@ -15,9 +15,9 @@ import ( "github.com/piprate/json-gold/ld" "github.com/stretchr/testify/require" - diddoc "github.com/trustbloc/vc-go/did" - vdrapi "github.com/trustbloc/vc-go/spi/vdr" - afgotime "github.com/trustbloc/vc-go/util/time" + diddoc "github.com/trustbloc/did-go/doc/did" + afgotime "github.com/trustbloc/did-go/doc/util/time" + vdrapi "github.com/trustbloc/did-go/vdr/api" afgoverifiable "github.com/trustbloc/vc-go/verifiable" "github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile/api" diff --git a/test/integration/go.mod b/test/integration/go.mod index a26a1c09..8790c0e6 100644 --- a/test/integration/go.mod +++ b/test/integration/go.mod @@ -12,10 +12,11 @@ toolchain go1.21.0 require ( github.com/google/uuid v1.3.0 github.com/piprate/json-gold v0.5.1-0.20230111113000-6ddbe6e6f19f - github.com/stretchr/testify v1.8.1 + github.com/stretchr/testify v1.8.2 github.com/trustbloc/cmdutil-go v0.0.0-20221125151303-09d42adcc811 + github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 github.com/trustbloc/logutil-go v1.0.0-rc1 - github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e + github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 github.com/trustbloc/wallet-sdk v0.0.0-00010101000000-000000000000 github.com/trustbloc/wallet-sdk/cmd/wallet-sdk-gomobile v0.0.0-20230102235937-82237ea9dde3 go.uber.org/zap v1.23.0 @@ -29,8 +30,8 @@ require ( github.com/VictoriaMetrics/fastcache v1.5.7 // 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.0.2 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/consensys/gnark-crypto v0.9.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -39,8 +40,6 @@ require ( github.com/golang/protobuf v1.5.2 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/tink/go v1.7.0 // indirect - github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de // indirect - github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de // indirect github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 // indirect github.com/hyperledger/ursa-wrapper-go v0.3.1 // indirect github.com/jinzhu/copier v0.0.0-20190924061706-b57f9002281a // indirect @@ -68,14 +67,13 @@ require ( github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/sjson v1.1.4 // indirect - github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948 // indirect - github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 // indirect + github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d // indirect github.com/trustbloc/sidetree-core-go v1.0.0 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect - go.opentelemetry.io/otel v1.12.0 // indirect - go.opentelemetry.io/otel/trace v1.12.0 // indirect + go.opentelemetry.io/otel v1.14.0 // indirect + go.opentelemetry.io/otel/trace v1.14.0 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect golang.org/x/crypto v0.12.0 // indirect diff --git a/test/integration/go.sum b/test/integration/go.sum index 3cb946dd..7ffbb442 100644 --- a/test/integration/go.sum +++ b/test/integration/go.sum @@ -27,10 +27,11 @@ github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVa github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= -github.com/cenkalti/backoff/v4 v4.0.2 h1:JIufpQLbh4DkbQoii76ItQIUFzevQSqOLZca4eamEDs= -github.com/cenkalti/backoff/v4 v4.0.2/go.mod h1:eEew/i+1Q6OrCDZh3WiXYv3+nJwBASZ8Bog/87DQnVg= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= +github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/consensys/bavard v0.1.13 h1:oLhMLOFGTLdlda/kma4VOJazblc7IM5y5QPd2A/YjhQ= github.com/consensys/bavard v0.1.13/go.mod h1:9ItSMtA/dXMAiL7BG6bqW2m3NdSEObYWoH223nGHukI= github.com/consensys/gnark-crypto v0.9.1 h1:mru55qKdWl3E035hAoh1jj9d7hVnYY5pfb6tmovSmII= @@ -69,10 +70,6 @@ github.com/google/tink/go v1.7.0/go.mod h1:GAUOd+QE3pgj9q8VKIGTCP33c/B7eb4NhxLcg github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de h1:SL1mbNu73iPT/vxg/HHCJJGTdLBPh2DXVU3fuxYrIWc= -github.com/hyperledger/aries-framework-go/component/log v0.0.0-20230615141038-5d444d6c36de/go.mod h1:ud/DVY5ENA3DaMuga1NwN0vsqMtaoZmGbbQYao+fKIg= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de h1:8taNuOJFN9P23vl2rcoEqhKeF2fxXuHLDpnLld69MeU= -github.com/hyperledger/aries-framework-go/spi v0.0.0-20230615141038-5d444d6c36de/go.mod h1:6QsNztGTbY1x1rLDodVk3nznsNtd0VlZWgeIHSd5rZw= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2 h1:B1Nt8hKb//KvgGRprk0h1t4lCnwhE9/ryb1WqfZbV+M= github.com/hyperledger/fabric-amcl v0.0.0-20230602173724-9e02669dceb2/go.mod h1:X+DIyUsaTmalOpmpQfIvFZjKHQedrURQ5t4YqquX7lE= github.com/hyperledger/ursa-wrapper-go v0.3.1 h1:Do+QrVNniY77YK2jTIcyWqj9rm/Yb5SScN0bqCjiibA= @@ -146,8 +143,8 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= -github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8= +github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8 h1:RBkacARv7qY5laaXGlF4wFB/tk5rnthhPb8oIBGoagY= github.com/teserakt-io/golang-ed25519 v0.0.0-20210104091850-3888c087a4c8/go.mod h1:9PdLyPiZIiW3UopXyRnPYyjUXSpiQNHRLu8fOsR3o8M= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= @@ -163,16 +160,16 @@ 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/cmdutil-go v0.0.0-20221125151303-09d42adcc811 h1:0e1d1w9o662+e7ZnJvRYJH8yblcBXngme8qbsjTvhQc= github.com/trustbloc/cmdutil-go v0.0.0-20221125151303-09d42adcc811/go.mod h1:o/v7C1z6d/5UrjaC6GAUc1hk0XVuE3M4tpyvsMMUw5k= -github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948 h1:7ybfE2c3zVA9+ZR5epnL8TRY8dVBKb+EKmU/qV3JRwQ= -github.com/trustbloc/did-go v0.0.0-20230824183959-e9f47dff3948/go.mod h1:fA8VeSa9D6RCXaR6nxEeMlm+gk59vul2oheDUGhc29E= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333 h1:c/xUQqjexXF3LBu9KpCKUKLQCnStchF36AVdEGiFZaI= -github.com/trustbloc/kms-go v0.0.0-20230824183646-318214f7c333/go.mod h1:QX5mfoujd84Z0mw+Qt2wDZZSrgJ5CiVkfmHBCb/lj9w= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514 h1:LBzlW4wcV7CE5Z6pUgjygbeR9Zx9mlTccROd6LG+hJQ= +github.com/trustbloc/did-go v0.0.0-20230908203710-8c4f5146a514/go.mod h1:a6n/pyvfRPY5bnalgnj+bRB1B1SMBEMnadtlRh8esBo= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d h1:g74oJV+MT440kUsYNDsTnDt5kV96fNF70bVCl8M3lEs= +github.com/trustbloc/kms-go v0.0.0-20230906134914-b9afaf3b793d/go.mod h1:1rvrHRuIRT7qLapB0lSpFgy1CjFunx85EyEzcZpIxG8= github.com/trustbloc/logutil-go v1.0.0-rc1 h1:rRJbvgQfrlUfyej+mY0nuQJymGqjRW4oZEwKi544F4c= github.com/trustbloc/logutil-go v1.0.0-rc1/go.mod h1:JlxT0oZfNKgIlSNtgc001WEeDMxlnAvOM43gNm8DQVc= github.com/trustbloc/sidetree-core-go v1.0.0 h1:kzfKZOJ0sgDy9D1AYNcoR3JHutqtMtKvF2P9UwUcDjU= github.com/trustbloc/sidetree-core-go v1.0.0/go.mod h1:jdxAFuorlIwFOGVW6O455/lZqxg2mZkRHNTEolcZdDI= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e h1:+N45XxJm5fNRrK+2hYS9e6Kdhi13pxcGGWFFbQRAJ4M= -github.com/trustbloc/vc-go v0.0.0-20230825210135-072aa746432e/go.mod h1:/m+e7GTb/YSGhdLncsvL6aC62N2agCdFit7aI4uDpaI= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099 h1:rpv48mIg2wnfMDDlX+jYZYXaXTopVp4H3SnvNZNjNRM= +github.com/trustbloc/vc-go v0.0.0-20230908212925-754e5de46099/go.mod h1:7x0KWtXL0cileJlBjdQYeWqX/LMunrOuqFUIar4XHIY= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -180,12 +177,12 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= -go.opentelemetry.io/otel v1.12.0 h1:IgfC7kqQrRccIKuB7Cl+SRUmsKbEwSGPr0Eu+/ht1SQ= -go.opentelemetry.io/otel v1.12.0/go.mod h1:geaoz0L0r1BEOR81k7/n9W4TCXYCJ7bPO7K374jQHG0= +go.opentelemetry.io/otel v1.14.0 h1:/79Huy8wbf5DnIPhemGB+zEPVwnN6fuQybr/SRXa6hM= +go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= go.opentelemetry.io/otel/sdk v1.12.0 h1:8npliVYV7qc0t1FKdpU08eMnOjgPFMnriPhn0HH4q3o= go.opentelemetry.io/otel/sdk v1.12.0/go.mod h1:WYcvtgquYvgODEvxOry5owO2y9MyciW7JqMz6cpXShE= -go.opentelemetry.io/otel/trace v1.12.0 h1:p28in++7Kd0r2d8gSt931O57fdjUyWxkVbESuILAeUc= -go.opentelemetry.io/otel/trace v1.12.0/go.mod h1:pHlgBynn6s25qJ2szD+Bv+iwKJttjHSI3lUAyf0GNuQ= +go.opentelemetry.io/otel/trace v1.14.0 h1:wp2Mmvj41tDsyAJXiWDWpfNsOiIyd38fy85pyKcFq/M= +go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= diff --git a/test/integration/loginconsent/go.sum b/test/integration/loginconsent/go.sum index d06e1b68..dc320a67 100644 --- a/test/integration/loginconsent/go.sum +++ b/test/integration/loginconsent/go.sum @@ -87,6 +87,7 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= +github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= diff --git a/test/integration/webhook/go.sum b/test/integration/webhook/go.sum index b786a89d..bb470277 100644 --- a/test/integration/webhook/go.sum +++ b/test/integration/webhook/go.sum @@ -1,4 +1,5 @@ github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= +github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -11,13 +12,16 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= 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= go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI= +go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=