Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "runtime-integration-tests"
version = "1.100.0"
version = "1.101.0"
description = "Integration tests"
authors = ["GalacticCouncil"]
edition = "2021"
Expand Down
Binary file modified integration-tests/snapshots/gigahdx/gigahdx
Binary file not shown.
325 changes: 278 additions & 47 deletions integration-tests/src/gigahdx.rs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion integration-tests/src/liquidation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub fn get_user_account_data(mm_pool: EvmAddress, user: EvmAddress) -> Option<Us
let mut data = Into::<u32>::into(Function::GetUserAccountData).to_be_bytes().to_vec();
data.extend_from_slice(H256::from(user).as_bytes());

let call_result = Executor::<Runtime>::call(context, data, U256::zero(), 500_000);
let call_result = Executor::<Runtime>::call(context, data, U256::zero(), 4_000_000);
assert_eq!(
call_result.exit_reason,
Succeed(Returned),
Expand Down
2 changes: 1 addition & 1 deletion runtime/hydradx/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "hydradx-runtime"
version = "427.0.0"
version = "428.0.0"
authors = ["GalacticCouncil"]
edition = "2021"
license = "Apache 2.0"
Expand Down
13 changes: 1 addition & 12 deletions runtime/hydradx/src/gigahdx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -210,17 +210,6 @@ impl pallet_gigahdx::traits::ExternalClaims<AccountId> for HdxExternalClaims {
}
}

/// Derived sub-account that holds seized GIGAHDX (aToken) + the matching
/// HDX after a gigahdx-collateral liquidation. Governance disposes later.
pub struct GigaHdxLiquidationAccount;

impl sp_core::Get<AccountId> for GigaHdxLiquidationAccount {
fn get() -> AccountId {
use frame_support::sp_runtime::traits::AccountIdConversion;
frame_support::PalletId(*b"gigaliq!").into_account_truncating()
}
}

/// Selective force-removal of gigahdx-rewards votes that would otherwise pin
/// HDX the protocol is about to seize. Delegated to by
/// `GigaHdxLiquidationSupport`; also used directly by integration tests.
Expand Down Expand Up @@ -363,7 +352,7 @@ impl pallet_liquidation::traits::GigaHdxSupport<AccountId> for GigaHdxLiquidatio
}

fn liquidation_account() -> AccountId {
<GigaHdxLiquidationAccount as sp_core::Get<AccountId>>::get()
<crate::TreasuryAccount as sp_core::Get<AccountId>>::get()
}

fn pool_contract() -> Option<EvmAddress> {
Expand Down
2 changes: 1 addition & 1 deletion runtime/hydradx/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: Cow::Borrowed("hydradx"),
impl_name: Cow::Borrowed("hydradx"),
authoring_version: 1,
spec_version: 427,
spec_version: 428,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 1,
Expand Down
Loading