Merge branch 'staging' into mina

Author: gabrielbosio

.github/pull_request_template.md

@@ -0,0 +1,26 @@
+# TITLE
+
+## Description
+
+Description of the pull request changes and motivation.
+
+## Type of change
+
+Please delete options that are not relevant.
+
+- [ ] New feature
+- [ ] Bug fix
+- [ ] Optimization
+- [ ] Refactor
+
+## Checklist
+- [ ] Linked to Github Issue
+- [ ] This change depends on code or research by an external entity
+  - [ ] Acknowledgements were updated to give credit
+- [ ] Unit tests added
+- [ ] This change requires new documentation.
+  - [ ] Documentation has been added/updated.
+- [ ] This change is an Optimization
+  - [ ] Benchmarks added/run
+- [ ] Has a known issue
+  - [Link to the open issue addressing it]() 

.github/workflows/build-go.yml .github/workflows/build-and-test-go.yml.github/workflows/build-go.yml renamed to .github/workflows/build-and-test-go.yml

@@ -35,9 +35,8 @@ jobs:
         run: make build_mina_linux
       - name: Build Mina Account bindings
         run: make build_mina_account_linux
-      - name: Build Old Merkle Tree bindings
-        run: make build_merkle_tree_linux_old
       - name: Build operator
         run: go build operator/cmd/main.go
       - name: Build aggregator
         run: go build aggregator/cmd/main.go
+      

.github/workflows/build-and-test-rust.yml

@@ -47,7 +47,7 @@ jobs:
           cargo build --all
 
   test:
-    runs-on: ubuntu-latest
+    runs-on: aligned-runner
     needs: build
     steps:
       - name: Checkout code

Makefile

@@ -6,7 +6,7 @@ OS := $(shell uname -s)
 CONFIG_FILE?=config-files/config.yaml
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
-OPERATOR_VERSION=v0.8.0
+OPERATOR_VERSION=v0.10.0
 
 ifeq ($(OS),Linux)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_linux
@@ -17,7 +17,15 @@ ifeq ($(OS),Darwin)
 endif
 
 ifeq ($(OS),Linux)
