Merge remote-tracking branch 'origin/master' into mempool

.travis.yml

@@ -0,0 +1,43 @@
+sudo: required
+dist: trusty
+language: rust
+
+branches:
+  only:
+  - master
+matrix:
+  fast_finish: false
+  include:
+  - rust: stable
+cache:
+  apt: true
+  directories:
+  - $TRAVIS_BUILD_DIR/target
+  - $HOME/.cargo
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - libcurl4-openssl-dev
+    - libelf-dev
+    - libdw-dev
+    - gcc-4.8
+    - g++-4.8
+script:
+  - ./tools/test.sh
+after_success: |
+  [ false ] &&
+  [ $TRAVIS_BRANCH = master ] &&
+  [ $TRAVIS_PULL_REQUEST = false ] &&
+  [ $TRAVIS_RUST_VERSION = stable ] &&
+  cargo doc --no-deps --verbose &&
+  echo '<meta http-equiv=refresh content=0;url=pbtc/index.html>' > target/doc/index.html &&
+  pip install --user ghp-import &&
+  /home/travis/.local/bin/ghp-import -n target/doc &&
+  git push -fq https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}.git gh-pages
+env:
+  global:
+  - CXX="g++-4.8"
+  - CC="gcc-4.8"
+  - secure: IbTkR3KY7N9e3lc6hreWuY2mhuKyf7k6LSRUMMrOeb1k9TIncYMbR6Sl2W1t5+CJVp7WqVoUbP9YIH8o8a9BBuFldTyAz3tapa908KrZKIRlb/uCTef11z/jzasye4Ttj+358DBrCXZqueFw5Bh5Bnaie3r5bSYWTcQU693Bm/tKFp0lh4fSjzGyk7kRZ4V4rz2YHudZOcNIXN+QfY8aY6dxQraw82GUnNXJLzGiC5GJgeSV1uSnxMUM/lb4+zP1qRlcLBLnwHSTH/3vHH5xsOaRwHEYOQT9pTDyxMnJzDgYfjH4mNu3jSvZ7WFrP+Sza/yR+3sjHpOCFN6rsWc88iTq6Nwp+ESfyjHiLT+jqWs7r57sg2VfwHXuzoEW5GGagrIoF/pDEWJvhtNRYvdYevDtlZYPTfhSR4WOPkMPCg7Ln2W7a7vrSH2iRNxawUDnq3bOIyGGBeGwBJFDOEd6CmP+ojjUUm9L5I4berYACgYEDuZ4bpRX3WpGR1yAhSF4o5BTh+88EWU/VhL2ceXreHlztma3KQ5526Ip46lC4eLFrl/w64zaupesEZFjLsOFm7U9Vx9IM6aqBzOFr8Mt8DlPLaTRmRrbzPRYqHg0MLpHkH8S/HyNbK0xvqbQFRHQ6XPXNJVJXZPz8XPUYWYPK9ayplVdRN9nonHQO7F0gV8=

README.md

@@ -1,6 +1,13 @@
 # parity-bitcoin
 The Parity Bitcoin client
 
+[![Build Status][travis-image]][travis-url]
+
+[Internal Documentation][doc-url]
+
 ![Graph][graph]
 
 [graph]: https://github.com/ethcore/parity-bitcoin/blob/master/tools/graph.png
+[travis-image]: https://travis-ci.com/ethcore/parity-bitcoin.svg?token=DMFvZu71iaTbUYx9UypX&branch=master
+[travis-url]: https://travis-ci.com/ethcore/parity-bitcoin
+[doc-url]: https://ethcore.github.io/parity-bitcoin/pbtc/index.html

chain/src/transaction.rs

@@ -6,7 +6,7 @@ use hex::FromHex;
 use bytes::Bytes;
 use ser::{
 	Deserializable, Reader, Error as ReaderError, deserialize,
-	Serializable, Stream, serialize
+	Serializable, Stream, serialize, serialized_list_size
 };
 use crypto::dhash256;
 use hash::H256;
