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.

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

Alignment #1056

Merged
merged 5 commits into from
Jul 17, 2024
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
15 changes: 4 additions & 11 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,7 @@
## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.
contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender, level of experience, education, socio-economic status, nationality, personal appearance, race, color or religion.

## Our Standards

Expand All @@ -24,14 +20,11 @@ include:

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ Ethical DeFi Suite is the DeFi powerhouse of the Setheum Network, providing all
#### 1.2.1. Ethical DeFi Projects:

- `Edfis`: Ethical DeFi Suite
- `Edfis Pay`: Decentralised Escrow Payment Protocol
- `Edfis Pay`: Decentralised Payment Protocol
- `Edfis Swap Exchange`: AMM (Automated Market Maker) DEX Protocol inspired by Uniswap v3 design
- `Edfis P2P Exchange`: Decentralized P2P Exchange Protocol as a crypto on-off ramp
- `Edfis Launchpad`: Launchpad Crowdsales protocol for bootstrapping pools on Edfis Exchange
- `Edfis Launchpool`: Launchpool protocol for bootstrapping pools on Edfis Exchange
- `Setter`: Unpegged ECDP Stablecoin
Expand Down
2 changes: 0 additions & 2 deletions blockchain/modules/ecdp-ussd-engine/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,6 @@ impl module_evm::Config for Runtime {

type Runner = module_evm::runner::stack::Runner<Self>;
type FindAuthor = ();
type Task = ();
type IdleScheduler = ();
type WeightInfo = ();
}

Expand Down
2 changes: 0 additions & 2 deletions blockchain/modules/ecdp/src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,6 @@ impl module_evm::Config for Runtime {

type Runner = module_evm::runner::stack::Runner<Self>;
type FindAuthor = ();
type Task = ();
type IdleScheduler = ();
type WeightInfo = ();
}

Expand Down
20 changes: 0 additions & 20 deletions blockchain/modules/support/src/ecdp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,23 +172,3 @@ pub trait EcdpUssdManager<AccountId, CurrencyId, Amount, Balance> {
/// Get exchange rate of debit units to debit value for a currency_id
fn get_debit_exchange_rate(currency_id: CurrencyId) -> ExchangeRate;
}

/// Functionality of Setter ECDP Protocol to be exposed to EVM.
pub trait EcdpSetrManager<AccountId, Amount, Balance> {
/// Adjust ECDP loan
fn adjust_loan(
who: &AccountId,
collateral_adjustment: Amount,
debit_adjustment: Amount,
) -> DispatchResult;
/// Close ECDP loan using DEX
fn close_loan_by_dex(who: AccountId, max_collateral_amount: Balance) -> DispatchResult;
/// Get open ECDP corresponding to an account and collateral
fn get_position(who: &AccountId) -> EcdpEcdpPosition;
/// Get liquidation ratio for collateral
fn get_collateral_parameters() -> Vec<U256>;
/// Get current ratio of collateral to debit of open ECDP
fn get_current_collateral_ratio(who: &AccountId) -> Option<Ratio>;
/// Get exchange rate of debit units to debit value for a currency_id
fn get_debit_exchange_rate() -> ExchangeRate;
}
Loading