From cb73df187cdb78591b42fbb16bc3c5fe1f819b5a Mon Sep 17 00:00:00 2001 From: Sandra Vrtikapa Date: Thu, 20 May 2021 14:12:53 -0400 Subject: [PATCH] chore: Enable key contexts in did documents Update sidetree-core: enable key contexts in did documents Closes #416 Signed-off-by: Sandra Vrtikapa --- cmd/orb-cli/common/common_test.go | 2 +- cmd/orb-cli/createdidcmd/createdid_test.go | 2 +- cmd/orb-cli/recoverdidcmd/recoverdid_test.go | 2 +- cmd/orb-cli/updatedidcmd/updatedid_test.go | 2 +- cmd/orb-server/go.mod | 2 +- cmd/orb-server/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- test/bdd/fixtures/did-keys/create/publickeys.json | 2 +- test/bdd/fixtures/did-keys/update/publickeys.json | 2 +- test/bdd/go.mod | 2 +- test/bdd/go.sum | 4 ++-- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/orb-cli/common/common_test.go b/cmd/orb-cli/common/common_test.go index 5d4c139ba..d0c1202aa 100644 --- a/cmd/orb-cli/common/common_test.go +++ b/cmd/orb-cli/common/common_test.go @@ -48,7 +48,7 @@ const ( }, { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["authentication"], "jwkPath": "%s" } diff --git a/cmd/orb-cli/createdidcmd/createdid_test.go b/cmd/orb-cli/createdidcmd/createdid_test.go index 026bc4f2e..1853722f7 100644 --- a/cmd/orb-cli/createdidcmd/createdid_test.go +++ b/cmd/orb-cli/createdidcmd/createdid_test.go @@ -30,7 +30,7 @@ const ( }, { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["authentication"], "jwkPath": "%s" } diff --git a/cmd/orb-cli/recoverdidcmd/recoverdid_test.go b/cmd/orb-cli/recoverdidcmd/recoverdid_test.go index 9b22f7ca6..d1538607b 100644 --- a/cmd/orb-cli/recoverdidcmd/recoverdid_test.go +++ b/cmd/orb-cli/recoverdidcmd/recoverdid_test.go @@ -28,7 +28,7 @@ const ( }, { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["authentication"], "jwkPath": "%s" } diff --git a/cmd/orb-cli/updatedidcmd/updatedid_test.go b/cmd/orb-cli/updatedidcmd/updatedid_test.go index f15e2fa45..707a30c6b 100644 --- a/cmd/orb-cli/updatedidcmd/updatedid_test.go +++ b/cmd/orb-cli/updatedidcmd/updatedid_test.go @@ -28,7 +28,7 @@ const ( }, { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["authentication"], "jwkPath": "%s" } diff --git a/cmd/orb-server/go.mod b/cmd/orb-server/go.mod index 53e997e7c..25279de3f 100644 --- a/cmd/orb-server/go.mod +++ b/cmd/orb-server/go.mod @@ -16,7 +16,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9 github.com/trustbloc/orb v0.0.0 - github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b + github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 // indirect ) diff --git a/cmd/orb-server/go.sum b/cmd/orb-server/go.sum index 36c78be09..6e5423463 100644 --- a/cmd/orb-server/go.sum +++ b/cmd/orb-server/go.sum @@ -1055,8 +1055,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/trustbloc/edge-core v0.1.4-0.20200709143857-e104bb29f6c6/go.mod h1:SZg7nAIc9FONS+G7MwEyGkCWCJR3R02bePwTpWxqH5w= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9 h1:JCWLY91Vp1qf19IFDSYUmHyPSfnYWZ5/fN6I5s+jq0M= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9/go.mod h1:BpCeNH2fEH3RX7+C5XfnVIXFQbk7LzBdWdBdgnEb284= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b h1:ZgkOSMPh005/5jRuKeKNjZUgyQ4I1IqHbGakwgr9kQ4= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 h1:Uk78yCqB3CgziTLTggTK4J4RsgbYQzUFzcvVCDyVXL8= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= github.com/trustbloc/vct v0.1.0 h1:hG5oBXUjzaTY+tIJZBDsCyb1lHoNFgsJc6ObfgJkI8A= github.com/trustbloc/vct v0.1.0/go.mod h1:wU4hT9o3Vjf4cJlICwHCxkWYGgQsMDLI0+5qx3vzBdE= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= diff --git a/go.mod b/go.mod index e215a7ccc..81fa4af9b 100755 --- a/go.mod +++ b/go.mod @@ -28,7 +28,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/stretchr/testify v1.7.0 github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9 - github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b + github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 github.com/trustbloc/vct v0.1.0 golang.org/x/net v0.0.0-20210421230115-4e50805a0758 // indirect ) diff --git a/go.sum b/go.sum index 8b98d8ac1..6e940dc84 100755 --- a/go.sum +++ b/go.sum @@ -1052,8 +1052,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/trustbloc/edge-core v0.1.4-0.20200709143857-e104bb29f6c6/go.mod h1:SZg7nAIc9FONS+G7MwEyGkCWCJR3R02bePwTpWxqH5w= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9 h1:JCWLY91Vp1qf19IFDSYUmHyPSfnYWZ5/fN6I5s+jq0M= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9/go.mod h1:BpCeNH2fEH3RX7+C5XfnVIXFQbk7LzBdWdBdgnEb284= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b h1:ZgkOSMPh005/5jRuKeKNjZUgyQ4I1IqHbGakwgr9kQ4= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 h1:Uk78yCqB3CgziTLTggTK4J4RsgbYQzUFzcvVCDyVXL8= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= github.com/trustbloc/vct v0.1.0 h1:hG5oBXUjzaTY+tIJZBDsCyb1lHoNFgsJc6ObfgJkI8A= github.com/trustbloc/vct v0.1.0/go.mod h1:wU4hT9o3Vjf4cJlICwHCxkWYGgQsMDLI0+5qx3vzBdE= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= diff --git a/test/bdd/fixtures/did-keys/create/publickeys.json b/test/bdd/fixtures/did-keys/create/publickeys.json index bc76de157..684f384c7 100644 --- a/test/bdd/fixtures/did-keys/create/publickeys.json +++ b/test/bdd/fixtures/did-keys/create/publickeys.json @@ -7,7 +7,7 @@ }, { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["capabilityInvocation"], "jwkPath": "./fixtures/did-keys/create/key2_jwk.json" } diff --git a/test/bdd/fixtures/did-keys/update/publickeys.json b/test/bdd/fixtures/did-keys/update/publickeys.json index dec560679..638d5e389 100644 --- a/test/bdd/fixtures/did-keys/update/publickeys.json +++ b/test/bdd/fixtures/did-keys/update/publickeys.json @@ -1,7 +1,7 @@ [ { "id": "key2", - "type": "JwsVerificationKey2020", + "type": "JsonWebKey2020", "purposes": ["capabilityInvocation"], "jwkPath": "./fixtures/did-keys/update/key2_jwk.json" }, diff --git a/test/bdd/go.mod b/test/bdd/go.mod index 0ef0e67c1..283ade8ee 100644 --- a/test/bdd/go.mod +++ b/test/bdd/go.mod @@ -18,7 +18,7 @@ require ( github.com/sirupsen/logrus v1.7.0 github.com/tidwall/gjson v1.7.4 github.com/trustbloc/orb v0.0.0 - github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b + github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 ) replace github.com/trustbloc/orb => ../../ diff --git a/test/bdd/go.sum b/test/bdd/go.sum index 8a7e182e2..1591a9459 100644 --- a/test/bdd/go.sum +++ b/test/bdd/go.sum @@ -1035,8 +1035,8 @@ github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1 github.com/trustbloc/edge-core v0.1.4-0.20200709143857-e104bb29f6c6/go.mod h1:SZg7nAIc9FONS+G7MwEyGkCWCJR3R02bePwTpWxqH5w= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9 h1:JCWLY91Vp1qf19IFDSYUmHyPSfnYWZ5/fN6I5s+jq0M= github.com/trustbloc/edge-core v0.1.7-0.20210310142750-7eb11997c4a9/go.mod h1:BpCeNH2fEH3RX7+C5XfnVIXFQbk7LzBdWdBdgnEb284= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b h1:ZgkOSMPh005/5jRuKeKNjZUgyQ4I1IqHbGakwgr9kQ4= -github.com/trustbloc/sidetree-core-go v0.6.1-0.20210519143310-f0606b30b35b/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352 h1:Uk78yCqB3CgziTLTggTK4J4RsgbYQzUFzcvVCDyVXL8= +github.com/trustbloc/sidetree-core-go v0.6.1-0.20210520185648-ad6fce89b352/go.mod h1:prRWqxBavkSxgKtPmUriSxCemrvl47yStMbW4jMFuRs= github.com/trustbloc/vct v0.1.0/go.mod h1:wU4hT9o3Vjf4cJlICwHCxkWYGgQsMDLI0+5qx3vzBdE= 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=