Update genesis spec.

ChainSafe · Jul 7, 2021 · 292ec91 · 292ec91
1 parent 6ecef3b
commit 292ec91
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 13 deletions.
diff --git a/chain/dev/genesis-spec.json b/chain/dev/genesis-spec.json
diff --git a/go.sum b/go.sum
@@ -273,7 +273,6 @@ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfb
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
 github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
 github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=

diff --git a/lib/genesis/helpers.go b/lib/genesis/helpers.go
@@ -163,7 +163,7 @@ func buildRawMap(m map[string]map[string]interface{}) (map[string]string, error)
 		kv.key = append(kv.key, k)
 		buildRawMapInterface(v, kv)
 
-		if reflect.DeepEqual([]string{"palletBalances", "balances"}, kv.key) {
+		if reflect.DeepEqual([]string{"Balances", "balances"}, kv.key) {
 			err := buildBalances(kv, res)
 			if err != nil {
 				return nil, err
@@ -221,10 +221,10 @@ func buildRawArrayInterface(a []interface{}, kv *keyValue) {
 
 func formatKey(kv *keyValue) (string, error) {
 	switch {
-	case reflect.DeepEqual([]string{"grandpa", "authorities"}, kv.key):
+	case reflect.DeepEqual([]string{"Grandpa", "authorities"}, kv.key):
 		kb := []byte(`:grandpa_authorities`)
 		return common.BytesToHex(kb), nil
-	case reflect.DeepEqual([]string{"system", "code"}, kv.key):
+	case reflect.DeepEqual([]string{"System", "changesTrieConfig", "code"}, kv.key):
 		kb := []byte(`:code`)
 		return common.BytesToHex(kb), nil
 	default:
@@ -245,7 +245,7 @@ func formatKey(kv *keyValue) (string, error) {
 
 func formatValue(kv *keyValue) (string, error) {
 	switch {
-	case reflect.DeepEqual([]string{"grandpa", "authorities"}, kv.key):
+	case reflect.DeepEqual([]string{"Grandpa", "authorities"}, kv.key):
 		if kv.valueLen != nil {
 			lenEnc, err := scale.Encode(kv.valueLen)
 			if err != nil {
@@ -255,8 +255,10 @@ func formatValue(kv *keyValue) (string, error) {
 			return fmt.Sprintf("0x01%x%v", lenEnc, kv.value), nil
 		}
 		return "", fmt.Errorf("error formatting value for grandpa authorities")
-	case reflect.DeepEqual([]string{"system", "code"}, kv.key):
+	case reflect.DeepEqual([]string{"System", "changesTrieConfig", "code"}, kv.key):
 		return kv.value, nil
+	case reflect.DeepEqual([]string{"Sudo", "Key"}, kv.key):
+		return common.BytesToHex(crypto.PublicAddressToByteArray(common.Address(kv.value))), nil
 	default:
 		if kv.valueLen != nil {
 			lenEnc, err := scale.Encode(kv.valueLen)

diff --git a/lib/genesis/test_utils.go b/lib/genesis/test_utils.go
@@ -54,8 +54,9 @@ var TestGenesis = &Genesis{
 var TestFieldsHR = Fields{
 	Raw: map[string]map[string]string{},
 	Runtime: map[string]map[string]interface{}{
-		"system": {
-			"code": "mocktestcode",
+		"System": {
+			"changesTrieConfig": "",
+			"code":              "mocktestcode",
 		},
 	},
 }
@@ -90,8 +91,9 @@ func CreateTestGenesisJSONFile(asRaw bool) (string, error) {
 		tGen.Genesis = Fields{
 			Raw: map[string]map[string]string{},
 			Runtime: map[string]map[string]interface{}{
-				"system": {
-					"code": "mocktestcode",
+				"System": {
+					"changesTrieConfig": "",
+					"code":              "mocktestcode",
 				},
 			},
 		}