@@ -42,6 +42,11 @@ impl Serializable for OutPoint {
 			.append(&self.hash)
 			.append(&self.index);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		self.hash.serialized_size() + self.index.serialized_size()
+	}
 }
 
 impl Deserializable for OutPoint {
@@ -79,6 +84,13 @@ impl Serializable for TransactionInput {
 			.append(&self.script_sig)
 			.append(&self.sequence);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		self.previous_output.serialized_size() +
+			self.script_sig.serialized_size() +
+			self.sequence.serialized_size()
+	}
 }
 
 impl Deserializable for TransactionInput {
@@ -119,6 +131,12 @@ impl Serializable for TransactionOutput {
 			.append(&self.value)
 			.append(&self.script_pubkey);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		self.value.serialized_size() +
+			self.script_pubkey.serialized_size()
+	}
 }
 
 impl Deserializable for TransactionOutput {
@@ -167,6 +185,14 @@ impl Serializable for Transaction {
 			.append_list(&self.outputs)
 			.append(&self.lock_time);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		self.version.serialized_size() +
+			serialized_list_size(&self.inputs) +
+			serialized_list_size(&self.outputs) +
+			self.lock_time.serialized_size()
+	}
 }
 
 impl Deserializable for Transaction {
@@ -205,6 +231,7 @@ impl Transaction {
 #[cfg(test)]
 mod tests {
 	use hash::H256;
+	use ser::Serializable;
 	use super::Transaction;
 
 	// real transaction from block 80000
@@ -231,4 +258,11 @@ mod tests {
 		let hash = H256::from_reversed_str("5a4ebf66822b0b2d56bd9dc64ece0bc38ee7844a23ff1d7320a88c5fdb2ad3e2");
 		assert_eq!(t.hash(), hash);
 	}
+
+	#[test]
+	fn test_transaction_serialized_len() {
+		let raw_tx: &'static str = "0100000001a6b97044d03da79c005b20ea9c0e1a6d9dc12d9f7b91a5911c9030a439eed8f5000000004948304502206e21798a42fae0e854281abd38bacd1aeed3ee3738d9e1446618c4571d1090db022100e2ac980643b0b82c0e88ffdfec6b64e3e6ba35e7ba5fdd7d5d6cc8d25c6b241501ffffffff0100f2052a010000001976a914404371705fa9bd789a2fcd52d2c580b65d35549d88ac00000000";
+		let tx: Transaction = raw_tx.into();
+		assert_eq!(tx.serialized_size(), raw_tx.len() / 2);
+	}
 }

miner/src/memory_pool.rs

@@ -4,13 +4,13 @@
 //! and orders them by given strategies. It works like multi-indexed priority queue, giving option to pop 'top'
 //! transactions.
 //! It also guarantees that ancestor-descendant relation won't break during ordered removal (ancestors always removed
-//! before descendants).
+//! before descendants). Removal using remove_by_hash can break this rule.
 use hash::H256;
 use chain::Transaction;
 use std::cmp::Ordering;
 use std::collections::HashMap;
 use std::collections::HashSet;
-use ser::stream::serialize;
+use ser::Serializable;
 
 /// Transactions ordering strategy
 #[derive(Debug, Clone, Copy)]
@@ -28,7 +28,7 @@ pub enum OrderingStrategy {
 pub struct Information {
 	/// The number of transactions currently in the `MemoryPool`
 	pub transactions_count: usize,
-	/// The total number of bytes in the transactions in the `MemoryPool` 
+	/// The total number of bytes in the transactions in the `MemoryPool`
 	pub transactions_size_in_bytes: usize,
 }
 
@@ -54,7 +54,7 @@ pub struct Entry {
 	storage_index: u64,
 	/// Transaction fee (stored for efficiency)
 	miner_fee: i64,
-	/// Virtual transaction fee (a way to prioritize/penalize transaction) 
+	/// Virtual transaction fee (a way to prioritize/penalize transaction)
 	miner_virtual_fee: i64,
 	/// size + Sum(size) for all in-pool descendants
 	package_size: usize,
@@ -121,7 +121,7 @@ macro_rules! ordering_strategy {
 				fn partial_cmp(&self, other: &OrderedEntry) -> Option<Ordering> {
 					Some(self.cmp(other))
 				}
-			} 
+			}
 
 			impl Ord for OrderedEntry {
 				fn cmp(&self, other: &Self) -> Ordering {
@@ -503,6 +503,7 @@ impl MemoryPool {
 		self.storage.remove_by_hash(h).map(|entry| entry.transaction)
 	}
 
+<<<<<<< HEAD
 	/// Reads hash of the 'top' transaction from the `MemoryPool` using selected strategy.
 	/// Ancestors are always returned before descendant transactions.
 	pub fn read_with_strategy(&mut self, strategy: OrderingStrategy) -> Option<H256> {
@@ -522,6 +523,9 @@ impl MemoryPool {
 	}
 
 	/// Removes up to n transactions from the `MemoryPool`, using selected strategy.
+=======
+	/// Removes up to n transactions the `MemoryPool`, using selected strategy.
+>>>>>>> origin/master
 	/// Ancestors are always removed before descendant transactions.
 	pub fn remove_n_with_strategy(&mut self, n: usize, strategy: OrderingStrategy) -> Vec<Transaction> {
 		self.storage.remove_n_with_strategy(n, strategy)
@@ -592,8 +596,7 @@ impl MemoryPool {
 	}
 
 	fn get_transaction_size(&self, t: &Transaction) -> usize {
-		// TODO: the only correct way now?
-		serialize(t).len()
+		t.serialized_size()
 	}
 
 	fn get_transaction_miner_fee(&self, t: &Transaction) -> i64 {
@@ -716,7 +719,7 @@ mod tests {
 		assert_eq!(pool_transactions.len(), 4);
 
 		// check pool transactions
-		let ref hash_to_remove = pool_transactions[0]; 
+		let ref hash_to_remove = pool_transactions[0];
 		assert!(*hash_to_remove == RAW_TRANSACTION1_HASH.into()
 			|| *hash_to_remove == RAW_TRANSACTION2_HASH.into()
 			|| *hash_to_remove == RAW_TRANSACTION3_HASH.into()
@@ -782,7 +785,11 @@ mod tests {
 	}
 
 	#[test]
+<<<<<<< HEAD
 	fn test_memory_pool_insert_child_after_remove_by_hash() {
+=======
+	fn test_memory_pool_transaction_dependent_transactions_insert_after_remove_by_hash() {
+>>>>>>> origin/master
 		let raw_parent_transaction = "00000000000164000000000000000000000000";
 		let raw_child_transaction = "0000000001545ac9cffeaa3ee074f08a5306e703cb30883192ed9b10ee9ddb76824e4985070000000000000000000164000000000000000000000000";
 		let raw_grandchild_transaction = "0000000001cc1d8279403880bfdd7682c28ed8441a138f96ae1dc5fd90bc928b88d48107a90000000000000000000164000000000000000000000000";
@@ -805,7 +812,11 @@ mod tests {
 
 		// insert child transaction back to the pool & assert transactions are removed in correct order
 		pool.insert_verified(raw_child_transaction.into());
+<<<<<<< HEAD
 		let transactions = pool.remove_n_with_strategy(3, OrderingStrategy::ByTransactionScore);
+=======
+		let transactions = pool.remove_n_with_strategy(3, OrderingStrategy::ByMinerScore);
+>>>>>>> origin/master
 		assert_eq!(transactions.len(), 3);
 		assert_eq!(transactions[0].hash(), parent_transaction_hash);
 		assert_eq!(transactions[1].hash(), child_transaction_hash);
@@ -827,7 +838,7 @@ mod tests {
 
 			if expected_pool_size != 0 {
 				pool.remove_by_hash(&removals[i].into());
-			} 
+			}
 		}
 	}
 

serialization/src/compact_integer.rs

@@ -82,6 +82,15 @@ impl Serializable for CompactInteger {
 			}
 		}
 	}
+
+	fn serialized_size(&self) -> usize {
+		match self.0 {
+			0...0xfc => 1,
+			0xfd...0xffff => 3,
+			0x10000...0xffff_ffff => 5,
+			_ => 9,
+		}
+	}
 }
 
 impl Deserializable for CompactInteger {

serialization/src/impls.rs

@@ -9,6 +9,11 @@ impl Serializable for bool {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_u8(*self as u8).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		1
+	}
 }
 
 impl Serializable for i32 {
@@ -16,6 +21,11 @@ impl Serializable for i32 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_i32::<LittleEndian>(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		4
+	}
 }
 
 impl Serializable for i64 {
@@ -23,6 +33,11 @@ impl Serializable for i64 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_i64::<LittleEndian>(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		8
+	}
 }
 
 impl Serializable for u8 {
@@ -30,6 +45,11 @@ impl Serializable for u8 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_u8(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		1
+	}
 }
 
 impl Serializable for u16 {
@@ -37,6 +57,11 @@ impl Serializable for u16 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_u16::<LittleEndian>(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		2
+	}
 }
 
 impl Serializable for u32 {
@@ -44,6 +69,11 @@ impl Serializable for u32 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_u32::<LittleEndian>(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		4
+	}
 }
 
 impl Serializable for u64 {
@@ -51,6 +81,11 @@ impl Serializable for u64 {
 	fn serialize(&self, s: &mut Stream) {
 		s.write_u64::<LittleEndian>(*self).unwrap();
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		8
+	}
 }
 
 impl Deserializable for bool {
@@ -114,6 +149,12 @@ impl Serializable for String {
 			.append(&CompactInteger::from(bytes.len()))
 			.append_slice(bytes);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		let bytes: &[u8] = self.as_ref();
+		CompactInteger::from(bytes.len()).serialized_size() + bytes.len()
+	}
 }
 
 impl Deserializable for String {
@@ -129,6 +170,11 @@ macro_rules! impl_ser_for_hash {
 			fn serialize(&self, stream: &mut Stream) {
 				stream.append_slice(&**self);
 			}
+
+			#[inline]
+			fn serialized_size(&self) -> usize {
+				$size
+			}
 		}
 
 		impl Deserializable for $name {
@@ -157,6 +203,11 @@ impl Serializable for Bytes {
 			.append(&CompactInteger::from(self.len()))
 			.append_slice(&self);
 	}
+
+	#[inline]
+	fn serialized_size(&self) -> usize {
+		CompactInteger::from(self.len()).serialized_size() + self.len()
+	}
 }
 
 impl Deserializable for Bytes {

serialization/src/lib.rs

@@ -10,4 +10,4 @@ pub use primitives::{hash, bytes};
 
 pub use compact_integer::CompactInteger;
 pub use self::reader::{Reader, Deserializable, deserialize, Error};
-pub use self::stream::{Stream, Serializable, serialize};
+pub use self::stream::{Stream, Serializable, serialize, serialized_list_size};

serialization/src/stream.rs

@@ -9,9 +9,20 @@ pub fn serialize(t: &Serializable) -> Bytes {
 	stream.out()
 }
 
+pub fn serialized_list_size<T>(t: &[T]) -> usize where T: Serializable {
+	CompactInteger::from(t.len()).serialized_size() +
+		t.iter().map(Serializable::serialized_size).sum::<usize>()
+}
+
 pub trait Serializable {
 	/// Serialize the struct and appends it to the end of stream.
 	fn serialize(&self, s: &mut Stream);
+
+	/// Hint about the size of serialized struct.
+	fn serialized_size(&self) -> usize where Self: Sized {
+		// fallback implementation
+		serialize(self).len()
+	}
 }
 
 /// Stream used for serialization.

tools/graph.dot

@@ -4,200 +4,205 @@ digraph dependencies {
 	N2[label="db",shape=box];
 	N3[label="keys",shape=box];
 	N4[label="message",shape=box];
-	N5[label="p2p",shape=box];
-	N6[label="script",shape=box];
-	N7[label="ansi_term",shape=box];
-	N8[label="arrayvec",shape=box];
-	N9[label="nodrop",shape=box];
-	N10[label="odds",shape=box];
-	N11[label="base58",shape=box];
-	N12[label="bitcrypto",shape=box];
-	N13[label="primitives",shape=box];
-	N14[label="rust-crypto",shape=box];
-	N15[label="bitflags v0.4.0",shape=box];
-	N16[label="bitflags v0.7.0",shape=box];
-	N17[label="byteorder",shape=box];
-	N18[label="cfg-if",shape=box];
-	N19[label="chain",shape=box];
-	N20[label="rustc-serialize",shape=box];
-	N21[label="serialization",shape=box];
-	N22[label="libc",shape=box];
-	N23[label="strsim",shape=box];
-	N24[label="term_size",shape=box];
-	N25[label="unicode-segmentation",shape=box];
-	N26[label="unicode-width",shape=box];
-	N27[label="vec_map",shape=box];
-	N28[label="yaml-rust",shape=box];
-	N29[label="crossbeam",shape=box];
-	N30[label="elastic-array",shape=box];
-	N31[label="ethcore-devtools",shape=box];
-	N32[label="parking_lot",shape=box];
-	N33[label="rocksdb",shape=box];
-	N34[label="deque",shape=box];
-	N35[label="rand",shape=box];
-	N36[label="eth-secp256k1",shape=box];
-	N37[label="gcc",shape=box];
-	N38[label="futures",shape=box];
-	N39[label="log",shape=box];
-	N40[label="futures-cpupool",shape=box];
-	N41[label="num_cpus v1.1.0",shape=box];
-	N42[label="rayon",shape=box];
-	N43[label="kernel32-sys",shape=box];
-	N44[label="winapi",shape=box];
-	N45[label="winapi-build",shape=box];
-	N46[label="lazy_static",shape=box];
-	N47[label="lazycell",shape=box];
-	N48[label="mio",shape=box];
-	N49[label="miow",shape=box];
-	N50[label="net2",shape=box];
-	N51[label="nix",shape=box];
-	N52[label="slab",shape=box];
-	N53[label="ws2_32-sys",shape=box];
-	N54[label="rustc_version",shape=box];
-	N55[label="semver",shape=box];
-	N56[label="void",shape=box];
-	N57[label="num_cpus v0.2.13",shape=box];
-	N58[label="owning_ref",shape=box];
-	N59[label="time",shape=box];
-	N60[label="tokio-core",shape=box];
-	N61[label="parking_lot_core",shape=box];
-	N62[label="smallvec",shape=box];
-	N63[label="rocksdb-sys",shape=box];
-	N64[label="scoped-tls",shape=box];
+	N5[label="miner",shape=box];
+	N6[label="p2p",shape=box];
+	N7[label="script",shape=box];
+	N8[label="ansi_term",shape=box];
+	N9[label="arrayvec",shape=box];
+	N10[label="nodrop",shape=box];
+	N11[label="odds",shape=box];
+	N12[label="base58",shape=box];
+	N13[label="bitcrypto",shape=box];
+	N14[label="primitives",shape=box];
+	N15[label="rust-crypto",shape=box];
+	N16[label="bitflags v0.4.0",shape=box];
+	N17[label="bitflags v0.7.0",shape=box];
+	N18[label="byteorder",shape=box];
+	N19[label="cfg-if",shape=box];
+	N20[label="chain",shape=box];
+	N21[label="rustc-serialize",shape=box];
+	N22[label="serialization",shape=box];
+	N23[label="libc",shape=box];
+	N24[label="strsim",shape=box];
+	N25[label="term_size",shape=box];
+	N26[label="unicode-segmentation",shape=box];
+	N27[label="unicode-width",shape=box];
+	N28[label="vec_map",shape=box];
+	N29[label="yaml-rust",shape=box];
+	N30[label="crossbeam",shape=box];
+	N31[label="elastic-array",shape=box];
+	N32[label="ethcore-devtools",shape=box];
+	N33[label="parking_lot",shape=box];
+	N34[label="rocksdb",shape=box];
+	N35[label="deque",shape=box];
+	N36[label="rand",shape=box];
+	N37[label="eth-secp256k1",shape=box];
+	N38[label="gcc",shape=box];
+	N39[label="futures",shape=box];
+	N40[label="log",shape=box];
+	N41[label="futures-cpupool",shape=box];
+	N42[label="num_cpus v1.1.0",shape=box];
+	N43[label="rayon",shape=box];
+	N44[label="kernel32-sys",shape=box];
+	N45[label="winapi",shape=box];
+	N46[label="winapi-build",shape=box];
+	N47[label="lazy_static",shape=box];
+	N48[label="lazycell",shape=box];
+	N49[label="mio",shape=box];
+	N50[label="miow",shape=box];
+	N51[label="net2",shape=box];
+	N52[label="nix",shape=box];
+	N53[label="slab",shape=box];
+	N54[label="ws2_32-sys",shape=box];
+	N55[label="rustc_version",shape=box];
+	N56[label="semver",shape=box];
+	N57[label="void",shape=box];
+	N58[label="num_cpus v0.2.13",shape=box];
+	N59[label="owning_ref",shape=box];
+	N60[label="time",shape=box];
+	N61[label="tokio-core",shape=box];
+	N62[label="parking_lot_core",shape=box];
+	N63[label="smallvec",shape=box];
+	N64[label="rocksdb-sys",shape=box];
+	N65[label="scoped-tls",shape=box];
 	N0 -> N1[label="",style=dashed];
 	N0 -> N2[label="",style=dashed];
 	N0 -> N3[label="",style=dashed];
 	N0 -> N4[label="",style=dashed];
 	N0 -> N5[label="",style=dashed];
 	N0 -> N6[label="",style=dashed];
-	N1 -> N7[label="",style=dashed];
-	N1 -> N16[label="",style=dashed];
-	N1 -> N22[label="",style=dashed];
+	N0 -> N7[label="",style=dashed];
+	N1 -> N8[label="",style=dashed];
+	N1 -> N17[label="",style=dashed];
 	N1 -> N23[label="",style=dashed];
 	N1 -> N24[label="",style=dashed];
 	N1 -> N25[label="",style=dashed];
 	N1 -> N26[label="",style=dashed];
 	N1 -> N27[label="",style=dashed];
 	N1 -> N28[label="",style=dashed];
-	N2 -> N13[label="",style=dashed];
-	N2 -> N17[label="",style=dashed];
-	N2 -> N19[label="",style=dashed];
-	N2 -> N21[label="",style=dashed];
-	N2 -> N30[label="",style=dashed];
+	N1 -> N29[label="",style=dashed];
+	N2 -> N14[label="",style=dashed];
+	N2 -> N18[label="",style=dashed];
+	N2 -> N20[label="",style=dashed];
+	N2 -> N22[label="",style=dashed];
 	N2 -> N31[label="",style=dashed];
 	N2 -> N32[label="",style=dashed];
 	N2 -> N33[label="",style=dashed];
-	N3 -> N11[label="",style=dashed];
+	N2 -> N34[label="",style=dashed];
 	N3 -> N12[label="",style=dashed];
 	N3 -> N13[label="",style=dashed];
-	N3 -> N20[label="",style=dashed];
-	N3 -> N35[label="",style=dashed];
+	N3 -> N14[label="",style=dashed];
+	N3 -> N21[label="",style=dashed];
 	N3 -> N36[label="",style=dashed];
-	N3 -> N46[label="",style=dashed];
-	N4 -> N12[label="",style=dashed];
+	N3 -> N37[label="",style=dashed];
+	N3 -> N47[label="",style=dashed];
 	N4 -> N13[label="",style=dashed];
-	N4 -> N17[label="",style=dashed];
-	N4 -> N19[label="",style=dashed];
-	N4 -> N21[label="",style=dashed];
-	N5 -> N4[label="",style=dashed];
-	N5 -> N12[label="",style=dashed];
-	N5 -> N13[label="",style=dashed];
-	N5 -> N21[label="",style=dashed];
-	N5 -> N32[label="",style=dashed];
-	N5 -> N35[label="",style=dashed];
-	N5 -> N38[label="",style=dashed];
-	N5 -> N40[label="",style=dashed];
-	N5 -> N59[label="",style=dashed];
-	N5 -> N60[label="",style=dashed];
-	N6 -> N3[label="",style=dashed];
-	N6 -> N12[label="",style=dashed];
+	N4 -> N14[label="",style=dashed];
+	N4 -> N18[label="",style=dashed];
+	N4 -> N20[label="",style=dashed];
+	N4 -> N22[label="",style=dashed];
+	N5 -> N14[label="",style=dashed];
+	N5 -> N20[label="",style=dashed];
+	N5 -> N22[label="",style=dashed];
+	N6 -> N4[label="",style=dashed];
 	N6 -> N13[label="",style=dashed];
-	N6 -> N19[label="",style=dashed];
-	N6 -> N21[label="",style=dashed];
-	N8 -> N9[label=""];
-	N8 -> N10[label=""];
+	N6 -> N14[label="",style=dashed];
+	N6 -> N22[label="",style=dashed];
+	N6 -> N33[label="",style=dashed];
+	N6 -> N36[label="",style=dashed];
+	N6 -> N39[label="",style=dashed];
+	N6 -> N41[label="",style=dashed];
+	N6 -> N60[label="",style=dashed];
+	N6 -> N61[label="",style=dashed];
+	N7 -> N3[label="",style=dashed];
+	N7 -> N13[label="",style=dashed];
+	N7 -> N14[label="",style=dashed];
+	N7 -> N20[label="",style=dashed];
+	N7 -> N22[label="",style=dashed];
 	N9 -> N10[label=""];
-	N12 -> N13[label="",style=dashed];
-	N12 -> N14[label="",style=dashed];
-	N13 -> N20[label="",style=dashed];
-	N14 -> N20[label="",style=dashed];
-	N14 -> N22[label="",style=dashed];
-	N14 -> N35[label="",style=dashed];
-	N14 -> N37[label="",style=dashed];
-	N14 -> N59[label="",style=dashed];
-	N19 -> N12[label="",style=dashed];
-	N19 -> N13[label="",style=dashed];
-	N19 -> N20[label="",style=dashed];
-	N19 -> N21[label="",style=dashed];
-	N21 -> N13[label="",style=dashed];
-	N21 -> N17[label="",style=dashed];
-	N24 -> N22[label="",style=dashed];
-	N24 -> N43[label="",style=dashed];
-	N24 -> N44[label="",style=dashed];
-	N31 -> N35[label="",style=dashed];
-	N32 -> N58[label="",style=dashed];
-	N32 -> N61[label="",style=dashed];
-	N33 -> N22[label="",style=dashed];
-	N33 -> N63[label="",style=dashed];
-	N34 -> N35[label="",style=dashed];
-	N35 -> N22[label="",style=dashed];
-	N36 -> N8[label="",style=dashed];
-	N36 -> N20[label="",style=dashed];
-	N36 -> N22[label="",style=dashed];
-	N36 -> N35[label="",style=dashed];
-	N36 -> N37[label="",style=dashed];
-	N37 -> N42[label="",style=dashed];
-	N38 -> N39[label="",style=dashed];
-	N40 -> N29[label="",style=dashed];
-	N40 -> N38[label="",style=dashed];
-	N40 -> N41[label="",style=dashed];
-	N41 -> N22[label="",style=dashed];
-	N42 -> N34[label="",style=dashed];
-	N42 -> N35[label="",style=dashed];
-	N42 -> N57[label="",style=dashed];
-	N43 -> N44[label="",style=dashed];
-	N43 -> N45[label="",style=dashed];
-	N48 -> N22[label="",style=dashed];
-	N48 -> N39[label="",style=dashed];
-	N48 -> N43[label="",style=dashed];
-	N48 -> N44[label="",style=dashed];
-	N48 -> N47[label=""];
-	N48 -> N49[label=""];
-	N48 -> N50[label=""];
-	N48 -> N51[label=""];
-	N48 -> N52[label="",style=dashed];
-	N49 -> N43[label=""];
-	N49 -> N44[label=""];
+	N9 -> N11[label=""];
+	N10 -> N11[label=""];
+	N13 -> N14[label="",style=dashed];
+	N13 -> N15[label="",style=dashed];
+	N14 -> N21[label="",style=dashed];
+	N15 -> N21[label="",style=dashed];
+	N15 -> N23[label="",style=dashed];
+	N15 -> N36[label="",style=dashed];
+	N15 -> N38[label="",style=dashed];
+	N15 -> N60[label="",style=dashed];
+	N20 -> N13[label="",style=dashed];
+	N20 -> N14[label="",style=dashed];
+	N20 -> N21[label="",style=dashed];
+	N20 -> N22[label="",style=dashed];
+	N22 -> N14[label="",style=dashed];
+	N22 -> N18[label="",style=dashed];
+	N25 -> N23[label="",style=dashed];
+	N25 -> N44[label="",style=dashed];
+	N25 -> N45[label="",style=dashed];
+	N32 -> N36[label="",style=dashed];
+	N33 -> N59[label="",style=dashed];
+	N33 -> N62[label="",style=dashed];
+	N34 -> N23[label="",style=dashed];
+	N34 -> N64[label="",style=dashed];
+	N35 -> N36[label="",style=dashed];
+	N36 -> N23[label="",style=dashed];
+	N37 -> N9[label="",style=dashed];
+	N37 -> N21[label="",style=dashed];
+	N37 -> N23[label="",style=dashed];
+	N37 -> N36[label="",style=dashed];
+	N37 -> N38[label="",style=dashed];
+	N38 -> N43[label="",style=dashed];
+	N39 -> N40[label="",style=dashed];
+	N41 -> N30[label="",style=dashed];
+	N41 -> N39[label="",style=dashed];
+	N41 -> N42[label="",style=dashed];
+	N42 -> N23[label="",style=dashed];
+	N43 -> N35[label="",style=dashed];
+	N43 -> N36[label="",style=dashed];
+	N43 -> N58[label="",style=dashed];
+	N44 -> N45[label="",style=dashed];
+	N44 -> N46[label="",style=dashed];
+	N49 -> N23[label="",style=dashed];
+	N49 -> N40[label="",style=dashed];
+	N49 -> N44[label="",style=dashed];
+	N49 -> N45[label="",style=dashed];
+	N49 -> N48[label=""];
 	N49 -> N50[label=""];
-	N49 -> N53[label=""];
-	N50 -> N18[label=""];
-	N50 -> N22[label=""];
-	N50 -> N43[label=""];
+	N49 -> N51[label=""];
+	N49 -> N52[label=""];
+	N49 -> N53[label="",style=dashed];
 	N50 -> N44[label=""];
-	N50 -> N53[label=""];
-	N51 -> N15[label=""];
-	N51 -> N18[label=""];
-	N51 -> N22[label=""];
+	N50 -> N45[label=""];
+	N50 -> N51[label=""];
+	N50 -> N54[label=""];
+	N51 -> N19[label=""];
+	N51 -> N23[label=""];
+	N51 -> N44[label=""];
+	N51 -> N45[label=""];
 	N51 -> N54[label=""];
-	N51 -> N55[label=""];
-	N51 -> N56[label=""];
-	N53 -> N44[label=""];
-	N53 -> N45[label=""];
-	N54 -> N55[label=""];
-	N57 -> N22[label="",style=dashed];
-	N59 -> N22[label="",style=dashed];
-	N59 -> N43[label="",style=dashed];
-	N59 -> N44[label="",style=dashed];
-	N60 -> N38[label="",style=dashed];
-	N60 -> N39[label="",style=dashed];
-	N60 -> N48[label="",style=dashed];
-	N60 -> N52[label="",style=dashed];
-	N60 -> N64[label="",style=dashed];
-	N61 -> N22[label="",style=dashed];
-	N61 -> N35[label="",style=dashed];
-	N61 -> N43[label="",style=dashed];
-	N61 -> N44[label="",style=dashed];
-	N61 -> N62[label="",style=dashed];
-	N63 -> N22[label="",style=dashed];
-	N63 -> N37[label="",style=dashed];
+	N52 -> N16[label=""];
+	N52 -> N19[label=""];
+	N52 -> N23[label=""];
+	N52 -> N55[label=""];
+	N52 -> N56[label=""];
+	N52 -> N57[label=""];
+	N54 -> N45[label=""];
+	N54 -> N46[label=""];
+	N55 -> N56[label=""];
+	N58 -> N23[label="",style=dashed];
+	N60 -> N23[label="",style=dashed];
+	N60 -> N44[label="",style=dashed];
+	N60 -> N45[label="",style=dashed];
+	N61 -> N39[label="",style=dashed];
+	N61 -> N40[label="",style=dashed];
+	N61 -> N49[label="",style=dashed];
+	N61 -> N53[label="",style=dashed];
+	N61 -> N65[label="",style=dashed];
+	N62 -> N23[label="",style=dashed];
+	N62 -> N36[label="",style=dashed];
+	N62 -> N44[label="",style=dashed];
+	N62 -> N45[label="",style=dashed];
+	N62 -> N63[label="",style=dashed];
+	N64 -> N23[label="",style=dashed];
+	N64 -> N38[label="",style=dashed];
 }