refactor hardcoded variables to .env files #83
+32
−16
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vicentevieytes
commented
Oct 7, 2024
| @@ -31,18 +31,12 @@ import "forge-std/StdJson.sol"; | |||
| import "forge-std/console.sol"; | |||
|
|
|||
| // # To deploy and verify our contract | |||
| // forge script script/CredibleSquaringDeployer.s.sol:CredibleSquaringDeployer --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvvv | |||
| // forge script script/IncredibleSquaringDeployer.s.sol:IncredibleSquaringDeployer --rpc-url $RPC_URL --private-key $PRIVATE_KEY --constructor-args $AGGREGATOR_ADDR $TASK_GENERATOR_ADDR --broadcast -vvvv | |||
There was a problem hiding this comment.
Suggested change
| // forge script script/IncredibleSquaringDeployer.s.sol:IncredibleSquaringDeployer --rpc-url $RPC_URL --private-key $PRIVATE_KEY --constructor-args $AGGREGATOR_ADDR $TASK_GENERATOR_ADDR --broadcast -vvvv | |
| // forge script script/IncredibleSquaringDeployer.s.sol:IncredibleSquaringDeployer --rpc-url $RPC_URL --private-key $PRIVATE_KEY --broadcast -vvvv |
Th constructor-args are not necessary
vicentevieytes
commented
Oct 7, 2024
| function run() external { | ||
| aggregatorAddr = vm.envAddress("AGGREGATOR_ADDR"); | ||
| taskGeneratorAddr = vm.envAddress("TASK_GENERATOR_ADDR"); |
There was a problem hiding this comment.
Fetching of the environment variables should go in a setUp() function
There was a problem hiding this comment.
function setUp() public virtual {
aggregatorAddress = vm.envAddress("AGGREGATOR_ADDRESS");
taskGeneratorAddress = vm.envAddress("TASK_GENERATOR_ADDRESS");
}
There was a problem hiding this comment.
Yeah I agree, can we also move reading the json into the setup function and make the Eigenlayer contracts state variables of the script contract
vicentevieytes
commented
Oct 7, 2024
| ``` | ||
| cp .env.template .env | ||
| cp contracts/.env.template contracts/.env | ||
| ``` |
There was a problem hiding this comment.
This file should be copied to contracts/.env in the Makefile, so the user doesn't have to do it manually
vicentevieytes
commented
Oct 7, 2024
| @@ -4,13 +4,8 @@ | |||
| help: | |||
| @grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | |||
|
|
|||
| AGGREGATOR_ECDSA_PRIV_KEY=0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6 | |||
| CHALLENGER_ECDSA_PRIV_KEY=0x5de4111afa1a4b94908f83103eb1f1706367c2e68ca870fc3fb9a804cdab365a | |||
| include .env | |||
There was a problem hiding this comment.
This is not necessary, also, the .env file is not in the root of the repository so nothing would be included
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduces a
.env.templatefile in the root of the repo and another in thecontracts/in order to remove some hardcoded values from the IncredibleSquaringDeployer solidity script and from the Makefile.Because of some errors with the foundry version, I could not test that this changes are working correctly in the devnet deployment. Leaving this PR in draft until this is solved.