Fix merge ring and kton (darwinia-network#404)

* fix merge ring and kton * update dependency * using common new branch darwinia-master for specific dep incase new update on common and cargo update
freehere107 · Mar 30, 2020 · acb1ecf · acb1ecf
1 parent fad9405
commit acb1ecf
Show file tree

Hide file tree

Showing 11 changed files with 251 additions and 149 deletions.
diff --git a/.maintain/types/types.json b/.maintain/types/types.json
@@ -119,12 +119,10 @@
 		"moment": "BlockNumber"
 	},
 	"AccountData": {
-		"free_ring": "Balance",
-		"free_kton": "Balance",
-		"reserved_ring": "Balance",
-		"reserved_kton": "Balance",
 		"free": "Balance",
 		"reserved": "Balance",
+		"free_kton": "Balance",
+		"reserved_kton": "Balance",
 		"misc_frozen": "Balance",
 		"fee_frozen": "Balance"
 	},