From 13a3d696767058605ef090033ef56cbe57ce3e02 Mon Sep 17 00:00:00 2001 From: artdgn Date: Wed, 30 Apr 2025 10:41:00 +1000 Subject: [PATCH 1/2] remove env key loading --- .env.example | 2 -- script/deploy/deploy-protocol.s.sol | 3 --- script/deploy/deploy-testnet-assets.s.sol | 3 --- script/wallet-loader.s.sol | 11 ----------- 4 files changed, 19 deletions(-) delete mode 100644 script/wallet-loader.s.sol diff --git a/.env.example b/.env.example index 8d1e4b1f..9f46bebf 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,4 @@ LIQUIDITY_PROVIDER_KEY=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 -PRIVKEY_DEV_DEPLOYER=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 -PRIVKEY_MAIN_DEPLOYER=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 PRIVKEY_DEV_TEST1=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97 PRIVKEY_DEV_TEST2=0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356 PRIVKEY_DEV_TEST3=0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e diff --git a/script/deploy/deploy-protocol.s.sol b/script/deploy/deploy-protocol.s.sol index df255f2b..8998fb33 100644 --- a/script/deploy/deploy-protocol.s.sol +++ b/script/deploy/deploy-protocol.s.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.22; import "forge-std/Script.sol"; import "forge-std/console.sol"; import { DeploymentArtifactsLib } from "../libraries/DeploymentArtifacts.sol"; -import { WalletLoader } from "../wallet-loader.s.sol"; import { BaseDeployer } from "../libraries/BaseDeployer.sol"; import { Const } from "../utils/Const.sol"; @@ -27,8 +26,6 @@ abstract contract DeployProtocolScript is Script { function run(string memory artifactsName) public returns (BaseDeployer.DeploymentResult memory result) { setParams(); - WalletLoader.loadWalletsFromEnv(vm); - // note: when in tests, this also has the effect of "pranking" msg.sender vm.startBroadcast(msg.sender); diff --git a/script/deploy/deploy-testnet-assets.s.sol b/script/deploy/deploy-testnet-assets.s.sol index 6ce6eb92..ae08364d 100644 --- a/script/deploy/deploy-testnet-assets.s.sol +++ b/script/deploy/deploy-testnet-assets.s.sol @@ -12,7 +12,6 @@ import "@uniswap/v3-periphery/contracts/interfaces/INonfungiblePositionManager.s import { IV3SwapRouter } from "@uniswap/swap-router-contracts/contracts/interfaces/IV3SwapRouter.sol"; import { CollarOwnedERC20 } from "../../test/utils/CollarOwnedERC20.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import { WalletLoader } from "../wallet-loader.s.sol"; import { Const } from "../utils/Const.sol"; @@ -45,8 +44,6 @@ abstract contract AssetDeployer is Script { mapping(string => mapping(string => address)) public deployedPools; function run() external { - WalletLoader.loadWalletsFromEnv(vm); - vm.startBroadcast(msg.sender); setUp(); diff --git a/script/wallet-loader.s.sol b/script/wallet-loader.s.sol deleted file mode 100644 index e8a89520..00000000 --- a/script/wallet-loader.s.sol +++ /dev/null @@ -1,11 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.22; - -import "forge-std/Script.sol"; - -library WalletLoader { - function loadWalletsFromEnv(VmSafe vm) internal { - vm.rememberKey(vm.envUint("PRIVKEY_DEV_DEPLOYER")); - vm.rememberKey(vm.envUint("PRIVKEY_MAIN_DEPLOYER")); - } -} From cc9fc740adff1b9c37d0fcf5371fafa82ba5d717 Mon Sep 17 00:00:00 2001 From: artdgn Date: Wed, 30 Apr 2025 11:03:44 +1000 Subject: [PATCH 2/2] minor --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 9f46bebf..00ca93d4 100644 --- a/.env.example +++ b/.env.example @@ -1,7 +1,7 @@ LIQUIDITY_PROVIDER_KEY=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 PRIVKEY_DEV_TEST1=0xdbda1821b80551c9d65939329250298aa3472ba22feea921c0cf5d620ea67b97 PRIVKEY_DEV_TEST2=0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356 -PRIVKEY_DEV_TEST3=0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e +PRIVKEY_DEV_TEST3=0x92db14e403b83dfe3df233f83dfa3a0d7096f21ca9b0d6d6b8d88b2b4ec1564e PRIVKEY_DEV_TEST4=0x8b3a350cf5c34c9194ca85829a2df0ec3153be0318b5e2d3348e872092edffba PRIVKEY_DEV_TEST5=0x47e179ec197488593b187f80a00eb0da91f1b9d0b13f8733639f19c30a34926a ARBITRUM_MAINNET_RPC=""