aave
diff --git a/‎.env.example‎
Lines changed: 16 additions & 36 deletions b/‎.env.example‎
Lines changed: 16 additions & 36 deletions
diff --git a/‎.github/workflows/certora-basic.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/certora-basic.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/certora-stata.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/certora-stata.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.github/workflows/comment.yml‎
Lines changed: 0 additions & 23 deletions b/‎.github/workflows/comment.yml‎
Lines changed: 0 additions & 23 deletions
diff --git a/‎Makefile‎
Lines changed: 30 additions & 8 deletions b/‎Makefile‎
Lines changed: 30 additions & 8 deletions
diff --git a/‎foundry.toml‎
Lines changed: 19 additions & 24 deletions b/‎foundry.toml‎
Lines changed: 19 additions & 24 deletions
diff --git a/‎remappings.txt‎
Lines changed: 2 additions & 0 deletions b/‎remappings.txt‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎scripts/DeployAaveV3MarketBatched.sol‎
Lines changed: 2 additions & 2 deletions b/‎scripts/DeployAaveV3MarketBatched.sol‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎scripts/misc/DeployAaveV3MarketBatchedBase.sol‎
Lines changed: 2 additions & 2 deletions b/‎scripts/misc/DeployAaveV3MarketBatchedBase.sol‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎scripts/misc/DeployHorizonPhaseOnePayload.sol‎
Lines changed: 24 additions & 0 deletions b/‎scripts/misc/DeployHorizonPhaseOnePayload.sol‎
Lines changed: 24 additions & 0 deletions
@@ -1,44 +1,24 @@
-# Broadcast user address
-SENDER=
+# Required for all deployments
+CHAIN=
+ACCOUNT= # Account name from encrypted keystore, see https://getfoundry.sh/cast/reference/cast-wallet-import/
 
-# Deployment via ledger
-MNEMONIC_INDEX=
-LEDGER_SENDER=
-
-# Deployment via private key
-PRIVATE_KEY=
-
-# Test rpc_endpoints
+# Required for all operations
+# Should be replaced with dedicated RPC endpoints
 RPC_MAINNET=https://eth.llamarpc.com
-RPC_AVALANCHE=https://api.avax.network/ext/bc/C/rpc
 RPC_OPTIMISM=https://optimism.llamarpc.com
+RPC_AVALANCHE=https://api.avax.network/ext/bc/C/rpc
 RPC_POLYGON=https://polygon.llamarpc.com
 RPC_ARBITRUM=https://arbitrum.llamarpc.com
 RPC_FANTOM=https://rpc.ftm.tools
-RPC_HARMONY=https://api.harmony.one
-RPC_METIS=https://andromeda.metis.io/?owner=1088
-RPC_BASE=https://base.llamarpc.com
-RPC_ZKEVM=https://zkevm-rpc.com
-RPC_GNOSIS=https://rpc.ankr.com/gnosis
-RPC_BNB=https://binance.llamarpc.com
 RPC_SCROLL=https://rpc.scroll.io
-RPC_AMOY="https://rpc-amoy.polygon.technology"
-
-# Etherscan api keys for verification & download utils
-ETHERSCAN_API_KEY_MAINNET=
-ETHERSCAN_API_KEY_POLYGON=
-ETHERSCAN_API_KEY_AVALANCHE=
-ETHERSCAN_API_KEY_FANTOM=
-ETHERSCAN_API_KEY_OPTIMISM=
-ETHERSCAN_API_KEY_ARBITRUM=
-ETHERSCAN_API_KEY_BASE=
-ETHERSCAN_API_KEY_ZKEVM=
-ETHERSCAN_API_KEY_GNOSIS=
-ETHERSCAN_API_KEY_BNB=
-ETHERSCAN_API_KEY_SCROLL=
-ETHERSCAN_API_KEY_CELO=
+RPC_CELO=https://rpc.ankr.com/celo
+RPC_BNB=https://binance.llamarpc.com
+RPC_GNOSIS=https://rpc.ankr.com/gnosis
+RPC_BASE=https://base.llamarpc.com
+RPC_METIS=https://andromeda.metis.io/?owner=1088
+RPC_LINEA=https://linea.drpc.org
+RPC_SEPOLIA=https://ethereum-sepolia-rpc.publicnode.com
 
