Skip to content

Commit

Permalink
script: update factory address
Browse files Browse the repository at this point in the history 
* fix: update factory address
* fix: update factory hash
* fix: update factory hash
* lib: update amm-core commit
* script: update deployer EOA
* script: check with `require`
* test: update gas snapshot
* test: update gas snapshot
  • Loading branch information
@xenide
xenide committed Jun 23, 2023
1 parent 66e658e commit 5407a98
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 54 deletions.
92 changes: 46 additions & 46 deletions .gas-snapshot
View file
Original file line number Diff line number Diff line change
@@ -1,61 +1,61 @@
QuoterTest:testGetAmountOutConstantProduct(uint256,uint256,uint256,uint256) (runs: 256, μ: 17070, ~: 17131)
QuoterTest:testGetAmountOutStable(uint256,uint256,uint256,uint256,uint256) (runs: 256, μ: 46332, ~: 47636)
QuoterTest:testGetAmountsIn(uint256) (runs: 256, μ: 4944502, ~: 4944821)
QuoterTest:testGetAmountsOut(uint256,uint256,uint256) (runs: 256, μ: 4940711, ~: 4939207)
QuoterTest:testQuoteAddLiquidity_ConstantProduct_Balanced(uint256,uint256) (runs: 256, μ: 119223, ~: 119235)
QuoterTest:testQuoteAddLiquidity_ConstantProduct_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 4905463, ~: 4905444)
QuoterTest:testQuoteAddLiquidity_PairDoesNotExistYet(uint256,uint256,uint256) (runs: 256, μ: 39585, ~: 33703)
QuoterTest:testQuoteAddLiquidity_Stable_Balanced(uint256,uint256) (runs: 256, μ: 140901, ~: 140929)
QuoterTest:testQuoteAddLiquidity_Stable_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 5308415, ~: 5309198)
QuoterTest:testQuoteRemoveLiquidity(uint256) (runs: 256, μ: 148948, ~: 148902)
ReservoirLibraryTest:testGetAmountInConstantProduct(uint256) (runs: 256, μ: 82078, ~: 82270)
ReservoirLibraryTest:testGetAmountInStable(uint256) (runs: 256, μ: 103967, ~: 104275)
ReservoirLibraryTest:testGetAmountIn_InsufficientLiquidity(uint256) (runs: 256, μ: 7650, ~: 7387)
QuoterTest:testGetAmountOutConstantProduct(uint256,uint256,uint256,uint256) (runs: 256, μ: 17047, ~: 17131)
QuoterTest:testGetAmountOutStable(uint256,uint256,uint256,uint256,uint256) (runs: 256, μ: 46177, ~: 46948)
QuoterTest:testGetAmountsIn(uint256) (runs: 256, μ: 4944507, ~: 4944813)
QuoterTest:testGetAmountsOut(uint256,uint256,uint256) (runs: 256, μ: 4940728, ~: 4939199)
QuoterTest:testQuoteAddLiquidity_ConstantProduct_Balanced(uint256,uint256) (runs: 256, μ: 119270, ~: 119283)
QuoterTest:testQuoteAddLiquidity_ConstantProduct_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 4905461, ~: 4905438)
QuoterTest:testQuoteAddLiquidity_PairDoesNotExistYet(uint256,uint256,uint256) (runs: 256, μ: 39923, ~: 33705)
QuoterTest:testQuoteAddLiquidity_Stable_Balanced(uint256,uint256) (runs: 256, μ: 140912, ~: 140930)
QuoterTest:testQuoteAddLiquidity_Stable_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 5308412, ~: 5309192)
QuoterTest:testQuoteRemoveLiquidity(uint256) (runs: 256, μ: 148946, ~: 148902)
ReservoirLibraryTest:testGetAmountInConstantProduct(uint256) (runs: 256, μ: 82062, ~: 81988)
ReservoirLibraryTest:testGetAmountInStable(uint256) (runs: 256, μ: 103964, ~: 104275)
ReservoirLibraryTest:testGetAmountIn_InsufficientLiquidity(uint256) (runs: 256, μ: 7645, ~: 7387)
ReservoirLibraryTest:testGetAmountIn_InsufficientOutputAmount() (gas: 3380)
ReservoirLibraryTest:testGetAmountOutConstantProduct(uint256) (runs: 256, μ: 79846, ~: 81450)
ReservoirLibraryTest:testGetAmountOutStable(uint256) (runs: 256, μ: 99677, ~: 98578)
ReservoirLibraryTest:testGetAmountOutConstantProduct(uint256) (runs: 256, μ: 79843, ~: 81450)
ReservoirLibraryTest:testGetAmountOutStable(uint256) (runs: 256, μ: 99548, ~: 97867)
ReservoirLibraryTest:testGetAmountOut_InsufficientInputAmount() (gas: 3405)
ReservoirLibraryTest:testGetAmountOut_InsufficientLiquidity(uint256) (runs: 256, μ: 7757, ~: 7494)
ReservoirLibraryTest:testGetAmountsIn_CP() (gas: 4886464)
ReservoirLibraryTest:testGetAmountsIn_MixedCurves() (gas: 4927974)
ReservoirLibraryTest:testGetAmountsIn_SP(uint256) (runs: 256, μ: 5288481, ~: 5288792)
ReservoirLibraryTest:testGetAmountsOut_CP() (gas: 4885917)
ReservoirLibraryTest:testGetAmountsOut_MixedCurves() (gas: 4902211)
ReservoirLibraryTest:testGetAmountsOut_SP() (gas: 5286911)
ReservoirLibraryTest:testGetAmountOut_InsufficientLiquidity(uint256) (runs: 256, μ: 7752, ~: 7494)
ReservoirLibraryTest:testGetAmountsIn_CP() (gas: 4886456)
ReservoirLibraryTest:testGetAmountsIn_MixedCurves() (gas: 4927966)
ReservoirLibraryTest:testGetAmountsIn_SP(uint256) (runs: 256, μ: 5288453, ~: 5288422)
ReservoirLibraryTest:testGetAmountsOut_CP() (gas: 4885909)
ReservoirLibraryTest:testGetAmountsOut_MixedCurves() (gas: 4902203)
ReservoirLibraryTest:testGetAmountsOut_SP() (gas: 5286903)
ReservoirLibraryTest:testGetPrecisionMultiplier() (gas: 769112)
ReservoirLibraryTest:testGetPrecisionMultiplier_MoreThan18Decimals() (gas: 14137)
ReservoirLibraryTest:testGetSwapFee() (gas: 17707)
ReservoirLibraryTest:testGetSwapFee_PairDoesNotExist() (gas: 23533)
ReservoirLibraryTest:testQuote_AmountZero() (gas: 3359)
ReservoirLibraryTest:testQuote_Balanced(uint256,uint256) (runs: 256, μ: 6439, ~: 6484)
ReservoirLibraryTest:testQuote_Balanced(uint256,uint256) (runs: 256, μ: 6428, ~: 6484)
ReservoirLibraryTest:testQuote_ReserveZero() (gas: 3354)
ReservoirLibraryTest:testQuote_Unbalanced(uint256,uint256,uint256) (runs: 256, μ: 8194, ~: 8136)
ReservoirRouterTest:testAddLiquidity_CP(uint256,uint256) (runs: 256, μ: 453462, ~: 461764)
ReservoirRouterTest:testAddLiquidity_CreatePair_CP() (gas: 4950610)
ReservoirRouterTest:testAddLiquidity_CreatePair_CP_Native() (gas: 5220794)
ReservoirRouterTest:testAddLiquidity_CreatePair_SP(uint256,uint256) (runs: 256, μ: 5324797, ~: 5324942)
ReservoirLibraryTest:testQuote_Unbalanced(uint256,uint256,uint256) (runs: 256, μ: 8213, ~: 8136)
ReservoirRouterTest:testAddLiquidity_CP(uint256,uint256) (runs: 256, μ: 452884, ~: 461752)
ReservoirRouterTest:testAddLiquidity_CreatePair_CP() (gas: 4950602)
ReservoirRouterTest:testAddLiquidity_CreatePair_CP_Native() (gas: 5220786)
ReservoirRouterTest:testAddLiquidity_CreatePair_SP(uint256,uint256) (runs: 256, μ: 5324792, ~: 5324934)
ReservoirRouterTest:testAddLiquidity_OptimalLessThanMin() (gas: 44539)
ReservoirRouterTest:testAddLiquidity_SP_Balanced(uint256,uint256) (runs: 256, μ: 477686, ~: 478053)
ReservoirRouterTest:testAddLiquidity_SP_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 5657726, ~: 5657969)
ReservoirRouterTest:testRemoveLiquidity(uint256) (runs: 256, μ: 370358, ~: 368334)
ReservoirRouterTest:testRemoveLiquidity_Native() (gas: 5467585)
ReservoirRouterTest:testAddLiquidity_SP_Balanced(uint256,uint256) (runs: 256, μ: 477632, ~: 478053)
ReservoirRouterTest:testAddLiquidity_SP_Unbalanced(uint256,uint256,uint256,uint256) (runs: 256, μ: 5657620, ~: 5657925)
ReservoirRouterTest:testRemoveLiquidity(uint256) (runs: 256, μ: 370750, ~: 376025)
ReservoirRouterTest:testRemoveLiquidity_Native() (gas: 5467577)
ReservoirRouterTest:testRemoveLiquidity_PairDoesNotExist() (gas: 17430)
ReservoirRouterTest:testRemoveLiquidity_ReceivedLessThanMin() (gas: 277715)
ReservoirRouterTest:testSwapExactForVariable(uint256,uint256,uint256) (runs: 256, μ: 4993808, ~: 4997989)
ReservoirRouterTest:testSwapExactForVariable_MixedCurves(uint256) (runs: 256, μ: 5419166, ~: 5421988)
ReservoirRouterTest:testSwapExactForVariable_NativeIn() (gas: 5409898)
ReservoirRouterTest:testSwapExactForVariable_NativeOut() (gas: 5502857)
ReservoirRouterTest:testSwapExactForVariable_Slippage() (gas: 5035464)
ReservoirRouterTest:testSwapVariableForExact(uint256) (runs: 256, μ: 5445960, ~: 5447659)
ReservoirRouterTest:testSwapVariableForExact_MixedCurves() (gas: 5485196)
ReservoirRouterTest:testSwapVariableForExact_NativeIn() (gas: 5427480)
ReservoirRouterTest:testSwapVariableForExact_NativeIn_RefundETH() (gas: 5433834)
ReservoirRouterTest:testSwapVariableForExact_NativeOut() (gas: 5491674)
SelfPermitTest:testPermit(uint256) (runs: 256, μ: 92328, ~: 91657)
SelfPermitTest:testSelfPermit(uint256) (runs: 256, μ: 78026, ~: 78001)
ReservoirRouterTest:testSwapExactForVariable(uint256,uint256,uint256) (runs: 256, μ: 4993751, ~: 4997981)
ReservoirRouterTest:testSwapExactForVariable_MixedCurves(uint256) (runs: 256, μ: 5419119, ~: 5420570)
ReservoirRouterTest:testSwapExactForVariable_NativeIn() (gas: 5409890)
ReservoirRouterTest:testSwapExactForVariable_NativeOut() (gas: 5502849)
ReservoirRouterTest:testSwapExactForVariable_Slippage() (gas: 5035456)
ReservoirRouterTest:testSwapVariableForExact(uint256) (runs: 256, μ: 5445833, ~: 5444144)
ReservoirRouterTest:testSwapVariableForExact_MixedCurves() (gas: 5485188)
ReservoirRouterTest:testSwapVariableForExact_NativeIn() (gas: 5427472)
ReservoirRouterTest:testSwapVariableForExact_NativeIn_RefundETH() (gas: 5433826)
ReservoirRouterTest:testSwapVariableForExact_NativeOut() (gas: 5491666)
SelfPermitTest:testPermit(uint256) (runs: 256, μ: 92327, ~: 91647)
SelfPermitTest:testSelfPermit(uint256) (runs: 256, μ: 78027, ~: 78021)
SelfPermitTest:testSelfPermitAllowed() (gas: 75082)
SelfPermitTest:testSelfPermitAllowedIfNecessary_DoesNotFailWhenSubmittedExternally() (gas: 78038)
SelfPermitTest:testSelfPermitAllowedIfNecessary_SufficientAllowanceNoAction() (gas: 80245)
SelfPermitTest:testSelfPermitIfNecessary_DoesNotFailWhenSubmittedExternally(uint256) (runs: 256, μ: 80987, ~: 80962)
SelfPermitTest:testSelfPermitIfNecessary_DoesNotFailWhenSubmittedExternally(uint256) (runs: 256, μ: 80988, ~: 80982)
SelfPermitTest:testSelfPermitIfNecessary_SufficientAllowanceNoAction(uint256) (runs: 256, μ: 106768, ~: 106763)
SelfPermitTest:testSelfPermit_FailsWhenSubmittedExternally(uint256) (runs: 256, μ: 84570, ~: 84536)
SelfPermitTest:testSelfPermit_FailsWhenSubmittedExternally(uint256) (runs: 256, μ: 84572, ~: 84576)
2 changes: 1 addition & 1 deletion lib/amm-core
Submodule amm-core updated 9 files
+75 −73 .gas-snapshot
+2 −0 .prettierignore
+0 −278 broadcast/DeployScript.s.sol/43114/run-1686694128.json
+1 −1 script/optimized-deployer-meta
+1 −1 script/unoptimized-deployer-meta
+9 −2 src/GenericFactory.sol
+1 −1 src/ReservoirDeployer.sol
+68 −0 test/helpers/BytesLib.sol
+38 −0 test/unit/GenericFactory.t.sol
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"build:trident": "cd reference/sushi-trident && yarn run build",
"ci": "forge build --force && npm run lint:check && npm run test:unit && npm run gas:check && npm run slither:check",
"clean": "forge clean",
"deploy:avax:test": "forge script script/deploy_router_timelock_asset_manager.s.sol --target-contract DeployRouterTimeLockAaveManager --fork-url \"http://127.0.0.1:8545\" --broadcast -vvvv --verify --ledger --mnemonic-derivation-paths \"m/44'/60'/0'/0/3\" --sender 0x87Da7937Eb92a70285f652D80E2FD1853E41cfE9",
"deploy:avax": "forge script script/deploy_router_timelock_asset_manager.s.sol --target-contract DeployRouterTimeLockAaveManager --fork-url \"https://api.avax.network/ext/bc/C/rpc\" --broadcast -vvvv --verify --ledger --mnemonic-derivation-paths \"m/44'/60'/0'/0/3\" --sender 0x87Da7937Eb92a70285f652D80E2FD1853E41cfE9",
"deploy:avax:test": "forge script script/deploy_router_timelock_asset_manager.s.sol --target-contract DeployRouterTimeLockAaveManager --fork-url \"http://127.0.0.1:8545\" --broadcast -vvvv --verify --ledger --mnemonic-derivation-paths \"m/44'/60'/0'/0/4\" --sender 0x5c5c2a70504AfD08845D5Ee6fD77E98E0bC3dFcd",
"deploy:avax": "forge script script/deploy_router_timelock_asset_manager.s.sol --target-contract DeployRouterTimeLockAaveManager --fork-url \"https://api.avax.network/ext/bc/C/rpc\" --broadcast -vvvv --verify --ledger --mnemonic-derivation-paths \"m/44'/60'/0'/0/4\" --sender 0x5c5c2a70504AfD08845D5Ee6fD77E98E0bC3dFcd",
"eslint": "npm run eslint:check",
"eslint:check": "eslint scripts",
"eslint:fix": "eslint scripts --fix",
Expand Down
12 changes: 8 additions & 4 deletions script/deploy_router_timelock_asset_manager.s.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { ReservoirTimelock } from "amm-core/src/ReservoirTimelock.sol";
import { AaveManager, IPoolAddressesProvider } from "amm-core/src/asset-management/AaveManager.sol";

