diff --git a/.github/workflows/check-anvil-dump.yml b/.github/workflows/check-anvil-dump.yml index b9c7a9be2..135390ea0 100644 --- a/.github/workflows/check-anvil-dump.yml +++ b/.github/workflows/check-anvil-dump.yml @@ -23,9 +23,9 @@ jobs: with: filters: | contracts: - - 'crates/contracts/lib/**' - - 'crates/contracts/script/**' - - 'crates/contracts/src/**' + - 'contracts/lib/**' + - 'contracts/script/**' + - 'contracts/src/**' # This step runs only if some contract changed. # It checks the diff in the anvil state file. @@ -34,7 +34,7 @@ jobs: # Note: if the git diff fails to fetch the changes, then the step will also fail. - name: Check the anvil dump has changed if: steps.filter.outputs.contracts == 'true' - working-directory: crates/contracts/anvil/contracts_deployed_anvil_state.json + working-directory: contracts/anvil/contracts_deployed_anvil_state.json run: | if [ -z "$(git diff origin/${{ github.event.pull_request.base.ref }} -- state.json)" ]; then echo "The anvil dump is outdated"; diff --git a/.github/workflows/foundry.yml b/.github/workflows/foundry.yml index f1937f07d..9c7023e4c 100644 --- a/.github/workflows/foundry.yml +++ b/.github/workflows/foundry.yml @@ -18,7 +18,7 @@ jobs: runs-on: ubuntu-latest defaults: run: - working-directory: ./crates/contracts + working-directory: ./contracts steps: - uses: actions/checkout@v4 with: diff --git a/.gitmodules b/.gitmodules index 27d10d80e..8ba93e497 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ -[submodule "crates/contracts/lib/forge-std"] - path = crates/contracts/lib/forge-std +[submodule "contracts/lib/forge-std"] + path = contracts/lib/forge-std url = https://github.com/foundry-rs/forge-std -[submodule "crates/contracts/lib/eigenlayer-middleware"] - path = crates/contracts/lib/eigenlayer-middleware - url = https://github.com/Layr-labs/eigenlayer-middleware +[submodule "contracts/lib/eigenlayer-middleware"] + path = contracts/lib/eigenlayer-middleware + url = https://github.com/Layr-Labs/eigenlayer-middleware.git diff --git a/Makefile b/Makefile index 1447d8b07..9d63a49c9 100644 --- a/Makefile +++ b/Makefile @@ -2,11 +2,11 @@ __CONTRACTS__: ## PHONY: start-anvil-chain-with-contracts-deployed start-anvil-chain-with-contracts-deployed: ## - ./crates/contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh + ./contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh PHONY: start-anvil-chain-with-contracts-deployed deploy-contracts-to-anvil-and-save-state: ## - ./crates/contracts/anvil/deploy-contracts-save-anvil-state.sh + ./contracts/anvil/deploy-contracts-save-anvil-state.sh __TESTING__: ## diff --git a/crates/contracts/.gitignore b/contracts/.gitignore similarity index 100% rename from crates/contracts/.gitignore rename to contracts/.gitignore diff --git a/crates/contracts/anvil/contracts_deployed_anvil_state.json/state.json b/contracts/anvil/contracts_deployed_anvil_state.json/state.json similarity index 100% rename from crates/contracts/anvil/contracts_deployed_anvil_state.json/state.json rename to contracts/anvil/contracts_deployed_anvil_state.json/state.json diff --git a/crates/contracts/anvil/deploy-contracts-save-anvil-state.sh b/contracts/anvil/deploy-contracts-save-anvil-state.sh similarity index 100% rename from crates/contracts/anvil/deploy-contracts-save-anvil-state.sh rename to contracts/anvil/deploy-contracts-save-anvil-state.sh diff --git a/crates/contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh b/contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh similarity index 100% rename from crates/contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh rename to contracts/anvil/start-anvil-chain-with-el-and-avs-deployed.sh diff --git a/crates/contracts/anvil/utils.sh b/contracts/anvil/utils.sh similarity index 100% rename from crates/contracts/anvil/utils.sh rename to contracts/anvil/utils.sh diff --git a/crates/contracts/foundry.toml b/contracts/foundry.toml similarity index 100% rename from crates/contracts/foundry.toml rename to contracts/foundry.toml diff --git a/crates/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware similarity index 100% rename from crates/contracts/lib/eigenlayer-middleware rename to contracts/lib/eigenlayer-middleware diff --git a/crates/contracts/lib/forge-std b/contracts/lib/forge-std similarity index 100% rename from crates/contracts/lib/forge-std rename to contracts/lib/forge-std diff --git a/crates/contracts/remappings.txt b/contracts/remappings.txt similarity index 100% rename from crates/contracts/remappings.txt rename to contracts/remappings.txt diff --git a/crates/contracts/script/DeployMockAvs.s.sol b/contracts/script/DeployMockAvs.s.sol similarity index 100% rename from crates/contracts/script/DeployMockAvs.s.sol rename to contracts/script/DeployMockAvs.s.sol diff --git a/crates/contracts/script/DeployMockAvsRegistries.s.sol b/contracts/script/DeployMockAvsRegistries.s.sol similarity index 100% rename from crates/contracts/script/DeployMockAvsRegistries.s.sol rename to contracts/script/DeployMockAvsRegistries.s.sol diff --git a/crates/contracts/script/DeployTokensStrategiesCreateQuorums.s.sol b/contracts/script/DeployTokensStrategiesCreateQuorums.s.sol similarity index 100% rename from crates/contracts/script/DeployTokensStrategiesCreateQuorums.s.sol rename to contracts/script/DeployTokensStrategiesCreateQuorums.s.sol diff --git a/crates/contracts/script/RegisterOperatorsWithEigenlayer.s.sol b/contracts/script/RegisterOperatorsWithEigenlayer.s.sol similarity index 100% rename from crates/contracts/script/RegisterOperatorsWithEigenlayer.s.sol rename to contracts/script/RegisterOperatorsWithEigenlayer.s.sol diff --git a/crates/contracts/script/UpdateOperators.s.sol b/contracts/script/UpdateOperators.s.sol similarity index 100% rename from crates/contracts/script/UpdateOperators.s.sol rename to contracts/script/UpdateOperators.s.sol diff --git a/crates/contracts/script/input/31337/ops_addresses.json b/contracts/script/input/31337/ops_addresses.json similarity index 100% rename from crates/contracts/script/input/31337/ops_addresses.json rename to contracts/script/input/31337/ops_addresses.json diff --git a/crates/contracts/script/output/31337/eigenlayer_deployment_output.json b/contracts/script/output/31337/eigenlayer_deployment_output.json similarity index 100% rename from crates/contracts/script/output/31337/eigenlayer_deployment_output.json rename to contracts/script/output/31337/eigenlayer_deployment_output.json diff --git a/crates/contracts/script/output/31337/mockAvs_deployment_output.json b/contracts/script/output/31337/mockAvs_deployment_output.json similarity index 100% rename from crates/contracts/script/output/31337/mockAvs_deployment_output.json rename to contracts/script/output/31337/mockAvs_deployment_output.json diff --git a/crates/contracts/script/output/31337/token_and_strategy_deployment_output.json b/contracts/script/output/31337/token_and_strategy_deployment_output.json similarity index 100% rename from crates/contracts/script/output/31337/token_and_strategy_deployment_output.json rename to contracts/script/output/31337/token_and_strategy_deployment_output.json diff --git a/crates/contracts/script/parsers/ConfigsReadWriter.sol b/contracts/script/parsers/ConfigsReadWriter.sol similarity index 100% rename from crates/contracts/script/parsers/ConfigsReadWriter.sol rename to contracts/script/parsers/ConfigsReadWriter.sol diff --git a/crates/contracts/script/parsers/EigenlayerContractsParser.sol b/contracts/script/parsers/EigenlayerContractsParser.sol similarity index 100% rename from crates/contracts/script/parsers/EigenlayerContractsParser.sol rename to contracts/script/parsers/EigenlayerContractsParser.sol diff --git a/crates/contracts/script/parsers/MockAvsContractsParser.sol b/contracts/script/parsers/MockAvsContractsParser.sol similarity index 100% rename from crates/contracts/script/parsers/MockAvsContractsParser.sol rename to contracts/script/parsers/MockAvsContractsParser.sol diff --git a/crates/contracts/script/parsers/TokensAndStrategiesContractsParser.sol b/contracts/script/parsers/TokensAndStrategiesContractsParser.sol similarity index 100% rename from crates/contracts/script/parsers/TokensAndStrategiesContractsParser.sol rename to contracts/script/parsers/TokensAndStrategiesContractsParser.sol diff --git a/crates/contracts/src/ContractsRegistry.sol b/contracts/src/ContractsRegistry.sol similarity index 100% rename from crates/contracts/src/ContractsRegistry.sol rename to contracts/src/ContractsRegistry.sol diff --git a/crates/contracts/src/MockAvsServiceManager.sol b/contracts/src/MockAvsServiceManager.sol similarity index 100% rename from crates/contracts/src/MockAvsServiceManager.sol rename to contracts/src/MockAvsServiceManager.sol diff --git a/crates/contracts/src/MockERC20.sol b/contracts/src/MockERC20.sol similarity index 100% rename from crates/contracts/src/MockERC20.sol rename to contracts/src/MockERC20.sol diff --git a/examples/README.md b/examples/README.md index 04d1d4829..0d2bff973 100644 --- a/examples/README.md +++ b/examples/README.md @@ -20,7 +20,7 @@ cargo run --example get_operator_from_id ## Anvil utils(This requires a local anvil instance running using docker ) -Get EigenLayer contract addresses for local anvil testing . These are predetermined addresses that are stored in a mapping using these [scripts](https://github.com/Layr-Labs/eigensdk-rs/blob/d9b40d806b4939c64bb7d3df0f6f2a542499bd27/crates/contracts/script/DeployMockAvsRegistries.s.sol#L202). +Get EigenLayer contract addresses for local anvil testing . These are predetermined addresses that are stored in a mapping using these [scripts](https://github.com/Layr-Labs/eigensdk-rs/blob/d9b40d806b4939c64bb7d3df0f6f2a542499bd27/contracts/script/DeployMockAvsRegistries.s.sol#L202). ```sh make start-anvil-chain-with-contracts-deployed diff --git a/scripts/generate_bindings.sh b/scripts/generate_bindings.sh index 93852c34f..898dc274f 100755 --- a/scripts/generate_bindings.sh +++ b/scripts/generate_bindings.sh @@ -22,7 +22,7 @@ cd $repo_root ### SDK bindings ### SDK_CONTRACTS="MockAvsServiceManager ContractsRegistry MockERC20" -SDK_CONTRACTS_LOCATION=crates/contracts +SDK_CONTRACTS_LOCATION=contracts SDK_BINDINGS_PATH=crates/utils/src/sdk # The echo is to remove quotes, and the patsubst to make the regex match the full text only SDK_CONTRACTS_ARGS=$(generate_flags $SDK_CONTRACTS) diff --git a/testing/testing-utils/src/anvil.rs b/testing/testing-utils/src/anvil.rs index 4087558c3..027c851a3 100644 --- a/testing/testing-utils/src/anvil.rs +++ b/testing/testing-utils/src/anvil.rs @@ -7,7 +7,7 @@ use testcontainers::{ const ANVIL_IMAGE: &str = "ghcr.io/foundry-rs/foundry"; const ANVIL_TAG: &str = "latest"; -const ANVIL_STATE_PATH: &str = "./crates/contracts/anvil/contracts_deployed_anvil_state.json"; // relative path from the project root +const ANVIL_STATE_PATH: &str = "./contracts/anvil/contracts_deployed_anvil_state.json"; // relative path from the project root fn workspace_dir() -> PathBuf { let output = std::process::Command::new(env!("CARGO"))