Add worlds to the Shard spec

Author: Seulgi Kim

core/res/blake_pow.json

@@ -40,6 +40,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/res/cuckoo.json

@@ -43,6 +43,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/res/null.json

@@ -37,6 +37,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/res/solo.json

@@ -38,6 +38,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/res/solo_authority.json

@@ -42,6 +42,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/res/tendermint.json

@@ -54,6 +54,16 @@
     "9cce34f7ab185c7aba1b7c8140d620b4bda941d6": { "balance": "1606938044258990275541962092341162602522202993782792835301376", "nonce": "0" }
   },
   "shards": {
-    "0": { "nonce": 0, "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6" }
+    "0": {
+      "nonce": 0,
+      "owner": "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+      "worlds": [{
+        "nonce": 0,
+        "owners": [
+          "0x9cce34f7ab185c7aba1b7c8140d620b4bda941d6",
+          "0xa6594b7196808d161b6fb137e781abbc251385d9"
+        ]
+      }]
+    }
   }
 }

core/src/spec/pod_shard_metadata.rs

@@ -19,19 +19,21 @@ use std::fmt;
 use cjson;
 use ckey::Address;
 use cstate::ShardMetadata;
-use ctypes::ShardId;
 use rlp::{Encodable, RlpStream};
 
+use super::pod_world::PodWorld;
+
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct PodShardMetadata {
     pub owner: Address,
-    pub number_of_worlds: ShardId,
     pub nonce: u64,
+    pub worlds: Vec<PodWorld>,
 }
 
 impl<'a> Into<ShardMetadata> for &'a PodShardMetadata {
     fn into(self) -> ShardMetadata {
-        ShardMetadata::new_with_nonce(self.number_of_worlds, self.nonce)
+        assert!(self.worlds.len() <= ::std::u16::MAX as usize);
+        ShardMetadata::new_with_nonce(self.worlds.len() as u16, self.nonce)
     }
 }
 
@@ -45,15 +47,15 @@ impl Encodable for PodShardMetadata {
 impl From<cjson::spec::Shard> for PodShardMetadata {
     fn from(s: cjson::spec::Shard) -> Self {
         Self {
-            number_of_worlds: 0,
             nonce: s.nonce.map(Into::into).unwrap_or(0),
             owner: s.owner,
+            worlds: s.worlds.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
         }
     }
 }
 
 impl fmt::Display for PodShardMetadata {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "(#wordls={}; nonce={}; owner={})", self.number_of_worlds, self.nonce, self.owner)
+        write!(f, "(#nonce={}; owner={}; worlds={:#?})", self.nonce, self.owner, self.worlds)
     }
 }

core/src/spec/spec.rs

@@ -23,6 +23,7 @@ use ckey::Address;
 use cmerkle::TrieFactory;
 use cstate::{
     ActionHandler, Backend, Metadata, MetadataAddress, Shard, ShardAddress, ShardMetadataAddress, StateDB, StateResult,
+    WorldAddress,
 };
 use ctypes::ShardId;
 use hashdb::HashDB;
@@ -199,6 +200,15 @@ impl Spec {
                 let r = t.insert(&*address, &shard.rlp_bytes());
                 debug_assert_eq!(Ok(None), r);
                 r?;
+
+                assert!(shard.worlds.len() <= ::std::u16::MAX as usize);
+                for (world_id, world) in shard.worlds.iter().enumerate() {
+                    let address = WorldAddress::new(*shard_id, world_id as u16);
+
+                    let r = t.insert(&*address, &world.rlp_bytes());
+                    debug_assert_eq!(Ok(None), r);
+                    r?;
+                }
             }
             let owner = shard.owner;
             shard_roots.push((*shard_id, shard_root, owner));

json/src/spec/shard.rs

@@ -17,12 +17,13 @@
 use primitives::H160;
 
 use super::super::uint::Uint;
+use super::World;
 
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct Shard {
     pub nonce: Option<Uint>,
     pub owner: H160,
-    // FIXME: Add worlds
+    pub worlds: Option<Vec<World>>,
 }
 
 #[cfg(test)]
@@ -36,13 +37,21 @@ mod tests {
     fn shard_deserialization() {
         let s = r#"{
             "nonce": 0,
-            "owner": "0x01234567890abcdef0123456789abcdef0123456"
+            "owner": "0x01234567890abcdef0123456789abcdef0123456",
+            "worlds": [{
+                "nonce": 3,
+                "owners": ["0x01234567890abcdef0123456789abcdef0123457"]
+            }]
         }"#;
         let shard: Shard = serde_json::from_str(s).unwrap();
         assert_eq!(
             Shard {
                 nonce: Some(Uint(U256::from(0))),
                 owner: H160::from("01234567890abcdef0123456789abcdef0123456"),
+                worlds: Some(vec![World {
+                    nonce: Some(Uint(U256::from(3))),
+                    owners: Some(vec![H160::from("01234567890abcdef0123456789abcdef0123457")]),
+                }]),
             },
             shard
         );
@@ -59,6 +68,7 @@ mod tests {
             Shard {
                 nonce: Some(Uint(U256::from(100))),
                 owner: H160::from("01234567890abcdef0123456789abcdef0123456"),
+                worlds: None,
             },
             shard
         );
@@ -83,6 +93,7 @@ mod tests {
             Shard {
                 nonce: None,
                 owner: H160::from("01234567890abcdef0123456789abcdef0123456"),
+                worlds: None,
             },
             shard
         );