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

Jump to bottom

Merge Conflict Fix #23

Merged
merged 16 commits into from
Jan 3, 2024
Merged

Merge Conflict Fix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b76d484
add systemCoinOracle
daopunk Dec 20, 2023
a1944d3
update postSetup script
daopunk Dec 20, 2023
7270cbe
math err
daopunk Dec 21, 2023
734be13
access control factories
daopunk Dec 26, 2023
1c8addb
fix compilation error
daopunk Dec 26, 2023
c501d15
update naming convention
daopunk Dec 26, 2023
43b9432
rm enumerable sets
daopunk Dec 26, 2023
3aff5d5
add initPrice test
daopunk Dec 27, 2023
9875c8f
add price read checks
daopunk Dec 28, 2023
7e6d6b0
add token order check
daopunk Dec 28, 2023
40aae60
add auth
daopunk Dec 28, 2023
f3b098a
Merge branch 'dev' into factory-access
daopunk Jan 2, 2024
8235278
merge
daopunk Jan 2, 2024
31de74d
Merge branch 'dev' into factory-access
daopunk Jan 2, 2024
1a35a7c
fix merge conflict
daopunk Jan 2, 2024
5c89878
merge err
daopunk Jan 2, 2024
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: 0 additions & 4 deletions script/dexrelayer/DeployOracles.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ import {IBaseOracle} from '@interfaces/oracles/IBaseOracle.sol';
import {MintableERC20} from '@contracts/for-test/MintableERC20.sol';
import {Data} from '@contracts/for-test/Data.sol';

// TODO test denominated oracle after relayer works
// import {DenominatedOracleFactory} from '@contracts/factories/DenominatedOracleFactory.sol';
// import {ChainlinkRelayerFactory, IChainlinkRelayerFactory} from '@contracts/factories/ChainlinkRelayerFactory.sol';

// BROADCAST
// source .env && forge script DeployOracles --with-gas-price 2000000000 -vvvvv --rpc-url $ARB_SEPOLIA_RPC --broadcast --verify --etherscan-api-key $ARB_ETHERSCAN_API_KEY

Expand Down
4 changes: 1 addition & 3 deletions script/postdeployment/SetupPostEnvironment.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ contract SetupPostEnvironment is Common {
address _pool = algebraFactory.poolByPair(SEPOLIA_SYSTEM_COIN, SEPOLIA_WETH);

uint160 _sqrtPriceX96 = initialPrice(INIT_OD_AMOUNT, INIT_WETH_AMOUNT, _pool);

IAlgebraPool(_pool).initialize(uint160(_sqrtPriceX96));

// Todo: change to WETH for next deployment
IBaseOracle _odWethOracle = camelotRelayerFactory.deployAlgebraRelayer(
SEPOLIA_ALGEBRA_FACTORY, SEPOLIA_SYSTEM_COIN, address(mockWeth), uint32(ORACLE_INTERVAL_TEST)
SEPOLIA_ALGEBRA_FACTORY, SEPOLIA_SYSTEM_COIN, SEPOLIA_WETH, uint32(ORACLE_INTERVAL_TEST)
);

IBaseOracle chainlinkEthUSDPriceFeed =
Expand Down
Loading