-# Simulation/fork creation
-TENDERLY_ACCESS_TOKEN=
-TENDERLY_ACCOUNT=
-TENDERLY_PROJECT=
+# Required for all operations. Uses etherscan v2.
+ETHERSCAN_API_KEY=
+VERIFIER_URL=https://api.etherscan.io/api
@@ -58,7 +58,7 @@ jobs:
             certora/basic/conf/NEW-pool-simple-properties.conf --rule_sanity none --rule cannotBorrowOnReserveDisabledForBorrowing
             certora/basic/conf/NEW-pool-simple-properties.conf --rule_sanity none --rule cannotBorrowOnFrozenReserve
           solc-versions: 0.8.19
-          comment-fail-only: false
+          comment-fail-only: true
           solc-remove-version-prefix: "0."
           job-name: "Certora Prover Run"
           certora-key: ${{ secrets.CERTORAKEY }}
 
@@ -64,7 +64,7 @@ jobs:
             certora/stata/conf/verifyDoubleClaim.conf --rule prevent_duplicate_reward_claiming_single_reward_sufficient
             certora/stata/conf/verifyDoubleClaim.conf --rule prevent_duplicate_reward_claiming_single_reward_insufficient
           solc-versions: 0.8.20
-          comment-fail-only: false
+          comment-fail-only: true
           solc-remove-version-prefix: "0."
           job-name: "Certora Prover Run"
           certora-key: ${{ secrets.CERTORAKEY }}
 
@@ -43,16 +43,38 @@ git-diff :
 
 # Deploy
 deploy-libs-one	:;
-	FOUNDRY_PROFILE=${chain} forge script scripts/misc/LibraryPreCompileOne.sol --rpc-url ${chain} --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --slow --broadcast
+	FOUNDRY_PROFILE=${CHAIN} forge script scripts/misc/LibraryPreCompileOne.sol \
+		--rpc-url ${CHAIN} --account ${ACCOUNT} --slow --broadcast --gas-estimate-multiplier 150 \
+		--verify --chain ${CHAIN}
 deploy-libs-two	:;
-	FOUNDRY_PROFILE=${chain} forge script scripts/misc/LibraryPreCompileTwo.sol --rpc-url ${chain} --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --slow --broadcast
-
+	FOUNDRY_PROFILE=${CHAIN} forge script scripts/misc/LibraryPreCompileTwo.sol \
+		--rpc-url ${CHAIN} --account ${ACCOUNT} --slow --broadcast --gas-estimate-multiplier 150 \
+		--verify --chain ${CHAIN}
+
+# STEP 1: Deploy scaled price adapters. `make deploy-scaled-price-adapter source=<PRICE_FEED_ADDRESS>`
+deploy-scaled-price-adapter :;
+	FOUNDRY_PROFILE=${CHAIN} forge script scripts/misc/DeployScaledPriceAdapter.sol:DeployScaledPriceAdapter \
+		--rpc-url ${CHAIN} --account ${ACCOUNT} --slow --broadcast --gas-estimate-multiplier 150 \
+		--verify --chain ${CHAIN} --verifier-url ${VERIFIER_URL} \
+		--sig "run(address)" ${source}
+
+# STEP 2: Deploy Libraries
 deploy-libs :
-	make deploy-libs-one chain=${chain}
-	npx catapulta-verify -b broadcast/LibraryPreCompileOne.sol/${chainId}/run-latest.json
-	make deploy-libs-two chain=${chain}
-	npx catapulta-verify -b broadcast/LibraryPreCompileTwo.sol/${chainId}/run-latest.json
-
+	make deploy-libs-one
+	make deploy-libs-two
+
+# STEP 3: Deploy Pool Contracts once libraries are deployed and updated on .env
+deploy-v3-batched-broadcast :; 
+	FOUNDRY_PROFILE=${CHAIN} forge script scripts/DeployAaveV3MarketBatched.sol:Default \
+		--rpc-url ${CHAIN} --sender $$(cast wallet address --account ${ACCOUNT}) --account ${ACCOUNT} --slow --broadcast --gas-estimate-multiplier 150 \
+		--verify --chain ${CHAIN} --verifier-url ${VERIFIER_URL} -vvvv
+
+# STEP 4: Deploys payload to list phase one assets. `make deploy-phase-one-payload reportPath=<PATH_TO_REPORT>`
+deploy-phase-one-payload :;
+	FOUNDRY_PROFILE=${CHAIN} forge script scripts/misc/DeployHorizonPhaseOnePayload.sol:DeployHorizonPhaseOnePayload \
+		--rpc-url ${CHAIN} --account ${ACCOUNT} --slow --broadcast --gas-estimate-multiplier 150 \
+		--verify --chain ${CHAIN} --verifier-url ${VERIFIER_URL} \
+		--sig "run(string)" ${reportPath}
 
 # Invariants
 echidna:
 
