feat(keys): Ed25519VerificationKey2020 full spec compliant & add 2018 support [DEV-2017]

.github/workflows/release.yml

@@ -68,8 +68,8 @@ jobs:
       - name: Set release version number
         id: set-version
         run: |
-          RELEASE_VERSION=$( git describe --tags ${{ github.sha }})
-          echo ::set-output name=RELEASE_VERSION::"$RELEASE_VERSION"
+          RELEASE_VERSION=$( git describe --tags "${{ github.sha }}")
+          echo "RELEASE_VERSION=$RELEASE_VERSION" >> "$GITHUB_OUTPUT"
 
       # Push Protobufs to Buf.build registry
       - uses: bufbuild/buf-push-action@v1

app/migrations/helpers/protobuf.go

@@ -0,0 +1,19 @@
+package helpers
+
+import (
+	"github.com/multiformats/go-multibase"
+)
+
+func GenerateEd25519VerificationKey2020VerificationMaterial(publicKey string) (string, error) {
+	encoding, publicKeyBytes, err := multibase.Decode(publicKey)
+	if encoding != multibase.Base58BTC {
+		panic("Only Base58BTC encoding is supported")
+	}
+	if err != nil {
+		return "", err
+	}
+	publicKeyMultibaseBytes := []byte{0xed, 0x01}
+	publicKeyMultibaseBytes = append(publicKeyMultibaseBytes, publicKeyBytes...)
+
+	return multibase.Encode(multibase.Base58BTC, publicKeyMultibaseBytes)
+}

app/migrations/helpers/protobuf_test.go

@@ -0,0 +1,19 @@
+package helpers
+
+import (
+	. "github.com/onsi/ginkgo/v2"
+	. "github.com/onsi/gomega"
+)
+
+var _ = DescribeTable(
+	"Test GenerateEd25519VerificationKey2020VerificationMaterial",
+	func(v1PubKey string, v2PubKey string) {
+		key, err := GenerateEd25519VerificationKey2020VerificationMaterial(v1PubKey)
+		Expect(err).To(BeNil())
+		Expect(key).To(Equal(v2PubKey))
+	},
+
+	Entry("Valid: General conversion", "zDw21irq4wBfyTvxAG9L8PQj6b79iyTyzyV6XVj9SfyRR", "z6MksPH4K75WGjASaRnrwiHyEWH6QgRaPMEMfW1TL17TbCCo"),
+	// Mainnet case
+	Entry("Valid: Real case", "zF7rhDBfUt9d1gJPjx7s1JXfUY7oVWkYsWCo7fztHtepn", "z6Mkta7joRuvDh7UnoESdgpr9dDUMh5LvdoECDi3WGrJoscA"),
+)

app/migrations/migration_did_protobuf.go

