open-dollar · pi0neerpat · Jul 24, 2024 · Jul 23, 2024 · Jul 23, 2024 · Jul 23, 2024
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -6,6 +6,11 @@ concurrency:
   group: ${{github.workflow}}-${{github.ref}}
   cancel-in-progress: true
 
+env:
+  FOUNDRY_PROFILE: ci
+  ARB_SEPOLIA_RPC: ${{ secrets.ARB_SEPOLIA_RPC }}
+  ARB_MAINNET_RPC: ${{ secrets.ARB_MAINNET_RPC }}
+
 jobs:
   build:
     runs-on: ubuntu-latest

diff --git a/.vscode/settings.json b/.vscode/settings.json
diff --git a/lib/forge-std b/lib/forge-std
diff --git a/lib/openzeppelin-contracts b/lib/openzeppelin-contracts
diff --git a/script/Common.s.sol b/script/Common.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.20;
 
 import '@script/Registry.s.sol';
 import {Script} from 'forge-std/Script.sol';

diff --git a/script/DeployOracle.s.sol b/script/DeployOracle.s.sol
diff --git a/script/Registry.s.sol b/script/Registry.s.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-3.0
-pragma solidity 0.8.26;
+pragma solidity 0.8.20;
 
 uint256 constant WAD = 1e18;
 
@@ -46,30 +46,57 @@ address constant SEPOLIA_CHAINLINK_ARB_USD_FEED = 0xD1092a65338d049DB68D7Be6bD89
 
 // -- Mainnet --
 
+////////// CONSTANTS //////////
+address constant MAINNET_DEPLOYER = 0xF78dA2A37049627636546E0cFAaB2aD664950917;
+uint256 constant MAINNET_ORACLE_DELAY = 1 hours;
+uint256 constant MAINNET_CHAINLINK_L2VALIDITY_GRACE_PERIOD = 1 hours;
+address constant MAINNET_PROTOCOL_TOKEN = 0x000D636bD52BFc1B3a699165Ef5aa340BEA8939c;
+address constant MAINNET_WETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
+address constant ETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
+address constant ARB = 0x912CE59144191C1204E64559FE8253a0e49E6548;
+address constant ETH_ARB_POOL = 0xe51635ae8136aBAc44906A8f230C2D235E9c195F;
+address constant USDC = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
+address constant WSTETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
+address constant RETH = 0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8;
+
 ////////// FACTORIES //////////
 address constant MAINNET_CAMELOT_RELAYER_FACTORY = 0x36645830479170265A154Acb726780fdaE41A28F;
 address constant MAINNET_CHAINLINK_RELAYER_FACTORY = 0x06C32500489C28Bd57c551afd8311Fef20bFaBB5;
 address constant MAINNET_DENOMINATED_ORACLE_FACTORY = 0xBF760b23d2ef3615cec549F22b95a34DB0F8f5CD;
 address constant MAINNET_DELAYED_ORACLE_FACTORY = 0x9Dd63fA54dEfd8820BCAb3e3cC39aeEc1aE88098;
+address constant MAINNET_PENDLE_RELAYER_FACTORY = 0x0D8CBBbd6e4984caA310d80e66cc434D71e9D118;
 
-////////// RELAYERS //////////
+////////// STANDARD RELAYERS //////////
 // Camelot
 address constant MAINNET_CAMELOT_ODG_WETH_RELAYER = 0xF7Ec9ad3192d4ec1E54d52B3E492B5B66AB02889;
 // Chainlink
 address constant MAINNET_CHAINLINK_ETH_USD_RELAYER = 0x3e6C1621f674da311E57646007fBfAd857084383;
 address constant MAINNET_CHAINLINK_L2VALIDITY_ETH_USD_RELAYER = 0x4617Feb8B72167c3b8253a1327CddE44e54670Ce;
 address constant MAINNET_CHAINLINK_RETH_ETH_RELAYER = 0x2b98972Ee61e8928F9dFa6504301296f0e7645Ca;
 address constant MAINNET_CHAINLINK_WSTETH_ETH_RELAYER = 0x48D3B7605B8dc3Ae231Bd59e40513C9e9Ac6D33a;
+address constant MAINNET_CHAINLINK_L2VALIDITY_RETH_ETH_RELAYER = 0x77A15A5b9b7e1DE3EDf797662ADf1e74AF88f8Bd;
+address constant MAINNET_CHAINLINK_L2VALIDITY_WSTETH_ETH_RELAYER = 0x4dF7048DC8696832A146ac4Ba8f7a791f258916c;
 address constant MAINNET_CHAINLINK_ARB_USD_RELAYER = 0x2635f731BB6981E72F92A781578952450759F762;
