Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ammon/new execute batch signature #5

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update deploy scripts
  • Loading branch information
SonOfMosiah committed Feb 4, 2024
commit 1750ddf83292c8208a4b4319f89b92597f697d38
4 changes: 4 additions & 0 deletions script/deploy/gelato/DeployTaskCreatorProxy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ contract DeployTaskCreatorProxy is BaseScript {
} else if (chainId == 137) {
usdc = vm.envAddress("USDC_POLYGON");
deployer = vm.envAddress("DEPLOYER");
} else if (chainId == 8453) {
usdc = vm.envAddress("USDC_BASE");
deployer = vm.envAddress("DEPLOYER");
} else {
revert("DeployTaskCreatorProxy: unsupported chain");
}
Expand All @@ -46,3 +49,4 @@ contract DeployTaskCreatorProxy is BaseScript {

// forge script script/deploy/gelato/DeployTaskCreatorProxy.s.sol:DeployTaskCreatorProxy --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv --account supa_test_deployer
// forge script script/deploy/gelato/DeployTaskCreatorProxy.s.sol:DeployTaskCreatorProxy --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer
// forge script script/deploy/gelato/DeployTaskCreatorProxy.s.sol:DeployTaskCreatorProxy --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
4 changes: 3 additions & 1 deletion script/deploy/governance/GovernanceProxy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ contract DeployGovernanceProxy is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -29,3 +29,5 @@ contract DeployGovernanceProxy is Script {
// forge script script/deploy/governance/GovernanceProxy.s.sol:DeployGovernanceProxy --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv --account supa_test_deployer

// forge script script/deploy/governance/GovernanceProxy.s.sol:DeployGovernanceProxy --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer -g 100

// forge script script/deploy/governance/GovernanceProxy.s.sol:DeployGovernanceProxy --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
4 changes: 3 additions & 1 deletion script/deploy/governance/OffchainEntityProxy.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ contract DeployOffchainEntityProxy is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -30,3 +30,5 @@ contract DeployOffchainEntityProxy is Script {
// forge script script/deploy/governance/OffchainEntityProxy.s.sol:DeployOffchainEntityProxy --rpc-url $GOERLI_RPC_URL --broadcast -vvvv --account supa_test_deployer --verify

// forge script script/deploy/governance/OffchainEntityProxy.s.sol:DeployOffchainEntityProxy --rpc-url $ARBITRUM_RPC_URL --broadcast -vvvv --account supa_deployer --verify -g 100

// forge script script/deploy/governance/OffchainEntityProxy.s.sol:DeployOffchainEntityProxy --rpc-url $BASE_RPC_URL --broadcast -vvvv --account supa_deployer --verify --etherscan-api-key $BASESCAN_API_KEY
8 changes: 5 additions & 3 deletions script/deploy/periphery/gelatoOperator.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contract DeployGelatoOperator is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -24,6 +24,8 @@ contract DeployGelatoOperator is Script {
}
}

// forge script script/deploy/periphery/gelatoOperator.s.sol:DeployGelatoOperator --rpc-url $GOERLI_RPC_URL --broadcast -vvvv --account supa_test_deployer
// forge script script/deploy/periphery/gelatoOperator.s.sol:DeployGelatoOperator --rpc-url $GOERLI_RPC_URL --broadcast -vvvv --account supa_test_deployer --verify

// forge script script/deploy/periphery/gelatoOperator.s.sol:DeployGelatoOperator --rpc-url $ARBITRUM_RPC_URL --broadcast -vvvv --account supa_deployer -g 100
// forge script script/deploy/periphery/gelatoOperator.s.sol:DeployGelatoOperator --rpc-url $ARBITRUM_RPC_URL --broadcast -vvvv --account supa_deployer -g 100 --verify

// forge script script/deploy/periphery/gelatoOperator.s.sol:DeployGelatoOperator --rpc-url $BASE_RPC_URL --broadcast -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY --verify
5 changes: 4 additions & 1 deletion script/deploy/periphery/uniV3LPHelper.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contract DeployUniV3LPHelper is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -27,5 +27,8 @@ contract DeployUniV3LPHelper is Script {
}
}

// cast create2 --init-code-hash $UNI_V3_LP_HELPER_INIT_CODE_HASH --starts-with 0x00000000

// forge script script/deploy/periphery/uniV3LPHelper.s.sol:DeployUniV3LPHelper --rpc-url $GOERLI_RPC_URL --broadcast --etherscan-api-key $ETHERSCAN_API_KEY -vvvv --account supa_test_deployer
// forge script script/deploy/periphery/uniV3LPHelper.s.sol:DeployUniV3LPHelper --rpc-url $ARBITRUM_RPC_URL --broadcast --etherscan-api-key $ARBISCAN_API_KEY -vvvv --account supa_deployer
// forge script script/deploy/periphery/uniV3LPHelper.s.sol:DeployUniV3LPHelper --rpc-url $BASE_RPC_URL --broadcast --etherscan-api-key $BASESCAN_API_KEY -vvvv --account supa_deployer --verify
6 changes: 4 additions & 2 deletions script/deploy/supa/Supa.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ contract DeploySupa is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -25,8 +25,10 @@ contract DeploySupa is Script {
}
}