@@ -7,12 +7,15 @@ optimizer_runs = 200
 solc = '0.8.22'
 evm_version = 'shanghai'
 bytecode_hash = 'none'
-ignored_warnings_from = ["src/periphery/contracts/treasury/RevenueSplitter.sol"]
+ignored_warnings_from = [
+  "src/contracts/treasury/RevenueSplitter.sol",
+  "src/contracts/dependencies/openzeppelin/ReentrancyGuard.sol",
+]
 out = 'out'
 libs = ['lib']
 remappings = []
 fs_permissions = [
-  { access = "write", path = "./reports" },
+  { access = "read-write", path = "./reports" },
   { access = "read", path = "./out" },
   { access = "read", path = "./config" },
 ]
@@ -34,33 +37,25 @@ arbitrum = "${RPC_ARBITRUM}"
 fantom = "${RPC_FANTOM}"
 scroll = "${RPC_SCROLL}"
 celo = "${RPC_CELO}"
-fantom_testnet = "${RPC_FANTOM_TESTNET}"
-harmony = "${RPC_HARMONY}"
-sepolia = "${RPC_SEPOLIA}"
-mumbai = "${RPC_MUMBAI}"
-amoy = "${RPC_AMOY}"
-bnb_testnet = "${RPC_BNB_TESTNET}"
 bnb = "${RPC_BNB}"
 gnosis = "${RPC_GNOSIS}"
 base = "${RPC_BASE}"
 metis = "${RPC_METIS}"
 linea = "${RPC_LINEA}"
+sepolia = "${RPC_SEPOLIA}"
 
 [etherscan]
-mainnet = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 1 }
-optimism = { key = "${ETHERSCAN_API_KEY_OPTIMISM}", chainId = 10 }
-avalanche = { key = "${ETHERSCAN_API_KEY_AVALANCHE}", chainId = 43114 }
-polygon = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 137 }
-arbitrum = { key = "${ETHERSCAN_API_KEY_ARBITRUM}", chainId = 42161 }
-# fantom = { key = "${ETHERSCAN_API_KEY_FANTOM}", chainId = 250 }
-scroll = { key = "${ETHERSCAN_API_KEY_SCROLL}", chainId = 534352, url = 'https://api.scrollscan.com/api\?' }
-# celo = { key = "${ETHERSCAN_API_KEY_CELO}", chainId = 42220 }
-# sepolia = { key = "${ETHERSCAN_API_KEY_MAINNET}", chainId = 11155111 }
-# mumbai = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80001 }
-# amoy = { key = "${ETHERSCAN_API_KEY_POLYGON}", chainId = 80002 }
-# bnb_testnet = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 97, url = 'https://api-testnet.bscscan.com/api' }
-bnb = { key = "${ETHERSCAN_API_KEY_BNB}", chainId = 56, url = 'https://api.bscscan.com/api' }
-base = { key = "${ETHERSCAN_API_KEY_BASE}", chain = 8453 }
-gnosis = { key = "${ETHERSCAN_API_KEY_GNOSIS}", chainId = 100 }
+mainnet = { key = "${ETHERSCAN_API_KEY}", chainId = 1 }
+optimism = { key = "${ETHERSCAN_API_KEY}", chainId = 10 }
+avalanche = { key = "${ETHERSCAN_API_KEY}", chainId = 43114 }
+polygon = { key = "${ETHERSCAN_API_KEY}", chainId = 137 }
+arbitrum = { key = "${ETHERSCAN_API_KEY}", chainId = 42161 }
+fantom = { key = "${ETHERSCAN_API_KEY}", chainId = 250 }
+scroll = { key = "${ETHERSCAN_API_KEY}", chainId = 534352 }
+celo = { key = "${ETHERSCAN_API_KEY}", chainId = 42220 }
+bnb = { key = "${ETHERSCAN_API_KEY}", chainId = 56 }
+gnosis = { key = "${ETHERSCAN_API_KEY}", chainId = 100 }
+base = { key = "${ETHERSCAN_API_KEY}", chain = 8453 }
 metis = { key = "", chainId = 1088, url = 'https://api.routescan.io/v2/network/mainnet/evm/1088/etherscan/api' }