@@ -140,9 +140,9 @@ func MigrateDidDoc(oldDid *didtypesv1.Did) didtypes.DidDoc {
 func MigrateType(t string) string {
 	switch t {
 	case didtypesv1.Ed25519VerificationKey2020:
-		return didtypes.Ed25519VerificationKey2020{}.Type()
+		return didtypes.Ed25519VerificationKey2020Type
 	case didtypesv1.JSONWebKey2020:
-		return didtypes.JSONWebKey2020{}.Type()
+		return didtypes.JSONWebKey2020Type
 	default:
 		panic("Unknown type")
 	}
@@ -159,28 +159,15 @@ func MigrateVerificationMaterial(vm *didtypesv1.VerificationMethod) string {
 		if err != nil {
 			panic(err)
 		}
-
-		jwk2020 := didtypes.JSONWebKey2020{
-			PublicKeyJwk: res,
-		}
-		res, err = json.Marshal(jwk2020)
-		if err != nil {
-			panic(err)
-		}
-
 		return string(res)
 
 	case didtypesv1.Ed25519VerificationKey2020:
-		pkMulti := didtypes.Ed25519VerificationKey2020{
-			PublicKeyMultibase: vm.PublicKeyMultibase,
-		}
-
-		res, err := json.Marshal(pkMulti)
+		pkMulti, err := helpers.GenerateEd25519VerificationKey2020VerificationMaterial(vm.PublicKeyMultibase)
 		if err != nil {
 			panic(err)
 		}
 
-		return string(res)
+		return pkMulti
 
 	default:
 		panic("Unknown type")

docker/localnet/gen-network-config.sh

@@ -4,11 +4,11 @@
 
 set -euo pipefail
 
-# sed in macos requires extra argument
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    SED_EXT=''
-elif [[ "$OSTYPE" == "darwin"* ]]; then
-    SED_EXT='.orig'
+# sed in MacOS requires extra argument
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  SED_EXT='.orig'
+else 
+  SED_EXT=''
 fi
 
 # Params
@@ -38,16 +38,14 @@ function configure_node() {
   APP_TOML="${NODE_HOME}/config/app.toml"
   CONFIG_TOML="${NODE_HOME}/config/config.toml"
 
-  sed -i $SED_EXT 's/minimum-gas-prices = ""/minimum-gas-prices = "25ncheq"/g' "${APP_TOML}"
-  sed -i $SED_EXT 's/enable = false/enable = true/g' "${APP_TOML}"
-
-  sed -i $SED_EXT 's|laddr = "tcp://127.0.0.1:26657"|laddr = "tcp://0.0.0.0:26657"|g' "${CONFIG_TOML}"
-  sed -i $SED_EXT 's|addr_book_strict = true|addr_book_strict = false|g' "${CONFIG_TOML}"
-
-  sed -i $SED_EXT 's/timeout_propose = "3s"/timeout_propose = "500ms"/g' "${CONFIG_TOML}"
-  sed -i $SED_EXT 's/timeout_prevote = "1s"/timeout_prevote = "500ms"/g' "${CONFIG_TOML}"
-  sed -i $SED_EXT 's/timeout_precommit = "1s"/timeout_precommit = "500ms"/g' "${CONFIG_TOML}"
-  sed -i $SED_EXT 's/timeout_commit = "5s"/timeout_commit = "500ms"/g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's/minimum-gas-prices = ""/minimum-gas-prices = "50ncheq"/g' "${APP_TOML}"
+  sed -i "$SED_EXT" 's/enable = false/enable = true/g' "${APP_TOML}"
+  sed -i "$SED_EXT" 's|laddr = "tcp://127.0.0.1:26657"|laddr = "tcp://0.0.0.0:26657"|g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's|addr_book_strict = true|addr_book_strict = false|g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's/timeout_propose = "3s"/timeout_propose = "500ms"/g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's/timeout_prevote = "1s"/timeout_prevote = "500ms"/g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's/timeout_precommit = "1s"/timeout_precommit = "500ms"/g' "${CONFIG_TOML}"
+  sed -i "$SED_EXT" 's/timeout_commit = "5s"/timeout_commit = "500ms"/g' "${CONFIG_TOML}"
 }
 
 function configure_genesis() {
@@ -60,10 +58,10 @@ function configure_genesis() {
   GENESIS_TMP="${NODE_HOME}/config/genesis_tmp.json"
 
   # Default denom
-  sed -i $SED_EXT 's/"stake"/"ncheq"/' "${GENESIS}"
+  sed -i "$SED_EXT" 's/"stake"/"ncheq"/' "${GENESIS}"
 
   # Short voting period
-  sed -i $SED_EXT 's/"voting_period": "172800s"/"voting_period": "12s"/' "${GENESIS}"
+  sed -i "$SED_EXT" 's/"voting_period": "172800s"/"voting_period": "12s"/' "${GENESIS}"
 
   # Test accounts
   BASE_ACCOUNT_1="cheqd1rnr5jrt4exl0samwj0yegv99jeskl0hsxmcz96"

tests/integration/cli/tx.go

@@ -18,7 +18,7 @@ var CLITxParams = []string{
 	"--yes",
 }
 
-var CLIGasParams = []string{
+var CliGasParams = []string{
 	"--gas", Gas,
 	"--gas-adjustment", GasAdjustment,
 	"--gas-prices", GasPrices,