Layr-Labs · rvmz · Feb 1, 2025 · Feb 1, 2025
diff --git 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/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -104,7 +104,7 @@ jobs:
     runs-on: ubuntu-latest
     defaults:
       run:
-        working-directory: ./crates/contracts/anvil
+        working-directory: ./contracts/anvil
     steps:
       - uses: actions/checkout@v4
         with:

diff --git 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
@@ -3,10 +3,10 @@ PHONY: reset-anvil
 __CONTRACTS__: ##
 
 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
 
 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__: ##
 
@@ -37,7 +37,7 @@ __BINDINGS__: ##
 
 ### 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:=$(patsubst %, --select '^%$$', $(shell echo $(SDK_CONTRACTS)))

diff --git a/crates/contracts/.gitignore → contracts/.gitignore b/crates/contracts/.gitignore → contracts/.gitignore
diff --git a/...acts_deployed_anvil_state.json/state.json → ...acts_deployed_anvil_state.json/state.json b/...acts_deployed_anvil_state.json/state.json → ...acts_deployed_anvil_state.json/state.json
diff --git a/...nvil/deploy-contracts-save-anvil-state.sh → ...nvil/deploy-contracts-save-anvil-state.sh b/...nvil/deploy-contracts-save-anvil-state.sh → ...nvil/deploy-contracts-save-anvil-state.sh
diff --git a/...t-anvil-chain-with-el-and-avs-deployed.sh → ...t-anvil-chain-with-el-and-avs-deployed.sh b/...t-anvil-chain-with-el-and-avs-deployed.sh → ...t-anvil-chain-with-el-and-avs-deployed.sh
diff --git a/crates/contracts/anvil/utils.sh → contracts/anvil/utils.sh b/crates/contracts/anvil/utils.sh → contracts/anvil/utils.sh
diff --git a/crates/contracts/foundry.toml → contracts/foundry.toml b/crates/contracts/foundry.toml → contracts/foundry.toml
diff --git a/contracts/lib/eigenlayer-middleware b/contracts/lib/eigenlayer-middleware
diff --git a/contracts/lib/forge-std b/contracts/lib/forge-std
diff --git a/crates/contracts/remappings.txt → contracts/remappings.txt b/crates/contracts/remappings.txt → contracts/remappings.txt
diff --git a/crates/contracts/script/DeployMockAvs.s.sol → contracts/script/DeployMockAvs.s.sol b/crates/contracts/script/DeployMockAvs.s.sol → contracts/script/DeployMockAvs.s.sol
diff --git a/...acts/script/DeployMockAvsRegistries.s.sol → ...acts/script/DeployMockAvsRegistries.s.sol b/...acts/script/DeployMockAvsRegistries.s.sol → ...acts/script/DeployMockAvsRegistries.s.sol
diff --git a/...DeployTokensStrategiesCreateQuorums.s.sol → ...DeployTokensStrategiesCreateQuorums.s.sol b/...DeployTokensStrategiesCreateQuorums.s.sol → ...DeployTokensStrategiesCreateQuorums.s.sol
diff --git a/...ipt/RegisterOperatorsWithEigenlayer.s.sol → ...ipt/RegisterOperatorsWithEigenlayer.s.sol b/...ipt/RegisterOperatorsWithEigenlayer.s.sol → ...ipt/RegisterOperatorsWithEigenlayer.s.sol
diff --git a/...es/contracts/script/UpdateOperators.s.sol → contracts/script/UpdateOperators.s.sol b/...es/contracts/script/UpdateOperators.s.sol → contracts/script/UpdateOperators.s.sol
diff --git a/...cts/script/input/31337/ops_addresses.json → ...cts/script/input/31337/ops_addresses.json b/...cts/script/input/31337/ops_addresses.json → ...cts/script/input/31337/ops_addresses.json
diff --git a/...t/31337/eigenlayer_deployment_output.json → ...t/31337/eigenlayer_deployment_output.json b/...t/31337/eigenlayer_deployment_output.json → ...t/31337/eigenlayer_deployment_output.json
diff --git a/...tput/31337/mockAvs_deployment_output.json → ...tput/31337/mockAvs_deployment_output.json b/...tput/31337/mockAvs_deployment_output.json → ...tput/31337/mockAvs_deployment_output.json
diff --git a/...token_and_strategy_deployment_output.json → ...token_and_strategy_deployment_output.json b/...token_and_strategy_deployment_output.json → ...token_and_strategy_deployment_output.json
diff --git a/...acts/script/parsers/ConfigsReadWriter.sol → ...acts/script/parsers/ConfigsReadWriter.sol b/...acts/script/parsers/ConfigsReadWriter.sol → ...acts/script/parsers/ConfigsReadWriter.sol
diff --git a/...ipt/parsers/EigenlayerContractsParser.sol → ...ipt/parsers/EigenlayerContractsParser.sol b/...ipt/parsers/EigenlayerContractsParser.sol → ...ipt/parsers/EigenlayerContractsParser.sol
diff --git a/...script/parsers/MockAvsContractsParser.sol → ...script/parsers/MockAvsContractsParser.sol b/...script/parsers/MockAvsContractsParser.sol → ...script/parsers/MockAvsContractsParser.sol
diff --git a/...rs/TokensAndStrategiesContractsParser.sol → ...rs/TokensAndStrategiesContractsParser.sol b/...rs/TokensAndStrategiesContractsParser.sol → ...rs/TokensAndStrategiesContractsParser.sol
diff --git a/crates/contracts/src/ContractsRegistry.sol → contracts/src/ContractsRegistry.sol b/crates/contracts/src/ContractsRegistry.sol → contracts/src/ContractsRegistry.sol
diff --git a/...s/contracts/src/MockAvsServiceManager.sol → contracts/src/MockAvsServiceManager.sol b/...s/contracts/src/MockAvsServiceManager.sol → contracts/src/MockAvsServiceManager.sol
diff --git a/crates/contracts/src/MockERC20.sol → contracts/src/MockERC20.sol b/crates/contracts/src/MockERC20.sol → contracts/src/MockERC20.sol
diff --git a/crates/contracts/lib/eigenlayer-middleware b/crates/contracts/lib/eigenlayer-middleware
diff --git a/crates/contracts/lib/forge-std b/crates/contracts/lib/forge-std
diff --git 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/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"))