Alpha4 merge to main

bin/oe/logger/Cargo.toml

@@ -13,5 +13,5 @@ lazy_static = "1.0"
 regex = "1.0"
 time = "0.1"
 parking_lot = "0.11.1"
-arrayvec = "0.4"
+arrayvec = "0.7"
 ansi_term = "0.10"

bin/oe/logger/src/rotating.rs

@@ -50,7 +50,7 @@ pub struct RotatingLogger {
     /// Defined logger levels
     levels: String,
     /// Logs array. Latest log is always at index 0
-    logs: RwLock<ArrayVec<[String; LOG_SIZE]>>,
+    logs: RwLock<ArrayVec<String, LOG_SIZE>>,
 }
 
 impl RotatingLogger {
@@ -59,7 +59,7 @@ impl RotatingLogger {
     pub fn new(levels: String) -> Self {
         RotatingLogger {
             levels: levels,
-            logs: RwLock::new(ArrayVec::<[_; LOG_SIZE]>::new()),
+            logs: RwLock::new(ArrayVec::<_, LOG_SIZE>::new()),
         }
     }
 
@@ -78,7 +78,7 @@ impl RotatingLogger {
     }
 
     /// Return logs
-    pub fn logs(&self) -> RwLockReadGuard<ArrayVec<[String; LOG_SIZE]>> {
+    pub fn logs(&self) -> RwLockReadGuard<ArrayVec<String, LOG_SIZE>> {
         self.logs.read()
     }
 }

bin/oe/rpc.rs

@@ -29,7 +29,7 @@ use parity_rpc::{
 };
 use parity_runtime::Executor;
 
-pub use parity_rpc::{HttpServer, IpcServer, RequestMiddleware};
+pub use parity_rpc::{HttpServer, IpcServer};
 //pub use parity_rpc::ws::Server as WsServer;
 pub use parity_rpc::ws::{ws, Server as WsServer};
 

crates/accounts/ethstore/src/account/mod.rs

@@ -23,7 +23,7 @@ mod version;
 pub use self::{
     cipher::{Aes128Ctr, Cipher},
     crypto::Crypto,
-    kdf::{Kdf, Pbkdf2, Prf, Scrypt},
+    kdf::{Kdf, Pbkdf2, Prf},
     safe_account::SafeAccount,
     version::Version,
 };

crates/accounts/ethstore/src/json/mod.rs

@@ -32,13 +32,13 @@ mod version;
 pub use self::{
     bytes::Bytes,
     cipher::{Aes128Ctr, Cipher, CipherSer, CipherSerParams},
-    crypto::{CipherText, Crypto},
+    crypto::Crypto,
     error::Error,
     hash::{H128, H160, H256},
     id::Uuid,
     kdf::{Kdf, KdfSer, KdfSerParams, Pbkdf2, Prf, Scrypt},
     key_file::{KeyFile, OpaqueKeyFile},
-    presale::{Encseed, PresaleWallet},
+    presale::PresaleWallet,
     vault_file::VaultFile,
     vault_key_file::{
         insert_vault_name_to_json_meta, remove_vault_name_from_json_meta, VaultKeyFile,

crates/concensus/ethash/src/keccak.rs

@@ -29,7 +29,5 @@ pub mod keccak_512 {
 pub mod keccak_256 {
     use super::hash;
 
-    pub use self::hash::{
-        keccak256 as inplace, keccak256_range as inplace_range, keccak_256 as write,
-    };
+    pub use self::hash::{keccak256 as inplace, keccak_256 as write};
 }

crates/concensus/miner/Cargo.toml

@@ -37,6 +37,7 @@ serde_derive = "1.0"
 serde_json = "1.0"
 trace-time = "0.1"
 txpool = { path = "../../transaction-pool" }
+rustc-hex = "1.0"
 
 [dev-dependencies]
 env_logger = "0.5"

crates/concensus/miner/src/lib.rs

@@ -35,6 +35,7 @@ extern crate parking_lot;
 #[cfg(feature = "price-info")]
 extern crate price_info;
 extern crate rlp;
+extern crate rustc_hex;
 extern crate txpool;
 
 #[macro_use]
@@ -52,8 +53,6 @@ extern crate trace_time;
 extern crate env_logger;
 #[cfg(test)]
 extern crate ethkey;
-#[cfg(test)]
-extern crate rustc_hex;
 
 pub mod external;
 #[cfg(feature = "price-info")]

crates/concensus/miner/src/pool/local_transactions.rs

@@ -225,7 +225,7 @@ impl txpool::Listener<Transaction> for LocalTransactionsList {
             return;
         }
 
-        warn!(target: "own_tx", "Transaction canceled (hash {:?})", tx.hash());
+        warn!(target: "own_tx", "Transaction canceled (hash {:?}), zero gas price: {}, nonce: {} data: {} ", tx.hash(),  tx.has_zero_gas_price(), tx.nonce(),  rustc_hex::ToHex::to_hex(tx.transaction.tx().data.as_slice()));
         self.insert(*tx.hash(), Status::Canceled(tx.clone()));
         self.clear_old();
     }

crates/ethcore/benches/builtin.rs

@@ -50,8 +50,7 @@ impl<'a> BuiltinBenchmark<'a> {
 
         let builtin = builtins
             .get(&H160::from_str(builtin_address).unwrap())
-            .unwrap()
-            .clone();
+            .unwrap();
         let input = FromHex::from_hex(input).unwrap();
         let expected = FromHex::from_hex(expected).unwrap();
 

crates/ethcore/res/contracts/hbbft_connectivity_tracker.json

@@ -0,0 +1,213 @@
+[
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "caller",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "blockHash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "checkReportReconnectCallable",
+      "outputs": [],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "currentEpoch",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "earlyEpochEndThreshold",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "earlyEpochEndToleranceLevel",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        }
+      ],
+      "name": "getCurrentConnectionStatus",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "getFlaggedValidators",
+      "outputs": [
+        {
+          "internalType": "address[]",
+          "name": "",
+          "type": "address[]"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [],
+      "name": "minReportAgeBlocks",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "blockHash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "reportMissingConnectivity",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        },
+        {
+          "internalType": "uint256",
+          "name": "blockNumber",
+          "type": "uint256"
+        },
+        {
+          "internalType": "bytes32",
+          "name": "blockHash",
+          "type": "bytes32"
+        }
+      ],
+      "name": "reportReconnect",
+      "outputs": [],
+      "stateMutability": "nonpayable",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "",
+          "type": "address"
+        }
+      ],
+      "name": "validatorConnectivityScore",
+      "outputs": [
+        {
+          "internalType": "uint256",
+          "name": "",
+          "type": "uint256"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    },
+    {
+      "inputs": [
+        {
+          "internalType": "uint256",
+          "name": "epoch",
+          "type": "uint256"
+        },
+        {
+          "internalType": "address",
+          "name": "validator",
+          "type": "address"
+        },
+        {
+          "internalType": "address",
+          "name": "reporter",
+          "type": "address"
+        }
+      ],
+      "name": "isReported",
+      "outputs": [
+        {
+          "internalType": "bool",
+          "name": "",
+          "type": "bool"
+        }
+      ],
+      "stateMutability": "view",
+      "type": "function"
+    }
+  ]

crates/ethcore/res/local_tests/hbbft/hbbft_test_fork.json

@@ -0,0 +1,22 @@
+{
+    "blockNumberStart": 10,
+    "blockNumberEnd": 100,
+    "validators": [
+        "091d8eba3fedbd073d07d5da39fc42f61a2f4e7100018329f5b845aa86f64d6636de27aaa4c9872942811750a3db8cb8be03584fb50aaa557f8f13d4187db686",
+        "bf4ee1d6d3e72fe8ab1c8ccdeef3aff73665ca0dd2ef5497cd8152e329a9ebd283eba076c369977390f4697026209a9fdfa78c2d98e76c4bafb3f8fb669ee4b0"
+    ],
+    "parts": [
+        "00000000000000000100000000000000b8192b72d83b24d9d13229521f74e6664135cd9dd3d5c4fee6b46244c7fb637e099a7cf83ff84f7da56f119391a5be45020000000000000099000000000000000410da71b86de8a64eda03139cb4aa2c86d7dc30b3a8125658d25454e31b6aaadc21d8a16290cd9a9367f7c81933e517f314481fe43f0385829e843a4ff5f614c0329f8725ba757f0f05543255b5ccf70e204af8ad430a8dc7be7ba923be1e3efbcd0c2852ad29e2516972dedbe8d1cfba4f2d3af8a08caeee33cd60d294b95ecd70d60e5a2b0929106eea34d457b95487f8864ea926e9b04b990000000000000004dbb6269a2ffe83a197d9687060e1a509affa81b88b8b0b5ec37b6323abd6a4220d8d445273b5f0b937b01fb900369add18030953e62239353599d6005081526d12567acda069033fb2c82109e8b8294d9f68e49fa461a81886d7162d37d8090c5e4ce633acd0ced42200a09eb9dacfb8c9dc0dcb5d5fa9b5d645318ed856fec6bdd146367d1258d5975681084122833c910f9c2c5f6ca8bf",
+        "00000000000000000100000000000000b38755bce7abb9935778b1803b7a4351f68c367e20a38d7208a5c24e3af245b13ded32434b982f15dfd0de99fb5188eb0200000000000000990000000000000004634fd14e7ce463dde2973d53ea2f9638239c22a7f22ee776f900f72ea093dd64c1b9747df1348a1c9293aafc5a99abbf511be721fc898d549dc9ffe94b3f4b6348eedc44322c1c1a6e62ecccc0b266fc44901bd777bddd512c351e56e6b6e3516c12cf3713edff7df201914d071f9a80cbcaea0fc1d228dc2485653d44d8829c9036040a184ac838e80074b2b6ee56f34690b6f26b85aa7a99000000000000000451456684fa30515c8d0ef1244ac419791fb0ff5d52bf2229cbef4fcf4928961d386f9c20c75fb530b1fce6e7e9ad5f0b0cd09944e8598d20e55f0208703e37ba191261e0d302824202eda3e0150731715b88e165f17203f1406023f9cd3d898e10fef65d99fc3f5e3891ce1001fda7bcbea95ac74d030f0a369c0b8cce8bdaac1d7b682649f644677953d1dc3f076bd3befa2c4aaa9d5ea3"
+    ],
+    "acks": [
+        [
+            "0000000000000000020000000000000091000000000000000490a193eab4de97351348833b933705dfb903c7f5875559722a25de970a7bf58a434a9c4d251fa8412ada1e11d8b38e1530a765ef4d3f5d89264967ad75d9e0559318ea05314b8317d686ac51c4bd66ce09de4f4dc6cc64efde35efc1394d5371e968592551401240d901ee9bcde99de77bbdcfa6a65d64dc9f814ca0b4f17a0b5e35562e01c21c850903c55a2ab442699100000000000000042d9c2e94e9a5d2283fdf0dae7f0671fd9a81787ecb2908d1fccee00c57c43022e4f42f2bbf3059ce2c0bebc12d7b4fcae2c87ff1072e111bb7b67839266e23a778272003f3ec618082b750c3b7fdb5800ce76312154fd8ba33a6aaf3aa6c6aaa5880f9516c6f5094d09a69f3c7918f0e2ec92542d91a0e2ba9f65722e3a374ab01c73bff571f114b7bdd0e9298eba220",
+            "010000000000000002000000000000009100000000000000047eee4f119edac1a8f78f0b44426ffbb26b03ea36234678b287711d4e3a47a0215fc917d83c64ff1adfa3c4e985dcaddf550953768ab3725680f8cb4046e0b4338f351cbe49e69c4fcfd3df3285f7b1deed4e1fe41a0ca2d6962de6348db84a690e018a170b3df8a1283a16514ff58be083668fc4226a4921c35a15ac59f8c2e6e3e00adb9da20df161013beacef2330c9100000000000000049d03818e04ff4631844a94e73976653117fa97d88d029159af7cfadf71ed285202f17332cef132f3bb0ca6f5ddfdb3b9cafcc6a9e5b4b86e493d9946b3a6ab5b8e981fe70792b2ec3f63ed9b682eb5b8667398191a16fa308bf1b600541418d6673ba3902d4b58f60875e117984b970dc0d646f721285cacb759e07938ee5a8dbb2bfc70c1b5d6168446571531cccf64"
+        ],
+        [
+            "00000000000000000200000000000000910000000000000004a87bbba9d5bed1aaa03a2f761213b7bcc8e9b7ae4fb9704562504a07d17f058dfc8725686682e31a12795822f748bd7925085106f2632aecd1e8f2aba231c02c619d8f9263a2683e0cc87be5bad052873cad313550e4c3509ee5cd410cf1aa3350e6ac24c3741781ffa3c5f4a64676cb533f73470e56c7679caef649785494c12c999f6bfb9053c31627ca112cffac1c9100000000000000046a88660f1c401aabfc2e565105eb6ccdaa7f403f897e63512beee5b2a8f5b5a3a63f002ee74ace2778da41935a5fc44a1f5dc5e5a58484f662edd3dbb9f5a6088a7b53b0626b5c42fd2a1ec9f78374288bab74bd0e8398d7203aa294d1c78733365b646b0d38b72447f36e3908e9f2ab31a682b4f62c37ca3240b7e607f264b63917eff09c6fbaaef0331b17260b2074",
+            "010000000000000002000000000000009100000000000000040a911f3a00d13a252002b042e65052016a1426e05464246145247c72b3825459d92903a1dbf8381a475f38d89b79d6c3b8ea4213a379e5c0dfd78540b633ad3aac019c199c6f22c7c484e2c405bff32d55bc650ae88088b8d930f9a0b066f4576a0c781c80feeb6fc8c220b11964807aa611dcf4dafb5386cbaab7a14f210d78438472b1f427e5e85b49bfbf97e03f7a91000000000000000406c4f04455ad55cecdecd1969ec7ad7684602056eb17b7cd656adc82e741c873eab437d54d8c9e191bc51246e25d0b5c77b2440e866d6c38b6d82a408bd02b64c1bf0584231a4201b9916ed2be1282ab1640866c347ec017a5c92a924e5012334b59d82359544177b762568ea96bb3f7ce2dd6ff60cdfa6fa52c7a78cc6a3f2ec230bddfa6974934a0f6899797493f85"
+        ]
+    ]
+}