pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-24 11:21:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check the genesis hash in transactions regardless of era. (#3286)

Browse Source 
* Check the genesis hash in transactions regardless of era.

* Fix check-fees, too.

* Undo.

* Subkey supports new signing.

* Remove unneeded type param.

* Bump tx version

* Build.

* Another build fix

* Build again

* Cleanup

* Another fix.

* Fix

* Fixes

* 6 second blocks.

* Fixes

* Build fix

* Fix

* Fix.
This commit is contained in:
Gavin Wood
2019-08-02 18:30:20 +02:00
committed by GitHub
parent ae6c2f7f8c
commit 7927e80bc6
16 changed files with 102 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/finality-grandpa/src/environment.rs
+3 -3
View File
@@ -35,7 +35,7 @@ use grandpa::{
};
use sr_primitives::generic::BlockId;
use sr_primitives::traits::{
Block as BlockT, Header as HeaderT, NumberFor, One, Zero, BlockNumberToHash,
Block as BlockT, Header as HeaderT, NumberFor, One, Zero,
};
use primitives::{Blake2Hasher, ed25519, H256, Pair};
use substrate_telemetry::{telemetry, CONSENSUS_INFO};
@@ -962,10 +962,10 @@ pub(crate) fn canonical_at_height<B, E, Block: BlockT<Hash=H256>, RA>(
if base_is_canonical {
return Ok(Some(base.0));
} else {
return Ok(client.block_number_to_hash(height));
return Ok(client.block_hash(height).unwrap_or(None));
}
} else if base_is_canonical {
return Ok(client.block_number_to_hash(height));
return Ok(client.block_hash(height).unwrap_or(None));
}
let one = NumberFor::<Block>::one();