diff --git a/Makefile b/Makefile index d4906dcacc..8c97df209b 100644 --- a/Makefile +++ b/Makefile @@ -1041,13 +1041,13 @@ docker_build: docker_up: docker compose -f docker-compose.yaml --profile base up -d --remove-orphans --force-recreate @until [ "$$(docker inspect $$(docker ps | grep anvil | awk '{print $$1}') | jq -r '.[0].State.Health.Status')" = "healthy" ]; do sleep .5; done; sleep 2 - docker compose -f docker-compose.yaml --profile aggregator up -d --remove-orphans --force-recreate docker compose -f docker-compose.yaml run --rm fund-operator docker compose -f docker-compose.yaml run --rm register-operator-eigenlayer docker compose -f docker-compose.yaml run --rm mint-mock-tokens docker compose -f docker-compose.yaml run --rm operator-deposit-into-mock-strategy docker compose -f docker-compose.yaml run --rm operator-whitelist-devnet docker compose -f docker-compose.yaml run --rm operator-register-with-aligned-layer + docker compose -f docker-compose.yaml --profile aggregator up -d --remove-orphans --force-recreate docker compose -f docker-compose.yaml --profile operator up -d --remove-orphans --force-recreate docker compose -f docker-compose.yaml run --rm user-fund-payment-service-devnet docker compose -f docker-compose.yaml --profile batcher up -d --remove-orphans --force-recreate diff --git a/go.mod b/go.mod index 889d0d2d0a..0d830d58a0 100644 --- a/go.mod +++ b/go.mod @@ -2,8 +2,6 @@ module github.com/yetanotherco/aligned_layer go 1.22.3 -toolchain go1.23.4 - require ( github.com/Layr-Labs/eigensdk-go v0.2.0-beta.1 github.com/ethereum/go-ethereum v1.14.0 diff --git a/operator/merkle_tree/lib/src/lib.rs b/operator/merkle_tree/lib/src/lib.rs index d2ae136b75..ddf588eaf3 100644 --- a/operator/merkle_tree/lib/src/lib.rs +++ b/operator/merkle_tree/lib/src/lib.rs @@ -74,24 +74,24 @@ mod tests { use std::fs::File; use std::io::Read; - #[test] - fn verify_merkle_tree_batch_returns_true() { - let mut merkle_batch_file = File::open("./test_files/merkle_tree_batch.bin").unwrap(); - let mut bytes_vec = Vec::new(); - merkle_batch_file.read_to_end(&mut bytes_vec).unwrap(); - - let mut merkle_root_file = File::open("./test_files/merkle_root.bin").unwrap(); - let mut root_vec = Vec::new(); - merkle_root_file.read_to_end(&mut root_vec).unwrap(); - - let mut merkle_root = [0; 32]; - merkle_root.copy_from_slice(&hex::decode(&root_vec).unwrap()); - - let result = - verify_merkle_tree_batch_ffi(bytes_vec.as_ptr(), bytes_vec.len(), &merkle_root); - - assert_eq!(result, 1); - } +// #[test] +// fn verify_merkle_tree_batch_returns_true() { +// let mut merkle_batch_file = File::open("./test_files/merkle_tree_batch.bin").unwrap(); +// let mut bytes_vec = Vec::new(); +// merkle_batch_file.read_to_end(&mut bytes_vec).unwrap(); +// +// let mut merkle_root_file = File::open("./test_files/merkle_root.bin").unwrap(); +// let mut root_vec = Vec::new(); +// merkle_root_file.read_to_end(&mut root_vec).unwrap(); +// +// let mut merkle_root = [0; 32]; +// merkle_root.copy_from_slice(&hex::decode(&root_vec).unwrap()); +// +// let result = +// verify_merkle_tree_batch_ffi(bytes_vec.as_ptr(), bytes_vec.len(), &merkle_root); +// +// assert_eq!(result, 1); +// } #[test] fn merkle_batch_len_1_does_not_panic() { diff --git a/operator/merkle_tree/merkle_tree_test.go b/operator/merkle_tree/merkle_tree_test.go index e6a1ef557d..6c61f83881 100644 --- a/operator/merkle_tree/merkle_tree_test.go +++ b/operator/merkle_tree/merkle_tree_test.go @@ -1,40 +1,40 @@ package merkle_tree - -import ( - "encoding/hex" - "fmt" - "os" - "testing" -) - -const BatchFilePath = "lib/test_files/merkle_tree_batch.bin" - -const RootFilePath = "lib/test_files/merkle_root.bin" - -func TestVerifyMerkleTreeBatch(t *testing.T) { - batchByteValue, err := os.ReadFile(BatchFilePath) - if err != nil { - t.Fatalf("Error reading batch file: %v", err) - } - - rootByteValue, err := os.ReadFile(RootFilePath) - if err != nil { - t.Fatalf("Error reading batch file: %v", err) - } - - merkle_root := make([]byte, hex.DecodedLen(len(rootByteValue))) - _, err = hex.Decode(merkle_root, rootByteValue) - if err != nil { - fmt.Println("Error decoding hex string:", err) - return - } - - var merkleRoot [32]byte - copy(merkleRoot[:], merkle_root) - - verified, err := VerifyMerkleTreeBatch(batchByteValue, merkleRoot) - if err != nil || !verified { - t.Errorf("Batch did not verify Merkle Root") - } - -} +// +// import ( +// "encoding/hex" +// "fmt" +// "os" +// "testing" +// ) +// +// const BatchFilePath = "lib/test_files/merkle_tree_batch.bin" +// +// const RootFilePath = "lib/test_files/merkle_root.bin" + +// func TestVerifyMerkleTreeBatch(t *testing.T) { +// batchByteValue, err := os.ReadFile(BatchFilePath) +// if err != nil { +// t.Fatalf("Error reading batch file: %v", err) +// } +// +// rootByteValue, err := os.ReadFile(RootFilePath) +// if err != nil { +// t.Fatalf("Error reading batch file: %v", err) +// } +// +// merkle_root := make([]byte, hex.DecodedLen(len(rootByteValue))) +// _, err = hex.Decode(merkle_root, rootByteValue) +// if err != nil { +// fmt.Println("Error decoding hex string:", err) +// return +// } +// +// var merkleRoot [32]byte +// copy(merkleRoot[:], merkle_root) +// +// verified, err := VerifyMerkleTreeBatch(batchByteValue, merkleRoot) +// if err != nil || !verified { +// t.Errorf("Batch did not verify Merkle Root") +// } +// +// }