-# See more config options https://github.com/gakonst/foundry/tree/master/config
+linea = { key = "${ETHERSCAN_API_KEY}", chainId = 59144 }
+sepolia = { key = "${ETHERSCAN_API_KEY}", chainId = 11155111 }
@@ -3,3 +3,5 @@ forge-std/=lib/forge-std/src/
 ds-test/=lib/forge-std/lib/ds-test/src/
 openzeppelin-contracts-upgradeable/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/
 openzeppelin-contracts/=lib/solidity-utils/lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/
+aave-address-book/=lib/aave-address-book/src/
+aave-v3-origin/=lib/aave-address-book/lib/aave-v3-origin/src/
@@ -3,6 +3,6 @@ pragma solidity ^0.8.0;
 
 import {DeployAaveV3MarketBatchedBase} from './misc/DeployAaveV3MarketBatchedBase.sol';
 
-import {DefaultMarketInput} from '../src/deployments/inputs/DefaultMarketInput.sol';
+import {HorizonInput} from '../src/deployments/inputs/HorizonInput.sol';
 
-contract Default is DeployAaveV3MarketBatchedBase, DefaultMarketInput {}
+contract Default is DeployAaveV3MarketBatchedBase, HorizonInput {}
@@ -14,7 +14,7 @@ import {MarketInput} from '../../src/deployments/inputs/MarketInput.sol';
 abstract contract DeployAaveV3MarketBatchedBase is DeployUtils, MarketInput, Script {
   using stdJson for string;
 
-  function run() external {
+  function run() public returns (string memory reportFilePath) {
     Roles memory roles;
     MarketConfig memory config;
     DeployFlags memory flags;
@@ -35,7 +35,7 @@ abstract contract DeployAaveV3MarketBatchedBase is DeployUtils, MarketInput, Scr
     IMetadataReporter metadataReporter = IMetadataReporter(
       _deployFromArtifacts('MetadataReporter.sol:MetadataReporter')
     );
-    metadataReporter.writeJsonReportMarket(report);
+    return metadataReporter.writeJsonReportMarket(report);
   }
 
   function _loadWarnings(MarketConfig memory config, DeployFlags memory flags) internal pure {
 
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: BUSL-1.1
+pragma solidity ^0.8.0;
+
+import {MarketReport} from '../../src/deployments/interfaces/IMarketReportTypes.sol';
+import {HorizonPhaseOneListing} from '../../src/deployments/inputs/HorizonPhaseOneListing.sol';
+import {IMetadataReporter} from '../../src/deployments/interfaces/IMetadataReporter.sol';
+import {DeployUtils} from '../../src/deployments/contracts/utilities/DeployUtils.sol';
+import {HorizonInput} from '../../src/deployments/inputs/HorizonInput.sol';
+import {Script} from 'forge-std/Script.sol';
+
+contract DeployHorizonPhaseOnePayload is Script, DeployUtils, HorizonInput {
+  function run(string memory reportPath) public returns (address) {
+    IMetadataReporter metadataReporter = IMetadataReporter(
+      _deployFromArtifacts('MetadataReporter.sol:MetadataReporter')
+    );
+    MarketReport memory report = metadataReporter.parseMarketReport(reportPath);
+
+    vm.startBroadcast();
+    HorizonPhaseOneListing horizonInitialListing = new HorizonPhaseOneListing(report);
+    vm.stopBroadcast();
+
+    return address(horizonInitialListing);
+  }
+}