+// Pendle
+address constant MAINNET_PENDLE_PT_RETH_26JUN2025_SY_RELAYER = 0xD309859d2110209B230bC62130b7F16989c4ea06;
+address constant MAINNET_PENDLE_PT_WSTETH_26JUN2025_SY_RELAYER = 0x478D45C5d571c24A5D84EfD3b09F0923d6d4439B;
 // Denominated
 address constant MAINNET_DENOMINATED_ODG_USD_ORACLE = 0xE90E52eb676bc00DD85FAE83D2FAC22062F7f470;
 address constant MAINNET_DENOMINATED_RETH_USD_ORACLE = 0xE0ac4511A617cBee55ECb62667B08DB6864B9d8e;
 address constant MAINNET_DENOMINATED_WSTETH_USD_ORACLE = 0x8746664d1E0F0e61275EF3B52A8a3b3dFC11CcAb;
+address constant MAINNET_DENOMINATED_L2VALIDITY_RETH_USD_ORACLE = 0x35843B3B7838eA15D0cAf2E61AD52C72b95b3Ca7;
+address constant MAINNET_DENOMINATED_L2VALIDITY_WSTETH_USD_ORACLE = 0x9C9D6E07b58d1808d29d9dB118dd32b97DBba26A;
+address constant MAINNET_DENOMINATED_PT_RETH_26JUN2025_USD_ORACLE = 0x54aF03987c9efc16e20b53987875E467eA19DcC6;
+address constant MAINNET_DENOMINATED_PT_WSTETH_26JUN2025_USD_ORACLE = 0xF6A5c955532Bad656a0561d1F5C72708b0201E12;
 // Delayed
 address constant MAINNET_DELAYED_RETH_USD_ORACLE = 0x0859c0B3EF150fAb129E43B74a63da13F5d2Dd35;
 address constant MAINNET_DELAYED_WSTETH_USD_ORACLE = 0xa8dEa011Ed90C53BA4601868Ccc9a36A6F442499;
+address constant MAINNET_DELAYED_L2VALIDITY_RETH_USD_ORACLE = 0xCe962D4Ac9d70776e17C031192Fac64540F1a5D9;
+address constant MAINNET_DELAYED_L2VALIDITY_WSTETH_USD_ORACLE = 0xb0ecE3904d69CCC4B7A7EcFEedf96298448B2CB9;
 address constant MAINNET_DELAYED_ARB_USD_ORACLE = 0xa4e0410E7eb9a02aa9C0505F629d01890c816A77;
 address constant MAINNET_DELAYED_ETH_USD_ORACLE = 0x562CCE2F4dc383862dC6A926AF10DeFf5fCd172F;
+address constant MAINNET_DELAYED_PT_RETH_26JUN2025_USD_ORACLE = 0xC398dD38831a8f0f6C436137d07E0580d974269e;
+address constant MAINNET_DELAYED_PT_WSTETH_26JUN2025_USD_ORACLE = 0x0a77069A8d1E7fd7B49222BF2B1d1d4687C1177B;
 
 ////////// CHAINLINK //////////
 // Price feeds to USD
@@ -82,38 +109,20 @@ address constant MAINNET_CHAINLINK_WSTETH_ETH_FEED = 0xb523AE262D20A936BC152e602
 address constant MAINNET_CHAINLINK_CBETH_ETH_FEED = 0xa668682974E3f121185a3cD94f00322beC674275;
 address constant MAINNET_CHAINLINK_LINK_USD_FEED = 0x86E53CF1B870786351Da77A57575e79CB55812CB;
 address constant MAINNET_CHAINLINK_GRT_USD_FEED = 0x0F38D86FceF4955B705F35c9e41d1A16e0637c73;
-
+address constant MAINNET_CHAINLINK_EZETH_ETH_FEED = 0x11E1836bFF2ce9d6A5bec9cA79dc998210f3886d;
 // Sequencer for Arbitrum One
 address constant MAINNET_CHAINLINK_SEQUENCER_FEED = 0xFdB631F5EE196F0ed6FAa767959853A9F217697D;
 
