fix: fix libraries

Author: sakulstra

.env.example

@@ -1,7 +1,8 @@
-ETHERSCAN_API_KEY=
-RPC_URL=
 PRIVATE_KEY=
 
+MNEMONIC_INDEX=
+LEDGER_SENDER=
+
 # Test rpc_endpoints
 RPC_MAINNET=https://rpc.flashbots.net
 RPC_AVALANCHE=https://api.avax.network/ext/bc/C/rpc

Makefile

@@ -17,12 +17,12 @@ git-diff :
 	@printf '%s\n%s\n%s\n' "\`\`\`diff" "$$(git diff --no-index --diff-algorithm=patience --ignore-space-at-eol ${before} ${after})" "\`\`\`" > diffs/${out}.md
 
 # Deploy Payloads
-deploy-polygon-ledger :;  forge script script/DeployPayloads.s.sol:DeployPolygon --rpc-url polygon --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
-deploy-optimism-ledger :;  forge script script/DeployPayloads.s.sol:DeployOptimism --rpc-url optimism --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
-deploy-arbitrum-ledger :;  forge script script/DeployPayloads.s.sol:DeployArbitrum --rpc-url arbitrum --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
-deploy-avalanche-ledger :;  forge script script/DeployPayloads.s.sol:DeployAvalanche --rpc-url avalanche --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
-deploy-fantom-ledger :;  forge script script/DeployPayloads.s.sol:DeployFantom --rpc-url fantom --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
-deploy-harmony-ledger :;  forge script script/DeployPayloads.s.sol:DeployHarmony --rpc-url harmony --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} -vvvv --slow
+deploy-polygon-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployPolygon --rpc-url polygon --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
+deploy-optimism-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployOptimism --rpc-url optimism --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
+deploy-arbitrum-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployArbitrum --rpc-url arbitrum --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
+deploy-avalanche-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployAvalanche --rpc-url avalanche --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
+deploy-fantom-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployFantom --rpc-url fantom --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} --verify -vvvv --slow
+deploy-harmony-ledger :;  forge script scripts/DeployPayloads.s.sol:DeployHarmony --rpc-url harmony --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} -vvvv --slow
 
 # Create Proposal
 create-proposal-ledger :; forge script scripts/CreateProposal.s.sol:CreateUpgradeProposal --rpc-url mainnet --broadcast --legacy --ledger --mnemonic-indexes ${MNEMONIC_INDEX} --sender ${LEDGER_SENDER} -vvvv

scripts/DeployPayloads.s.sol

@@ -140,7 +140,7 @@ library DeployPayloads {
     IPoolConfigurator poolConfigurator,
     address collector,
     address incentivesController
-  ) public returns (V301UpgradePayload) {
+  ) internal returns (V301UpgradePayload) {
     address poolImpl = _deployPoolImpl(poolAddressesProvider);
     return
       _deployProposal({
@@ -159,7 +159,7 @@ library DeployPayloads {
     IPoolConfigurator poolConfigurator,
     address collector,
     address incentivesController
-  ) public returns (V301UpgradePayload) {
+  ) internal returns (V301UpgradePayload) {
     address poolImpl = _deployL2PoolImpl(poolAddressesProvider);
     return
       _deployProposal({
@@ -172,7 +172,7 @@ library DeployPayloads {
       });
   }
 
-  function deployPolygon() public returns (V301UpgradePayload) {
+  function deployPolygon() internal returns (V301UpgradePayload) {
     return
       _deploy({
         poolAddressesProvider: AaveV3Polygon.POOL_ADDRESSES_PROVIDER,
@@ -183,7 +183,7 @@ library DeployPayloads {
       });
   }
 
-  function deployAvalanche() public returns (V301UpgradePayload) {
+  function deployAvalanche() internal returns (V301UpgradePayload) {
     return
       _deploy({
         poolAddressesProvider: AaveV3Avalanche.POOL_ADDRESSES_PROVIDER,
@@ -194,7 +194,7 @@ library DeployPayloads {
       });
   }
 
-  function deployFantom() public returns (V301UpgradePayload) {
+  function deployFantom() internal returns (V301UpgradePayload) {
     return
       _deploy({
         poolAddressesProvider: AaveV3Fantom.POOL_ADDRESSES_PROVIDER,
@@ -205,7 +205,7 @@ library DeployPayloads {
       });
   }
 
-  function deployHarmony() public returns (V301UpgradePayload) {
+  function deployHarmony() internal returns (V301UpgradePayload) {
     return
       _deploy({
         poolAddressesProvider: AaveV3Harmony.POOL_ADDRESSES_PROVIDER,
@@ -216,7 +216,7 @@ library DeployPayloads {
       });
   }
 
-  function deployOptimism() public returns (V301UpgradePayload) {
+  function deployOptimism() internal returns (V301UpgradePayload) {
     return
       _deployL2({
         poolAddressesProvider: AaveV3Optimism.POOL_ADDRESSES_PROVIDER,
@@ -227,7 +227,7 @@ library DeployPayloads {
       });
   }
 
-  function deployArbitrum() public returns (V301UpgradePayload) {
+  function deployArbitrum() internal returns (V301UpgradePayload) {
     return
       _deployL2({
         poolAddressesProvider: AaveV3Arbitrum.POOL_ADDRESSES_PROVIDER,