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

Add 24 11 options #23

Merged
merged 2 commits into from
Oct 10, 2023
Merged

Add 24 11 options #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcae7af
Add options
tensojka Sep 28, 2023
ce91a66
Update proposal voting time to 2000
tensojka Sep 28, 2023
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
2 changes: 1 addition & 1 deletion src/constants.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const NEW_PROPOSAL_QUORUM: u128 =
200; // 1/200 of totalSupply required to propose an upgrade. Quorums don't take into account investors. at all, they don't count into total eligible voters, but do vote
const PROPOSAL_VOTING_TIME_BLOCKS: u64 = 1500;
const PROPOSAL_VOTING_TIME_BLOCKS: u64 = 2000;
const QUORUM: u128 = 10; // 1/10 of totalSupply required to participate to pass
const MINUS_ONE: felt252 = 0x800000000000011000000000000000000000000000000000000000000000000;
const TEAM_TOKEN_BALANCE: u128 = 1000000000000000000;
Expand Down
6 changes: 3 additions & 3 deletions src/contract.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ trait IGovernance<TContractState> {

// OPTIONS

fn add_2610_options(ref self: TContractState);
fn add_2411_options(ref self: TContractState);
}


Expand Down Expand Up @@ -153,8 +153,8 @@ mod Governance {
Airdrop::claim(address, amount, proof)
}

fn add_2610_options(ref self: ContractState) {
Options::run_add_2610_options()
fn add_2411_options(ref self: ContractState) {
Options::run_add_2411_options()
}
}
}
45 changes: 23 additions & 22 deletions src/options.cairo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ mod Options {
const VOLATILITY_35: Math64x61_ = consteval_int!(35 * 2305843009213693952);
const VOLATILITY_35_5: Math64x61_ = 81857426827086135296;
const VOLATILITY_36: Math64x61_ = consteval_int!(36 * 2305843009213693952);
const VOLATILITY_37: Math64x61_ = consteval_int!(37 * 2305843009213693952);
const VOLATILITY_38: Math64x61_ = 87622034350120370176;
const VOLATILITY_38_5: Math64x61_ = 88774955854727217152;
const VOLATILITY_39: Math64x61_ = consteval_int!(39 * 2305843009213693952);
Expand Down Expand Up @@ -202,23 +203,23 @@ mod Options {
res
}

fn run_add_2610_options() {
fn run_add_2411_options() {
let mut state = Governance::unsafe_new_contract_state();
assert(
!proposal_initializer_run::InternalContractStateTrait::read(
@state.proposal_initializer_run, 32
@state.proposal_initializer_run, 34
),
'prop32 initializer called again'
'prop34 initializer called again'
);
proposal_initializer_run::InternalContractStateTrait::write(
ref state.proposal_initializer_run, 32, true
ref state.proposal_initializer_run, 34, true
);

add_2610_options();
add_2411_options();
}

fn add_2610_options() {
let MATURITY: felt252 = 1698364799;
fn add_2411_options() {
let MATURITY: felt252 = 1700783999;

let eth_lpt_addr: ContractAddress =
0x7aba50fdb4e024c1ba63e2c60565d0fd32566ff4b18aa5818fc80c30e749024
Expand All @@ -233,8 +234,8 @@ mod Options {
to_add
.append(
FutureOption {
name_long: 'ETHUSDC-26OCT23-1700-LONG-CALL',
name_short: 'ETHUSDC-26OCT23-1700-SHORT-CALL',
name_long: 'ETHUSDC-23NOV23-1700-LONG-CALL',
name_short: 'ETHUSDC-23NOV23-1700-SHORT-CALL',
maturity: MATURITY,
strike_price: STRIKE_PRICE_1700,
option_type: OPTION_CALL,
Expand All @@ -245,52 +246,52 @@ mod Options {
to_add
.append(
FutureOption {
name_long: 'ETHUSDC-26OCT23-1800-LONG-CALL',
name_short: 'ETHUSDC-26OCT23-1800-SHORT-CALL',
name_long: 'ETHUSDC-23NOV23-1800-LONG-CALL',
name_short: 'ETHUSDC-23NOV23-1800-SHORT-CALL',
maturity: MATURITY,
strike_price: STRIKE_PRICE_1800,
option_type: OPTION_CALL,
lptoken_address: eth_lpt_addr,
initial_volatility: VOLATILITY_36
initial_volatility: VOLATILITY_34
}
);
to_add
.append(
FutureOption {
name_long: 'ETHUSDC-26OCT23-1900-LONG-CALL',
name_short: 'ETHUSDC-26OCT23-1900-SHORT-CALL',
name_long: 'ETHUSDC-23NOV23-1900-LONG-CALL',
name_short: 'ETHUSDC-23NOV23-1900-SHORT-CALL',
maturity: MATURITY,
strike_price: STRIKE_PRICE_1900,
option_type: OPTION_CALL,
lptoken_address: eth_lpt_addr,
initial_volatility: VOLATILITY_41
initial_volatility: VOLATILITY_37
}
);
to_add
.append(
FutureOption {
name_long: 'ETHUSDC-26OCT23-1500-LONG-PUT',
name_short: 'ETHUSDC-26OCT23-1500-SHORT-PUT',
name_long: 'ETHUSDC-23NOV23-1500-LONG-PUT',
name_short: 'ETHUSDC-23NOV23-1500-SHORT-PUT',
maturity: MATURITY,
strike_price: STRIKE_PRICE_1500,
option_type: OPTION_PUT,
lptoken_address: usdc_lpt_addr,
initial_volatility: VOLATILITY_36
initial_volatility: VOLATILITY_37
}
);
to_add
.append(
FutureOption {
name_long: 'ETHUSDC-26OCT23-1600-LONG-PUT',
name_short: 'ETHUSDC-26OCT23-1600-SHORT-PUT',
name_long: 'ETHUSDC-23NOV23-1600-LONG-PUT',
name_short: 'ETHUSDC-23NOV23-1600-SHORT-PUT',
maturity: MATURITY,
strike_price: STRIKE_PRICE_1600,
option_type: OPTION_PUT,
lptoken_address: usdc_lpt_addr,
initial_volatility: VOLATILITY_32
initial_volatility: VOLATILITY_34
}
);

add_options(261023836812, to_add.span())
add_options(231123836812, to_add.span())
}
}