// cast create2 --init-code-hash $SUPA_CONFIG_INIT_CODE_HASH --starts-with 0xB0057ED0 --case-sensitive
// cast create2 --init-code-hash $SUPA_INIT_CODE_HASH --starts-with 0xB0057ED0 --case-sensitive

// forge script script/deploy/supa/Supa.s.sol:DeploySupa --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv --account supa_test_deployer

// forge script script/deploy/supa/Supa.s.sol:DeploySupa --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer

// forge script script/deploy/supa/Supa.s.sol:DeploySupa --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
6 changes: 4 additions & 2 deletions script/deploy/supa/SupaConfig.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ contract DeploySupaConfig is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -25,8 +25,10 @@ contract DeploySupaConfig is Script {
}
}

// cast create2 --init-code-hash $SUPA_CONFIG_INIT_CODE_HASH --starts-with 0x000000000
// cast create2 --init-code-hash $SUPA_CONFIG_INIT_CODE_HASH --starts-with 0x00000000

// forge script script/deploy/supa/SupaConfig.s.sol:DeploySupaConfig --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv --account supa_test_deployer

// forge script script/deploy/supa/SupaConfig.s.sol:DeploySupaConfig --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer

// forge script script/deploy/supa/SupaConfig.s.sol:DeploySupaConfig --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
6 changes: 4 additions & 2 deletions script/deploy/supa/VersionManager.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ contract DeployVersionManager is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -29,4 +29,6 @@ contract DeployVersionManager is Script {

// forge script script/deploy/supa/VersionManager.s.sol:DeployVersionManager --rpc-url $GOERLI_RPC_URL --broadcast --verify -vvvv --account supa_test_deployer

// forge script script/deploy/supa/VersionManager.s.sol:DeployVersionManager --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer -g 100
// forge script script/deploy/supa/VersionManager.s.sol:DeployVersionManager --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer -g 100

// forge script script/deploy/supa/VersionManager.s.sol:DeployVersionManager --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
5 changes: 3 additions & 2 deletions script/deploy/wallet/WalletLogic.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ contract DeployWalletLogic is Script {
address deployer;
if (chainId == 5) {
deployer = vm.envAddress("DEPLOYER_GOERLI");
} else if (chainId == 42161) {
} else if (chainId == 42161 || chainId == 8453) {
deployer = vm.envAddress("DEPLOYER");
} else {
revert("unsupported chain");
Expand All @@ -29,4 +29,5 @@ contract DeployWalletLogic is Script {
}

// forge script script/deploy/wallet/WalletLogic.s.sol:DeployWalletLogic --rpc-url $GOERLI_RPC_URL --broadcast -vvvv --account supa_test_deployer
// forge script script/deploy/wallet/WalletLogic.s.sol:DeployWalletLogic --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $ARBISCAN_API_KEY
// forge script script/deploy/wallet/WalletLogic.s.sol:DeployWalletLogic --rpc-url $ARBITRUM_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $ARBISCAN_API_KEY
// forge script script/deploy/wallet/WalletLogic.s.sol:DeployWalletLogic --rpc-url $BASE_RPC_URL --broadcast --verify -vvvv --account supa_deployer --etherscan-api-key $BASESCAN_API_KEY
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ contract InitCodeHashGovernanceProxy is Script {
}
}

// forge script script/initCode/GovernanceProxy.s.sol:InitCodeHashGovernanceProxy -vvvv
// forge script script/initCode/governance/GovernanceProxy.s.sol:InitCodeHashGovernanceProxy -vvvv
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ contract InitCodeHashOffchainEntityProxy is Script {
}
}

// forge script script/initCode/OffchainEntityProxy.s.sol:InitCodeHashOffchainEntityProxy -vvvv
// forge script script/initCode/governance/OffchainEntityProxy.s.sol:InitCodeHashOffchainEntityProxy -vvvv

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,14 @@ import {OffchainEntityProxy} from "src/governance/OffchainEntityProxy.sol";
contract TransferOwnership is Script {
function run() external {
address deployer = vm.envAddress("DEPLOYER");
address newOwner = vm.envAddress("SUPA_ADMIN");
address newOwner;
if (block.chainid == 5) {
newOwner = vm.envAddress("SUPA_ADMIN_GOERLI");
} else if (block.chainid == 8453) {
newOwner = vm.envAddress("SUPA_ADMIN_BASE");
} else {
revert("unsupported chain");
}

vm.startBroadcast(deployer);
OffchainEntityProxy offchainEntityProxy = OffchainEntityProxy(vm.envAddress("OFFCHAIN_ENTITY_PROXY_ADDRESS"));
Expand Down