Skip to content
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

Release 0.6.8 #508

Merged
merged 12 commits into from
Sep 8, 2020
Merged

Release 0.6.8 #508

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d12b7ec
bump: 0.6.8
aurexav Sep 2, 2020
f72549c
bump: dependencies
aurexav Sep 2, 2020
0009e1e
update: runtime
aurexav Sep 2, 2020
a601b4c
update: service
aurexav Sep 2, 2020
cf2f592
rename: "Darwinia Crab"
aurexav Sep 2, 2020
8691b9e
remove: unused format
aurexav Sep 2, 2020
1882ada
companion: for #259
aurexav Sep 5, 2020
2c0830f
fix: types
aurexav Sep 5, 2020
964a14d
companion: for #265
aurexav Sep 8, 2020
0590d69
integrate: subkey
aurexav Sep 8, 2020
8ff5984
bump: dependencies
aurexav Sep 8, 2020
ea02f59
update: format
aurexav Sep 8, 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
companion: for #259
  • Loading branch information
@aurexav
aurexav committed Sep 5, 2020
commit 1882ada5f8133f174879881c9cf66fc1a48e461c
62 changes: 31 additions & 31 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion runtime/crab/src/constants.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub mod relay {
impl AdjustableRelayerGame for EthereumRelayerGameAdjustor {
type Moment = BlockNumber;
type Balance = Balance;
type TcBlockNumber = <EthereumRelay as Relayable>::BlockNumber;
type TcBlockNumber = <<EthereumRelay as Relayable>::HeaderThing as HeaderThing>::Number;

fn challenge_time(round: Round) -> Self::Moment {
match round {
Expand Down
5 changes: 4 additions & 1 deletion runtime/crab/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ pub type SignedExtra = (
frame_system::CheckNonce<Runtime>,
frame_system::CheckWeight<Runtime>,
pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
darwinia_ethereum_relay::CheckEthereumRelayHeaderHash<Runtime>,
);
/// Unchecked extrinsic type as expected by this runtime.
pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<Address, Call, Signature, SignedExtra>;
Expand Down Expand Up @@ -748,7 +749,7 @@ parameter_types! {
impl darwinia_ethereum_backing::Trait for Runtime {
type ModuleId = EthBackingModuleId;
type Event = Event;
type DetermineAccountId = darwinia_ethereum_backing::AccountIdDeterminator<Runtime>;
type RedeemAccountId = AccountId;
type EthereumRelay = EthereumRelay;
type OnDepositRedeem = Staking;
type RingCurrency = Ring;
Expand All @@ -763,6 +764,7 @@ parameter_types! {
impl darwinia_ethereum_relay::Trait for Runtime {
type ModuleId = EthereumRelayModuleId;
type Event = Event;
type Call = Call;
type Currency = Ring;
type RelayerGame = EthereumRelayerGame;
type ApproveOrigin = ApproveOrigin;
Expand Down Expand Up @@ -894,6 +896,7 @@ where
frame_system::CheckNonce::<Runtime>::from(nonce),
frame_system::CheckWeight::<Runtime>::new(),
pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(tip),
darwinia_ethereum_relay::CheckEthereumRelayHeaderHash::<Runtime>::new(),
);
let raw_payload = SignedPayload::new(call, extra)
.map_err(|e| {
Expand Down