Skip to content

Canary Alpha #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hackfisher merged 26 commits into from
Feb 21, 2020
Merged

Canary Alpha #268

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
93e3c3b
try: Canary alpha
aurexav Feb 18, 2020
1dba085
fix: #266
aurexav Feb 18, 2020
af0eae3
try: ready for hacking treasury
aurexav Feb 18, 2020
8a318d1
update: format
aurexav Feb 18, 2020
b330d57
add: ethash
aurexav Feb 18, 2020
d7ded4c
Merge remote-tracking branch 'upstream/develop' into canary
aurexav Feb 18, 2020
533cff4
update: spaces to tab
aurexav Feb 18, 2020
93fcbc6
add: sr-eth-primitives
aurexav Feb 18, 2020
e681afc
add: merkle-patricia-trie
aurexav Feb 18, 2020
245a5bb
update: sr-eth-primitives version
aurexav Feb 18, 2020
57ccbf0
update: toml
aurexav Feb 19, 2020
1d8f825
update: chain spec
aurexav Feb 19, 2020
7a10c34
remove: unused code
aurexav Feb 19, 2020
e4c0a8c
update: constants
aurexav Feb 19, 2020
1c4c543
update: format
aurexav Feb 19, 2020
94d10a5
update: import
aurexav Feb 20, 2020
f4000a1
add: eth-relay
aurexav Feb 20, 2020
46d4f9f
update: format
aurexav Feb 20, 2020
b633a1c
update: redeem
aurexav Feb 20, 2020
2287678
add: eth-backing
aurexav Feb 20, 2020
df145fa
update: runtime
aurexav Feb 20, 2020
cd25e8d
update: rename
aurexav Feb 20, 2020
6d2d984
add: tests
aurexav Feb 20, 2020
f81e82c
update: chain spec
aurexav Feb 20, 2020
c3b188d
update: deps
aurexav Feb 20, 2020
5f639e3
fix: #219
aurexav Feb 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update: import
  • Loading branch information
@aurexav
aurexav committed Feb 20, 2020
commit 94d10a54c1c1c89a8c9ef7ec0ddf9ad5dcfcadfa
4 changes: 2 additions & 2 deletions primitives/sr-eth-primitives/src/pow.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use keccak_hash::KECCAK_EMPTY_LIST_RLP;
use primitive_types::{H256, U256, U512};
use rlp::*;
use sp_runtime::RuntimeDebug;
use sp_std::{collections::btree_map::BTreeMap, mem, result};
use sp_std::{collections::btree_map::BTreeMap, mem};

use crate::{
error::{BlockError, Mismatch, OutOfBounds},
Expand Down Expand Up @@ -117,7 +117,7 @@ impl EthashPartial {
}

impl EthashPartial {
pub fn verify_block_basic(&self, header: &EthHeader) -> result::Result<(), error::BlockError> {
pub fn verify_block_basic(&self, header: &EthHeader) -> Result<(), BlockError> {
// check the seal fields.
let seal = EthashSeal::parse_seal(header.seal())?;

Expand Down