-////////// PARAMS //////////
-address constant MAINNET_DEPLOYER = 0xF78dA2A37049627636546E0cFAaB2aD664950917;
-uint256 constant MAINNET_ORACLE_DELAY = 1 hours;
-uint256 constant MAINNET_CHAINLINK_L2VALIDITY_GRACE_PERIOD = 1 hours;
-address constant MAINNET_PROTOCOL_TOKEN = 0x000D636bD52BFc1B3a699165Ef5aa340BEA8939c;
-address constant MAINNET_WETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
-address constant ETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
-address constant ARB = 0x912CE59144191C1204E64559FE8253a0e49E6548;
-address constant ETH_ARB_POOL = 0xe51635ae8136aBAc44906A8f230C2D235E9c195F;
-address constant USDC = 0xaf88d065e77c8cC2239327C5EDb3A432268e5831;
-address constant WSTETH = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
-address constant RETH = 0xEC70Dcb4A1EFa46b8F2D97C310C9c4790ba5ffA8;
-
-//////RENZO
-address constant MAINNET_CHAINLINK_EZETH_ETH_FEED = 0x11E1836bFF2ce9d6A5bec9cA79dc998210f3886d;
-
-//Pendle
+////////// PENDLE //////////
 uint32 constant MAINNET_PENDLE_TWAP_DURATION = 900;
 address constant MAINNET_PENDLE_ORACLE = 0x9a9Fa8338dd5E5B2188006f1Cd2Ef26d921650C2;
 address constant MAINNET_PENDLE_RETH_MARKET = 0x14FbC760eFaF36781cB0eb3Cb255aD976117B9Bd;
 address constant MAINNET_PENDLE_WSTETH_MARKET = 0x08a152834de126d2ef83D612ff36e4523FD0017F;
-address constant MAINNET_PENDLE_RELAYER_FACTORY = 0x0000000000000000000000000000000000000000;
 
-//GMX
+////////// GMX //////////
 address constant MAINNET_GMX_DATA_STORE = 0xFD70de6b91282D8017aA4E741e9Ae325CAb992d8;
 address constant MAINNET_GMX_READER = 0x5Ca84c34a381434786738735265b9f3FD814b824;
-
-// GM WETH PERP MARKET
+// GM-ETH Perp Market
 address constant MAINNET_GMX_WETH_PERP_MARKET_TOKEN = 0x70d95587d40A2caf56bd97485aB3Eec10Bee6336;
 address constant MAINNET_GMX_WETH_PERP_INDEX_TOKEN = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1; //WETH
 address constant MAINNET_GMX_WETH_PERP_LONG_TOKEN = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1; //WETH

diff --git a/script/dexrelayer/DeployDataLog.s.sol b/script/dexrelayer/DeployDataLog.s.sol
diff --git a/script/dexrelayer/DeployOracleFactories.s.sol b/script/dexrelayer/DeployOracleFactories.s.sol
diff --git a/script/dexrelayer/DeployOracles.s.sol b/script/dexrelayer/DeployOracles.s.sol
+5 −0		.changeset/fluffy-buses-jump.md
+5 −0		.changeset/great-pianos-work.md
+5 −0		.changeset/serious-carrots-provide.md
+1 −0		.githooks/pre-push
+3 −0		contracts/interfaces/README.adoc
+16 −0		contracts/interfaces/draft-IERC7674.sol
+20 −0		contracts/mocks/BatchCaller.sol
+1 −0		contracts/mocks/Stateless.sol
+38 −0		contracts/mocks/token/ERC20GetterHelper.sol
+3 −0		contracts/token/ERC20/README.adoc
+119 −0		contracts/token/ERC20/extensions/draft-ERC20TemporaryApproval.sol
+34 −38		contracts/utils/Arrays.sol
+13 −0		contracts/utils/Comparators.sol
+125 −0		contracts/utils/Packing.sol
+6 −0		contracts/utils/README.adoc
+1 −1		contracts/utils/math/Math.sol
+578 −0		contracts/utils/structs/Heap.sol
+28 −1		docs/modules/ROOT/pages/utilities.adoc
+3 −1		scripts/generate/run.js
+18 −25		scripts/generate/templates/Arrays.js
+328 −0		scripts/generate/templates/Heap.js
+13 −0		scripts/generate/templates/Heap.opts.js
+89 −0		scripts/generate/templates/Heap.t.js
+3 −0		scripts/generate/templates/Packing.js
+10 −1		test/token/ERC20/ERC20.behavior.js
+142 −0		test/token/ERC20/extensions/draft-ERC20TemporaryApproval.test.js
+153 −0		test/utils/structs/Heap.t.sol
+131 −0		test/utils/structs/Heap.test.js