diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca7fc0ee67..ea26bf7dda 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - run: yarn devchain & env: MAINNET_RPC_URL: https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161 - FORK_BLOCK: 18114118 + FORK_BLOCK: 18329921 FORK_NETWORK: mainnet - run: yarn deploy:run --network localhost env: @@ -65,7 +65,7 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet - + plugin-tests-base: name: 'Plugin Tests (Base)' runs-on: ubuntu-latest diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index cb33be3859..8ae5721830 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,7 +3747,10 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4040,7 +4043,11 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": ["SOUND", "IFFY", "DISABLED"], + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6025,6 +6032,626 @@ } } } + }, + "3b1dde5cc620e2ea43113b74fad027134074d4a72f87ddc30eb639812531857a": { + "address": "0xBbC532A80DD141449330c1232C953Da6801Aed01", + "txHash": "0xfd804f0edbb9ac92c5829b542e8dc8a97490d1fcaed4987343d9901225a6b732", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)19008", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)17878", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:160" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)17420", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)17729", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)18192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)19228", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)11113", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)19569", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)19357", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)19357", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)18564", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)17751,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "312", + "type": "t_array(t_uint256)39_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:310" + } + ], + "types": { + "t_array(t_uint256)39_storage": { + "label": "uint256[39]", + "numberOfBytes": "1248" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)17420": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)17729": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)17878": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)18192": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)18564": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)19008": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)19228": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)19357": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)19569": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)19704": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)17751": { + "label": "enum TradeKind", + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)17751,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "7c15ec8db2e19d549d8d3c16622ef1159b0b2d57e4c276018be8aed2cfbabcc3": { + "address": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "txHash": "0x74f0c8120f6b59c5c5c493325aa6f6c5633db83bab754a79495dba762c0d0db1", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)19008", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)17878", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:160" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)17420", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)18192", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)17482", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)18564", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)19228", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:193" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)17420": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)17482": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)17878": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)18192": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)18564": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)19008": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)19228": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)19704": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index 54c5f75da0..7518551125 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.0.0"; +string constant VERSION = "3.0.1"; /** * @title Versioned diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index f3fc5e30a3..ac8371e7f2 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.0.0"; +string constant ASSET_VERSION = "3.0.1"; /** * @title VersionedAsset diff --git a/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..d03e354462 --- /dev/null +++ b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json @@ -0,0 +1,100 @@ +{ + "assets": { + "stkAAVE": "0x6647c880Eb8F57948AF50aB45fca8FE86C154D24", + "COMP": "0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1", + "CRV": "0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA", + "CVX": "0x4024c00bBD0C420E719527D88781bc1543e63dd5" + }, + "collateral": { + "DAI": "0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833", + "USDC": "0xBE9D23040fe22E8Bd8A88BF5101061557355cA04", + "USDT": "0x58D7bF13D3572b08dE5d96373b8097d94B1325ad", + "USDP": "0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89", + "TUSD": "0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2", + "BUSD": "0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423", + "aDAI": "0x256b89658bD831CC40283F42e85B1fa8973Db0c9", + "aUSDC": "0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51", + "aUSDT": "0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef", + "aBUSD": "0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05", + "aUSDP": "0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd", + "cDAI": "0x33A8d92B2BE84755441C2b6e39715c4b8938242c", + "cUSDC": "0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D", + "cUSDT": "0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59", + "cUSDP": "0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8", + "cWBTC": "0xa570BF93FC51406809dBf52aB898913541C91C20", + "cETH": "0xeC12e8412a7AE4598d754f4016D487c269719856", + "WBTC": "0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4", + "WETH": "0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3", + "EURT": "0xEBD07CE38e2f46031c982136012472A4D24AE070", + "wstETH": "0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C", + "rETH": "0x1103851D1FCDD3f88096fbed812c8FF01949cF9d", + "fUSDC": "0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA", + "fUSDT": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A", + "fDAI": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875", + "fFRAX": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92", + "cUSDCv3": "0x85b256e9051B781A0BC0A987857AD6166C94040a", + "cvx3Pool": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1", + "cvxeUSDFRAXBP": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122", + "cvxMIM3Pool": "0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7", + "crv3Pool": "0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D", + "crveUSDFRAXBP": "0xC87CDFFD680D57BF50De4C364BF4277B8A90098E", + "crvMIM3Pool": "0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa", + "sDAI": "0xde0e2f0c9792617d3908d92a024caa846354cea2", + "cbETH": "0x3962695aCce0Efce11cFf997890f3D1D7467ec40", + "maUSDT": "0xd000a79bd2a07eb6d2e02ecad73437de40e52d69", + "maUSDC": "0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7", + "maDAI": "0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB", + "maWBTC": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250", + "maWETH": "0x878b995bDD2D9900BEE896Bd78ADd877672e1637", + "maStETH": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822", + "aEthUSDC": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba" + }, + "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985", + "aUSDC": "0x60C384e226b120d93f3e0F4C502957b2B9C32B15", + "aUSDT": "0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9", + "aBUSD": "0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D", + "aUSDP": "0x80A574cC2B369dc496af6655f57a16a4f180BfAF", + "cDAI": "0xD048934408bb0e39F23c7ff5C1ac5F773D16D2df", + "cUSDC": "0x1c21E28F6cd7C4Be734cb60f9c6451484803924d", + "cUSDT": "0xD971Fd59e90E836eCF2b8adE76374102025084A1", + "cUSDP": "0xbe7B053E820c5FBe70a0f075DA0C931aD8816e4F", + "cWBTC": "0xb120c3429900DDF665b34882d7685e39BB01897B", + "cETH": "0xd0cb758e918ac6973a2959343ECa4F333d8d25B1", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "EURT": "0xC581b735A1688071A1746c968e0798D642EDE491", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", + "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", + "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", + "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", + "cUSDCv3": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab", + "cvx3Pool": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3", + "cvxeUSDFRAXBP": "0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5", + "cvxMIM3Pool": "0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F", + "crv3Pool": "0xC9c37FC53682207844B058026024853A9C0b8c7B", + "crveUSDFRAXBP": "0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A", + "crvMIM3Pool": "0xe8461dB45A7430AA7aB40346E68821284980FdFD", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", + "maUSDT": "0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2", + "maUSDC": "0x7f7b77e49d5b30445f222764a794afe14af062eb", + "maDAI": "0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb", + "maWBTC": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC", + "maWETH": "0x291ed25eB61fcc074156eE79c5Da87e5DA94198F", + "maStETH": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B", + "aEthUSDC": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE" + } +} \ No newline at end of file diff --git a/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json b/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json new file mode 100644 index 0000000000..33f9664624 --- /dev/null +++ b/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json @@ -0,0 +1,35 @@ +{ + "prerequisites": { + "RSR": "0x320623b8e4ff03373931769a31fc52a4e78b5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "0xB81a1fa9A497953CEC7f370CACFA5cc364871A73", + "cvxMiningLib": "0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472", + "facadeRead": "0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C", + "facadeAct": "0x801fF27bacc7C00fBef17FC901504c79D59E845C", + "facadeWriteLib": "0x908Cd3B4B4B6c60d5EB7d1Ca7ECda0e7ceCd6dB1", + "basketLib": "0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8", + "facadeWrite": "0x3312507BC3F22430B34D5841A472c767DC5C36e4", + "deployer": "0x43587CAA7dE69C3c2aD0fb73D4C9da67A8E35b0b", + "rsrAsset": "0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6", + "implementations": { + "main": "0xF5366f67FF66A3CefcB18809a762D5b5931FebF8", + "trading": { + "gnosisTrade": "0x4e9B97957a0d1F4c25E42Ccc69E4d2665433FEA3", + "dutchTrade": "0x2387C22727ACb91519b80A15AEf393ad40dFdb2F" + }, + "components": { + "assetRegistry": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "backingManager": "0xBbC532A80DD141449330c1232C953Da6801Aed01", + "basketHandler": "0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc", + "broker": "0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04", + "distributor": "0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac", + "furnace": "0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c", + "rsrTrader": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "rTokenTrader": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "rToken": "0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F", + "stRSR": "0xC98eaFc9F249D90e3E35E729e3679DD75A899c10" + } + } +} \ No newline at end of file diff --git a/test/fixtures.ts b/test/fixtures.ts index 15944a43b8..ff881e60d0 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -78,7 +78,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.0.0' +export const VERSION = '3.0.1' export type Collateral = | FiatCollateral