contract DeployRouterTimeLockAaveManager is Script {
address internal constant FACTORY = 0x47e537e1452DBc9C3eE8F1420e5aaF22111D3547;
address internal constant FACTORY = 0xDd723D9273642D82c5761a4467fD5265d94a22da;
address internal constant WETH_AVAX_MAINNET = 0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7;
IPoolAddressesProvider internal constant AAVE_POOL_ADDRESSES_PROVIDER =
IPoolAddressesProvider(0xa97684ead0e402dC232d5A977953DF7ECBaB3CDb);
Expand All @@ -22,14 +22,18 @@ contract DeployRouterTimeLockAaveManager is Script {
}

function _deployRouter() internal {
new ReservoirRouter(FACTORY, WETH_AVAX_MAINNET);
ReservoirRouter lRouter = new ReservoirRouter(FACTORY, WETH_AVAX_MAINNET);
require(address(lRouter.factory()) == FACTORY);
require(address(lRouter.WETH()) == WETH_AVAX_MAINNET);
}

function _deployTimelock() internal {
new ReservoirTimelock();
ReservoirTimelock lTimelock = new ReservoirTimelock();
require(lTimelock.delay() == 2 days);
}

function _deployAaveManager() internal {
new AaveManager(AAVE_POOL_ADDRESSES_PROVIDER);
AaveManager lManager = new AaveManager(AAVE_POOL_ADDRESSES_PROVIDER);
require(lManager.addressesProvider() == AAVE_POOL_ADDRESSES_PROVIDER);
}
}
2 changes: 1 addition & 1 deletion script/optimized-deployer-meta
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"constant_product_hash": "0x870a9e40cc3b276ba194c85e84aa6eeabc8a8fdea9c88176b0e9f865917b053b",
"factory_hash": "0xbad80d5f5f9face25f46f06569df850bf957431c2cf9533becfa777f9b1304dc",
"factory_hash": "0xfdd26a92c62ba8a24834e10a8e9240f71cadf4fbc3c9eb4ca9b7a53757bdf079",
"oracle_caller_hash": "0xcb93c810b33357ab0beefa347663e9551151684d840b0689ff8e2f066ad0b85c",
"stable_hash": "0xd49a6c02119172299f679d4e447daddf21af4e66d45461cf823008f4a72ca299"
}

0 comments on commit 5407a98

Please sign in to comment.