diff --git a/test/p2p/data/chain_config.json b/test/p2p/data/chain_config.json
index 54fcea524..4221ba8da 100644
--- a/test/p2p/data/chain_config.json
+++ b/test/p2p/data/chain_config.json
@@ -5,10 +5,10 @@
 		{
 			"validator": {
 				"id": "mach1",
-				"pub_key": [
-					1,
-					"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-				]
+				"pub_key": {
+          "type": "ed25519",
+          "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+        }
 			},
 			"p2p_addr": "",
 			"rpc_addr": ""
@@ -16,10 +16,10 @@
 		{
 			"validator": {
 				"id": "mach2",
-				"pub_key": [
-					1,
-					"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-				]
+				"pub_key": {
+          "type": "ed25519",
+          "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+        }
 			},
 			"p2p_addr": "",
 			"rpc_addr": "",
@@ -28,10 +28,10 @@
 		{
 			"validator": {
 				"id": "mach3",
-				"pub_key": [
-					1,
-					"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-				]
+				"pub_key": {
+          "type": "ed25519",
+          "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+        }
 			},
 			"p2p_addr": "",
 			"rpc_addr": "",
@@ -40,14 +40,14 @@
 		{
 			"validator": {
 				"id": "mach4",
-				"pub_key": [
-					1,
-					"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-				]
+				"pub_key": {
+          "type": "ed25519",
+          "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+        }
 			},
 			"p2p_addr": "",
 			"rpc_addr": "",
 			"index": 3
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/p2p/data/mach1/core/genesis.json b/test/p2p/data/mach1/core/genesis.json
index 3f6fbe5a2..522f9831a 100644
--- a/test/p2p/data/mach1/core/genesis.json
+++ b/test/p2p/data/mach1/core/genesis.json
@@ -6,34 +6,34 @@
 		{
 			"amount": 1,
 			"name": "mach1",
-			"pub_key": [
-				1,
-				"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach2",
-			"pub_key": [
-				1,
-				"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach3",
-			"pub_key": [
-				1,
-				"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach4",
-			"pub_key": [
-				1,
-				"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+      }
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/p2p/data/mach1/core/priv_validator.json b/test/p2p/data/mach1/core/priv_validator.json
index 242c7b9fc..6538281b4 100644
--- a/test/p2p/data/mach1/core/priv_validator.json
+++ b/test/p2p/data/mach1/core/priv_validator.json
@@ -3,12 +3,12 @@
 	"last_height": 0,
 	"last_round": 0,
 	"last_step": 0,
-	"priv_key": [
-		1,
-		"547AA07C7A8CE16C5CB2A40C6C26D15B0A32960410A9F1EA6E50B636F1AB389ABE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-	],
-	"pub_key": [
-		1,
-		"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-	]
-}
\ No newline at end of file
+	"priv_key": {
+    "type": "ed25519",
+    "data": "547AA07C7A8CE16C5CB2A40C6C26D15B0A32960410A9F1EA6E50B636F1AB389ABE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+  },
+	"pub_key": {
+    "type": "ed25519",
+    "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+  }
+}
diff --git a/test/p2p/data/mach2/core/genesis.json b/test/p2p/data/mach2/core/genesis.json
index 3f6fbe5a2..522f9831a 100644
--- a/test/p2p/data/mach2/core/genesis.json
+++ b/test/p2p/data/mach2/core/genesis.json
@@ -6,34 +6,34 @@
 		{
 			"amount": 1,
 			"name": "mach1",
-			"pub_key": [
-				1,
-				"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach2",
-			"pub_key": [
-				1,
-				"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach3",
-			"pub_key": [
-				1,
-				"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach4",
-			"pub_key": [
-				1,
-				"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+      }
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/p2p/data/mach2/core/priv_validator.json b/test/p2p/data/mach2/core/priv_validator.json
index ead45d5e6..3602454f5 100644
--- a/test/p2p/data/mach2/core/priv_validator.json
+++ b/test/p2p/data/mach2/core/priv_validator.json
@@ -3,12 +3,12 @@
 	"last_height": 0,
 	"last_round": 0,
 	"last_step": 0,
-	"priv_key": [
-		1,
-		"D047889E60502FC3129D0AB7F334B1838ED9ED1ECD99CBB96B71AD5ABF5A81436DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-	],
-	"pub_key": [
-		1,
-		"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-	]
-}
\ No newline at end of file
+	"priv_key": {
+    "type": "ed25519",
+    "data": "D047889E60502FC3129D0AB7F334B1838ED9ED1ECD99CBB96B71AD5ABF5A81436DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+  },
+	"pub_key": {
+    "type": "ed25519",
+    "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+  }
+}
diff --git a/test/p2p/data/mach3/core/genesis.json b/test/p2p/data/mach3/core/genesis.json
index 3f6fbe5a2..522f9831a 100644
--- a/test/p2p/data/mach3/core/genesis.json
+++ b/test/p2p/data/mach3/core/genesis.json
@@ -6,34 +6,34 @@
 		{
 			"amount": 1,
 			"name": "mach1",
-			"pub_key": [
-				1,
-				"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach2",
-			"pub_key": [
-				1,
-				"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach3",
-			"pub_key": [
-				1,
-				"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach4",
-			"pub_key": [
-				1,
-				"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+      }
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/p2p/data/mach3/core/priv_validator.json b/test/p2p/data/mach3/core/priv_validator.json
index dd366d205..743a931f5 100644
--- a/test/p2p/data/mach3/core/priv_validator.json
+++ b/test/p2p/data/mach3/core/priv_validator.json
@@ -3,12 +3,12 @@
 	"last_height": 0,
 	"last_round": 0,
 	"last_step": 0,
-	"priv_key": [
-		1,
-		"C1A4E47F349FC5F556F4A9A27BA776B94424C312BAA6CF6EE44B867348D7C3F2AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-	],
-	"pub_key": [
-		1,
-		"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-	]
-}
\ No newline at end of file
+	"priv_key": {
+    "type": "ed25519",
+    "data": "C1A4E47F349FC5F556F4A9A27BA776B94424C312BAA6CF6EE44B867348D7C3F2AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+  },
+	"pub_key": {
+    "type": "ed25519",
+    "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+  }
+}
diff --git a/test/p2p/data/mach4/core/genesis.json b/test/p2p/data/mach4/core/genesis.json
index 3f6fbe5a2..522f9831a 100644
--- a/test/p2p/data/mach4/core/genesis.json
+++ b/test/p2p/data/mach4/core/genesis.json
@@ -6,34 +6,34 @@
 		{
 			"amount": 1,
 			"name": "mach1",
-			"pub_key": [
-				1,
-				"BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "BE8933DFF1600C026E34718F1785A4CDEAB90C35698B394E38B6947AE91DE116"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach2",
-			"pub_key": [
-				1,
-				"6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "6DC534465323126587D2A2A93B59D689B717073B1DE968A25A6EF13D595318AD"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach3",
-			"pub_key": [
-				1,
-				"AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "AE67AC697D135AA0B4601EA57EAAB3FEBF4BAA4F229C45A598C2985B12FCD1A1"
+      }
 		},
 		{
 			"amount": 1,
 			"name": "mach4",
-			"pub_key": [
-				1,
-				"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-			]
+			"pub_key": {
+        "type": "ed25519",
+        "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+      }
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/test/p2p/data/mach4/core/priv_validator.json b/test/p2p/data/mach4/core/priv_validator.json
index 4a73707e8..1c10eb8a6 100644
--- a/test/p2p/data/mach4/core/priv_validator.json
+++ b/test/p2p/data/mach4/core/priv_validator.json
@@ -3,12 +3,12 @@
 	"last_height": 0,
 	"last_round": 0,
 	"last_step": 0,
-	"priv_key": [
-		1,
-		"C4CC3ED28F020C2DBDA98BCDBF08C3CED370470E74F25E938D5D295E8E3D2B0C9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-	],
-	"pub_key": [
-		1,
-		"9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
-	]
-}
\ No newline at end of file
+	"priv_key": {
+    "type": "ed25519",
+    "data": "C4CC3ED28F020C2DBDA98BCDBF08C3CED370470E74F25E938D5D295E8E3D2B0C9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+  },
+	"pub_key": {
+    "type": "ed25519",
+    "data": "9EBC8F58CED4B46DCD5AB8ABA591DD253CD7CB5037273FDA32BC0B6461C4EFD9"
+  }
+}