-	export LD_LIBRARY_PATH := $(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
+	LD_LIBRARY_PATH += $(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
+endif
+
+ifeq ($(OS),Linux)
+	BUILD_OPERATOR = $(MAKE) build_operator_linux 
+endif
+
+ifeq ($(OS),Darwin)
+	BUILD_OPERATOR = $(MAKE) build_operator_macos
 endif
 
 
@@ -85,9 +93,9 @@ anvil_upgrade_add_aggregator:
 	@echo "Adding Aggregator to Aligned Contracts..."
 	. contracts/scripts/anvil/upgrade_add_aggregator_to_service_manager.sh
 
-anvil_add_type_hash_to_batcher_payment_service:
-	@echo "Adding Type Hash to Batcher Payment Service..."
-	. contracts/scripts/anvil/upgrade_add_type_hash_to_batcher_payment_service.sh
+anvil_upgrade_initialize_disable_verifiers:
+	@echo "Initializing disabled verifiers..."
+	. contracts/scripts/anvil/upgrade_disabled_verifiers_in_service_manager.sh
 
 lint_contracts:
 	@cd contracts && npm run lint:sol
@@ -124,6 +132,14 @@ operator_full_registration: operator_get_eth operator_register_with_eigen_layer
 operator_register_and_start: operator_full_registration operator_start
 
 build_operator: deps
+	$(BUILD_OPERATOR)
+
+build_operator_macos:
+	@echo "Building Operator..."
+	@go build -ldflags "-X main.Version=$(OPERATOR_VERSION)" -o ./operator/build/aligned-operator ./operator/cmd/main.go
+	@echo "Operator built into /operator/build/aligned-operator"
+
+build_operator_linux:
 	@echo "Building Operator..."
 	@go build -ldflags "-X main.Version=$(OPERATOR_VERSION) -r $(LD_LIBRARY_PATH)" -o ./operator/build/aligned-operator ./operator/cmd/main.go
 	@echo "Operator built into /operator/build/aligned-operator"
@@ -218,6 +234,23 @@ operator_register_with_aligned_layer:
 operator_deposit_and_register: operator_deposit_into_strategy operator_register_with_aligned_layer
 
 
+# The verifier ID to enable or disable corresponds to the index of the verifier in the `ProvingSystemID` enum.
+verifier_enable_devnet:
+	@echo "Enabling verifier with id: $(VERIFIER_ID)"
+	PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 RPC_URL=http://localhost:8545 OUTPUT_PATH=./script/output/devnet/alignedlayer_deployment_output.json ./contracts/scripts/enable_verifier.sh $(VERIFIER_ID)
+
+verifier_disable_devnet:
+	@echo "Disabling verifier with id: $(VERIFIER_ID)"
+	PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80 RPC_URL=http://localhost:8545 OUTPUT_PATH=./script/output/devnet/alignedlayer_deployment_output.json ./contracts/scripts/disable_verifier.sh $(VERIFIER_ID)
+
+verifier_enable:
+	@echo "Enabling verifier with ID: $(VERIFIER_ID)"
+	@. contracts/scripts/.env && . contracts/scripts/enable_verifier.sh $(VERIFIER_ID)
+
+verifier_disable:
+	@echo "Disabling verifier with ID: $(VERIFIER_ID)"
+	@. contracts/scripts/.env && . contracts/scripts/disable_verifier.sh $(VERIFIER_ID)
+
 __BATCHER__:
 
 BURST_SIZE=5
@@ -295,6 +328,16 @@ batcher_send_risc0_task:
 		--rpc_url $(RPC_URL) \
 		--network $(NETWORK)
 
+batcher_send_risc0_task_no_pub_input:
+	@echo "Sending Risc0 fibonacci task to Batcher..."
+	@cd batcher/aligned/ && cargo run --release -- submit \
+		--proving_system Risc0 \
+		--proof ../../scripts/test_files/risc_zero/no_public_inputs/risc_zero_no_pub_input.proof \
+        --vm_program ../../scripts/test_files/risc_zero/no_public_inputs/no_pub_input_id.bin \
+		--proof_generator_addr 0x66f9664f97F2b50F62D13eA064982f936dE76657 \
+		--rpc_url $(RPC_URL) \
+		--payment_service_addr $(BATCHER_PAYMENTS_CONTRACT_ADDRESS)
+
 batcher_send_risc0_burst:
 	@echo "Sending Risc0 fibonacci task to Batcher..."
 	@cd batcher/aligned/ && cargo run --release -- submit \
@@ -436,6 +479,7 @@ generate_groth16_ineq_proof: ## Run the gnark_plonk_bn254_script
 	@go run scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go 1
 
 __METRICS__:
+# Prometheus and graphana
 run_metrics: ## Run metrics using metrics-docker-compose.yaml
 	@echo "Running metrics..."
 	@docker compose -f metrics-docker-compose.yaml up
@@ -474,9 +518,9 @@ upgrade_add_aggregator: ## Add Aggregator to Aligned Contracts
 	@echo "Adding Aggregator to Aligned Contracts..."
 	@. contracts/scripts/.env && . contracts/scripts/upgrade_add_aggregator_to_service_manager.sh
 
-upgrade_batcher_payments_add_type_hash: ## Add Type Hash to Batcher Payment Service
-	@echo "Adding Type Hash to Batcher Payment Service..."
-	@. contracts/scripts/.env && . contracts/scripts/upgrade_add_type_hash_to_batcher_payment_service.sh
+upgrade_initialize_disabled_verifiers:
+	@echo "Adding disabled verifiers to Aligned Service Manager..."
+	@. contracts/scripts/.env && . contracts/scripts/upgrade_disabled_verifiers_in_service_manager.sh
 
 deploy_verify_batch_inclusion_caller:
 	@echo "Deploying VerifyBatchInclusionCaller contract..."
@@ -536,6 +580,11 @@ generate_sp1_fibonacci_proof:
 	@mv scripts/test_files/sp1/fibonacci_proof_generator/script/sp1_fibonacci.proof scripts/test_files/sp1/
 	@echo "Fibonacci proof and ELF generated in scripts/test_files/sp1 folder"
 
+generate_risc_zero_empty_journal_proof:
+	@cd scripts/test_files/risc_zero/no_public_inputs && RUST_LOG=info cargo run --release
+	@echo "Fibonacci proof and ELF with empty journal generated in scripts/test_files/risc_zero/no_public_inputs folder"
+
+
 __RISC_ZERO_FFI__: ##
 build_risc_zero_macos:
 	@cd operator/risc_zero/lib && cargo build $(RELEASE_FLAG)
@@ -568,29 +617,15 @@ build_merkle_tree_macos:
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree/lib/libmerkle_tree.dylib
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
-build_merkle_tree_macos_old:
-	@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.dylib operator/merkle_tree_old/lib/libmerkle_tree.dylib
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
-
 build_merkle_tree_linux:
 	@cd operator/merkle_tree/lib && cargo build $(RELEASE_FLAG)
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree/lib/libmerkle_tree.so
 	@cp operator/merkle_tree/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree/lib/libmerkle_tree.a
 
-build_merkle_tree_linux_old:
-	@cd operator/merkle_tree_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.so operator/merkle_tree_old/lib/libmerkle_tree.so
-	@cp operator/merkle_tree_old/lib/target/$(TARGET_REL_PATH)/libmerkle_tree.a operator/merkle_tree_old/lib/libmerkle_tree.a
-
 test_merkle_tree_rust_ffi:
 	@echo "Testing Merkle Tree Rust FFI source code..."
 	@cd operator/merkle_tree/lib && RUST_MIN_STACK=83886080 cargo t --release
 
-test_merkle_tree_rust_ffi_old:
-	@echo "Testing Old Merkle Tree Rust FFI source code..."
-	@cd operator/merkle_tree_old/lib && RUST_MIN_STACK=83886080 cargo t --release
-
 test_merkle_tree_go_bindings_macos: build_merkle_tree_macos
 	@echo "Testing Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree/... -v
@@ -603,9 +638,6 @@ test_merkle_tree_old_go_bindings_macos: build_merkle_tree_macos_old
 	@echo "Testing Old Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree_old/... -v
 
-test_merkle_tree_go_bindings_linux_old: build_merkle_tree_linux_old
-	@echo "Testing Merkle Tree Go bindings..."
-	go test ./operator/merkle_tree_old/... -v
 
 __MINA_FFI__: ##
 build_mina_macos:
@@ -660,7 +692,6 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 	@$(MAKE) build_sp1_macos
 	@$(MAKE) build_risc_zero_macos
 	@$(MAKE) build_merkle_tree_macos
-	@$(MAKE) build_merkle_tree_macos_old
 	@$(MAKE) build_mina_macos
 	@$(MAKE) build_mina_account_macos
 	@echo "All macOS FFIs built successfully."
@@ -670,12 +701,10 @@ build_all_ffi_linux: ## Build all FFIs for Linux
 	@$(MAKE) build_sp1_linux
 	@$(MAKE) build_risc_zero_linux
 	@$(MAKE) build_merkle_tree_linux
-	@$(MAKE) build_merkle_tree_linux_old
 	@$(MAKE) build_mina_linux
 	@$(MAKE) build_mina_account_linux
 	@echo "All Linux FFIs built successfully."
 
-
 __EXPLORER__:
 run_explorer: explorer_run_db explorer_ecto_setup_db
 	@cd explorer/ && \
@@ -758,11 +787,19 @@ tracker_dump_db:
 	@echo "Dumped database successfully to /operator_tracker"
 
 __TELEMETRY__:
+# Collector, Jaeger and Elixir API
+telemetry_full_start: open_telemetry_start telemetry_start
+
+# Collector and Jaeger
 open_telemetry_start: ## Run open telemetry services using telemetry-docker-compose.yaml
-	## TODO(juarce) ADD DOCKER COMPOSE
 	@echo "Running telemetry..."
 	@docker compose -f telemetry-docker-compose.yaml up -d
 
+open_telemetry_prod_start: ## Run open telemetry services with Cassandra using telemetry-prod-docker-compose.yaml
+	@echo "Running telemetry for Prod..."
+	@docker compose -f telemetry-prod-docker-compose.yaml up -d
+
+# Elixir API
 telemetry_start: telemetry_run_db telemetry_ecto_migrate ## Run Telemetry API
 	@cd telemetry_api && \
 	 	./start.sh	

README.md

@@ -4,3 +4,19 @@
 > To be used in testnet only.
 
 To learn more about Aligned and how to use it, refer to the [docs page](https://docs.alignedlayer.com/) or [docs folder](./docs/).
+
+# Acknowledgements
+
+Aligned wouldn't be possible without the valuable work of these people:
+- [Ethereum](https://ethereum.org/en/), for being the network we all love
+- [EigenLayer](https://www.eigenlayer.xyz) for providing restaking and AVS
+- Shafi Goldwasser, Silvio Micali, and Charles Rackoff for [inventing ZK proofs](http://people.csail.mit.edu/silvio/Selected%20Scientific%20Papers/Proof%20Systems/The_Knowledge_Complexity_Of_Interactive_Proof_Systems.pdf)
+- Eli Ben-Sasson and [Starkware](https://starkware.co) for making them practical
+- [Consensys](https://consensys.io) for implementing the GROTH16 and PLONK protocols in [GNARK](https://docs.gnark.consensys.io)
+- [RiscZero](https://risczero.com) for its namesake [proving system](https://github.com/risc0/risc0)
+- [SuccintLabs](https://succinct.xyz) for creating [SP1](https://github.com/succinctlabs/sp1)
+- [Paradigm](https://www.paradigm.xyz) for maintaining the [Ethers crate](https://crates.io/crates/ethers) and [Foundry](https://github.com/foundry-rs/foundry)
+- [LambdaClass](https://lambdaclass.com) for writing [lambdaworks](https://github.com/lambdaclass/lambdaworks)
+
+
+If you believe we missed someone, contact us! We're always happy to give credit where it's due.

aggregator/cmd/main.go

@@ -49,6 +49,15 @@ func aggregatorMain(ctx *cli.Context) error {
 		return err
 	}
 
+	// Supervisor revives garbage collector
+	go func() {
+		for {
+			log.Println("Starting Garbage collector")
+			aggregator.ClearTasksFromMaps()
+			log.Println("Garbage collector panicked, Supervisor restarting")
+		}
+	}()
+
 	// Listen for new task created in the ServiceManager contract in a separate goroutine, both V1 and V2 subscriptions:
 	go func() {
 		listenErr := aggregator.SubscribeToNewTasks()