From 66dcb37e32e34f552a63c1e638a57dd251846f63 Mon Sep 17 00:00:00 2001 From: Sasha Syrotenko Date: Fri, 15 Nov 2024 11:55:23 +0200 Subject: [PATCH] [NUF-170] Move the registries from Nethermind to Nuffle (#313) --- .github/workflows/build-and-push.yml | 2 +- .github/workflows/compose-test.yml | 16 ++-- .github/workflows/integration-tests.yml | 6 +- Cargo.toml | 2 +- Makefile | 12 +-- aggregator/aggregator.go | 20 ++-- aggregator/aggregator_test.go | 22 ++--- aggregator/blsagg/message_blsagg.go | 4 +- aggregator/cmd/main.go | 8 +- aggregator/database/database.go | 6 +- aggregator/database/database_test.go | 10 +- aggregator/database/gen.go | 2 +- aggregator/database/mocks/database.go | 8 +- .../models/message_bls_aggregation.go | 2 +- .../database/models/operator_set_update.go | 4 +- .../database/models/state_root_update.go | 2 +- aggregator/gen.go | 10 +- aggregator/mocks/chain.go | 6 +- aggregator/mocks/message_blsagg.go | 6 +- .../mocks/operator_registrations_inmemory.go | 4 +- aggregator/mocks/rest_aggregator.go | 6 +- aggregator/mocks/rollup_broadcaster.go | 8 +- aggregator/mocks/rpc_aggregator.go | 6 +- aggregator/rest_server/metrics.go | 2 +- aggregator/rest_server/server.go | 4 +- aggregator/rest_server/server_test.go | 8 +- aggregator/rollup_broadcaster.go | 10 +- aggregator/rollup_writer.go | 8 +- aggregator/rpc_server/metrics.go | 2 +- aggregator/rpc_server/server.go | 8 +- aggregator/rpc_server/server_test.go | 6 +- aggregator/rpc_server_test.go | 8 +- aggregator/types/types.go | 2 +- cli/actions/deposit_into_strategy.go | 4 +- cli/actions/print_operator_status.go | 4 +- cli/actions/register_operator_with_avs.go | 4 +- .../register_operator_with_eigenlayer.go | 4 +- cli/actions/utils.go | 2 +- cli/main.go | 4 +- config-files/aggregator-docker-compose.yaml | 2 +- .../operator0-docker-compose.anvil.yaml | 6 +- .../operator1-docker-compose.anvil.yaml | 6 +- config-files/plugin.anvil.yaml | 4 +- config-files/relayer1-docker-compose.yaml | 2 +- core/chainio/avs_reader.go | 12 +-- core/chainio/avs_subscriber.go | 4 +- core/chainio/avs_writer.go | 6 +- core/chainio/bindings.go | 10 +- core/chainio/gen.go | 6 +- core/chainio/mocks/avs_reader.go | 12 +-- core/chainio/mocks/avs_subscriber.go | 8 +- core/chainio/mocks/avs_writer.go | 8 +- core/config/config.go | 2 +- core/metricable.go | 2 +- core/safeclient/client_test.go | 2 +- core/safeclient/gen.go | 2 +- core/safeclient/mocks/safe_client.go | 4 +- core/types/messages/aggregation.go | 8 +- core/types/messages/checkpoint_task.go | 8 +- core/types/messages/operator_set_update.go | 6 +- core/types/messages/state_root_update.go | 6 +- core/utils.go | 2 +- docker-compose.yml | 94 +++++++++---------- docs/docs/operator/registration.md | 8 +- docs/docs/operator/setup.md | 34 +++---- docs/docusaurus.config.js | 10 +- go.mod | 2 +- operator/attestor/attestor.go | 10 +- operator/attestor/notifier.go | 2 +- operator/attestor/notifier_test.go | 2 +- operator/avs_manager.go | 12 +-- operator/cmd/main.go | 6 +- operator/consumer/cmd/main.go | 2 +- operator/consumer/consumer.go | 2 +- operator/gen.go | 2 +- operator/mocks/attestor.go | 6 +- operator/mocks/consumer.go | 2 +- operator/mocks/rpc_client.go | 6 +- operator/operator.go | 14 +-- operator/operator_test.go | 18 ++-- operator/rpc_client.go | 4 +- plugin/cmd/operator_plugin.go | 8 +- prometheus/prometheus.yml | 16 ++-- relayer/cmd/main.go | 4 +- relayer/relayer.go | 6 +- setup/aggregator/docker-compose.yml | 20 ++-- setup/aggregator/prometheus/prometheus.yml | 4 +- setup/operator/config/operator.yaml | 6 +- setup/operator/docker-compose.yml | 42 ++++----- setup/operator/prometheus/prometheus.yml | 8 +- setup/plugin/config/operator.yaml | 4 +- setup/plugin/register.sh | 4 +- setup/relayer/docker-compose.yml | 22 ++--- setup/relayer/prometheus/prometheus.yml | 6 +- static/avs_metadata.json | 2 +- tests/integration/integration_test.go | 28 +++--- tests/integration/registration_test.go | 18 ++-- tests/integration/utils/containers.go | 8 +- 98 files changed, 411 insertions(+), 411 deletions(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index ff08a0b7..4b5b7f43 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -13,7 +13,7 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: nethermindeth/near-sffl + IMAGE_NAME: nuffle-labs/nffl jobs: custom-build: diff --git a/.github/workflows/compose-test.yml b/.github/workflows/compose-test.yml index f3cd0cab..a12fb5cd 100644 --- a/.github/workflows/compose-test.yml +++ b/.github/workflows/compose-test.yml @@ -28,7 +28,7 @@ jobs: load: true context: . file: ./indexer/Dockerfile - tags: near-sffl-indexer + tags: nffl-indexer cache-from: type=gha,scope=indexer cache-to: type=gha,mode=max,scope=indexer @@ -38,7 +38,7 @@ jobs: load: true context: . file: ./relayer/cmd/Dockerfile - tags: near-sffl-test-relayer + tags: nffl-test-relayer cache-from: type=gha,scope=relayer cache-to: type=gha,mode=max,scope=relayer @@ -48,7 +48,7 @@ jobs: load: true context: . file: ./aggregator/cmd/Dockerfile - tags: near-sffl-aggregator + tags: nffl-aggregator cache-from: type=gha,scope=aggregator cache-to: type=gha,mode=max,scope=aggregator @@ -58,7 +58,7 @@ jobs: load: true context: . file: ./operator/cmd/Dockerfile - tags: near-sffl-operator + tags: nffl-operator cache-from: type=gha,scope=operator cache-to: type=gha,mode=max,scope=operator @@ -77,13 +77,13 @@ jobs: run: | containers=( "nffl_operator1-health_1" - "near-sffl-operator1" + "nffl-operator1" "nffl_operator0-health_1" - "near-sffl-operator0" + "nffl-operator0" "rollup1-relayer" "rollup0-relayer" - "near-sffl-indexer" - "near-sffl-aggregator" + "nffl-indexer" + "nffl-aggregator" "nffl_agreator-health_1" "mainnet-anvil" "prometheus" diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 39c12423..7775ae40 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -29,7 +29,7 @@ jobs: load: true context: . file: ./indexer/Dockerfile - tags: near-sffl-indexer + tags: nffl-indexer cache-from: type=gha,scope=indexer cache-to: type=gha,mode=max,scope=indexer @@ -39,7 +39,7 @@ jobs: load: true context: . file: ./relayer/cmd/Dockerfile - tags: near-sffl-test-relayer + tags: nffl-test-relayer cache-from: type=gha,scope=relayer cache-to: type=gha,mode=max,scope=relayer @@ -49,7 +49,7 @@ jobs: load: true context: . file: ./plugin/cmd/Dockerfile - tags: near-sffl-operator-plugin + tags: nffl-operator-plugin cache-from: type=gha,scope=plugin cache-to: type=gha,mode=max,scope=plugin diff --git a/Cargo.toml b/Cargo.toml index 0c8fbf85..6667c961 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ members = [ [workspace.package] version = "0.0.1" edition = "2021" -repository = "https://github.com/NethermindEth/near-sffl" +repository = "https://github.com/Nuffle-Labs/nffl" [workspace.dependencies] alloy = { version = "0.4.2", features = ["full", "node-bindings", "rpc-types-debug", "rpc-types-trace", "json-rpc", "rpc-client", "serde", "json-abi", "eip712"] } diff --git a/Makefile b/Makefile index 834bd035..8da0ddbe 100644 --- a/Makefile +++ b/Makefile @@ -49,15 +49,15 @@ bindings: ## generates contract bindings ___DOCKER___: ## docker-build-indexer: - docker build -t near-sffl-indexer -f ./indexer/Dockerfile . + docker build -t nffl-indexer -f ./indexer/Dockerfile . docker-build-relayer: - docker build -t near-sffl-test-relayer -f ./relayer/cmd/Dockerfile . + docker build -t nffl-test-relayer -f ./relayer/cmd/Dockerfile . docker-build-aggregator: - docker build -t near-sffl-aggregator -f ./aggregator/cmd/Dockerfile . + docker build -t nffl-aggregator -f ./aggregator/cmd/Dockerfile . docker-build-operator: - docker build -t near-sffl-operator -f ./operator/cmd/Dockerfile . + docker build -t nffl-operator -f ./operator/cmd/Dockerfile . docker-build-plugin: - docker build -t near-sffl-operator-plugin -f ./plugin/cmd/Dockerfile . + docker build -t nffl-operator-plugin -f ./plugin/cmd/Dockerfile . docker-build-images: docker-build-indexer docker-build-relayer docker-build-aggregator docker-build-operator docker-build-plugin ## builds and publishes indexer, operator and aggregator docker images docker-start-everything: docker-build-images ## starts aggregator and operator docker containers docker compose up @@ -89,7 +89,7 @@ send-fund: ## sends fund to the first operator saved in tests/keys/ecdsa/* ____OFFCHAIN_SOFTWARE___: ## start-aggregator: ## go run aggregator/cmd/main.go --config config-files/aggregator.yaml \ - --sffl-deployment ${DEPLOYMENT_FILES_DIR}/sffl_avs_deployment_output.json \ + --nffl-deployment ${DEPLOYMENT_FILES_DIR}/sffl_avs_deployment_output.json \ --ecdsa-private-key ${AGGREGATOR_ECDSA_PRIV_KEY} \ 2>&1 | zap-pretty diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go index 526fa690..1b22a553 100644 --- a/aggregator/aggregator.go +++ b/aggregator/aggregator.go @@ -18,16 +18,16 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/aggregator/blsagg" - "github.com/NethermindEth/near-sffl/aggregator/database" - "github.com/NethermindEth/near-sffl/aggregator/types" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/safeclient" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator/blsagg" + "github.com/Nuffle-Labs/nffl/aggregator/database" + "github.com/Nuffle-Labs/nffl/aggregator/types" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/safeclient" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) const ( diff --git a/aggregator/aggregator_test.go b/aggregator/aggregator_test.go index 7dcde23a..77710909 100644 --- a/aggregator/aggregator_test.go +++ b/aggregator/aggregator_test.go @@ -15,17 +15,17 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" gethtypes "github.com/ethereum/go-ethereum/core/types" - "github.com/NethermindEth/near-sffl/aggregator/blsagg" - dbmocks "github.com/NethermindEth/near-sffl/aggregator/database/mocks" - "github.com/NethermindEth/near-sffl/aggregator/database/models" - aggmocks "github.com/NethermindEth/near-sffl/aggregator/mocks" - "github.com/NethermindEth/near-sffl/aggregator/types" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - chainiomocks "github.com/NethermindEth/near-sffl/core/chainio/mocks" - safeclientmocks "github.com/NethermindEth/near-sffl/core/safeclient/mocks" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator/blsagg" + dbmocks "github.com/Nuffle-Labs/nffl/aggregator/database/mocks" + "github.com/Nuffle-Labs/nffl/aggregator/database/models" + aggmocks "github.com/Nuffle-Labs/nffl/aggregator/mocks" + "github.com/Nuffle-Labs/nffl/aggregator/types" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + chainiomocks "github.com/Nuffle-Labs/nffl/core/chainio/mocks" + safeclientmocks "github.com/Nuffle-Labs/nffl/core/safeclient/mocks" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) var MOCK_OPERATOR_ID = [32]byte{207, 73, 226, 221, 104, 100, 123, 41, 192, 3, 9, 119, 90, 83, 233, 159, 231, 151, 245, 96, 150, 48, 144, 27, 102, 253, 39, 101, 1, 26, 135, 173} diff --git a/aggregator/blsagg/message_blsagg.go b/aggregator/blsagg/message_blsagg.go index 3d556ff1..4b486f09 100644 --- a/aggregator/blsagg/message_blsagg.go +++ b/aggregator/blsagg/message_blsagg.go @@ -18,8 +18,8 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/ethereum/go-ethereum/accounts/abi/bind" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) var ( diff --git a/aggregator/cmd/main.go b/aggregator/cmd/main.go index a9ad7736..b1889d5e 100644 --- a/aggregator/cmd/main.go +++ b/aggregator/cmd/main.go @@ -11,10 +11,10 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/urfave/cli" - "github.com/NethermindEth/near-sffl/aggregator" - restserver "github.com/NethermindEth/near-sffl/aggregator/rest_server" - rpcserver "github.com/NethermindEth/near-sffl/aggregator/rpc_server" - "github.com/NethermindEth/near-sffl/core/config" + "github.com/Nuffle-Labs/nffl/aggregator" + restserver "github.com/Nuffle-Labs/nffl/aggregator/rest_server" + rpcserver "github.com/Nuffle-Labs/nffl/aggregator/rpc_server" + "github.com/Nuffle-Labs/nffl/core/config" ) var ( diff --git a/aggregator/database/database.go b/aggregator/database/database.go index 03eadaa5..81706d00 100644 --- a/aggregator/database/database.go +++ b/aggregator/database/database.go @@ -13,9 +13,9 @@ import ( "gorm.io/gorm" "gorm.io/gorm/logger" - "github.com/NethermindEth/near-sffl/aggregator/database/models" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator/database/models" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) type Databaser interface { diff --git a/aggregator/database/database_test.go b/aggregator/database/database_test.go index 60cd8db0..a4618b87 100644 --- a/aggregator/database/database_test.go +++ b/aggregator/database/database_test.go @@ -9,11 +9,11 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - "github.com/NethermindEth/near-sffl/aggregator/database" - "github.com/NethermindEth/near-sffl/aggregator/database/models" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/tests" + "github.com/Nuffle-Labs/nffl/aggregator/database" + "github.com/Nuffle-Labs/nffl/aggregator/database/models" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/tests" ) func TestFetchUnknownStateRootUpdate(t *testing.T) { diff --git a/aggregator/database/gen.go b/aggregator/database/gen.go index c3803270..d5e73d2c 100644 --- a/aggregator/database/gen.go +++ b/aggregator/database/gen.go @@ -1,3 +1,3 @@ package database -//go:generate mockgen -destination=./mocks/database.go -package=mocks github.com/NethermindEth/near-sffl/aggregator/database Databaser +//go:generate mockgen -destination=./mocks/database.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator/database Databaser diff --git a/aggregator/database/mocks/database.go b/aggregator/database/mocks/database.go index f5f31453..18c5909b 100644 --- a/aggregator/database/mocks/database.go +++ b/aggregator/database/mocks/database.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator/database (interfaces: Databaser) +// Source: github.com/Nuffle-Labs/nffl/aggregator/database (interfaces: Databaser) // // Generated by this command: // -// mockgen -destination=./mocks/database.go -package=mocks github.com/NethermindEth/near-sffl/aggregator/database Databaser +// mockgen -destination=./mocks/database.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator/database Databaser // // Package mocks is a generated GoMock package. package mocks @@ -11,8 +11,8 @@ package mocks import ( reflect "reflect" - models "github.com/NethermindEth/near-sffl/aggregator/database/models" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + models "github.com/Nuffle-Labs/nffl/aggregator/database/models" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" prometheus "github.com/prometheus/client_golang/prometheus" gomock "go.uber.org/mock/gomock" gorm "gorm.io/gorm" diff --git a/aggregator/database/models/message_bls_aggregation.go b/aggregator/database/models/message_bls_aggregation.go index 495a3ea6..ebc6adb0 100644 --- a/aggregator/database/models/message_bls_aggregation.go +++ b/aggregator/database/models/message_bls_aggregation.go @@ -4,7 +4,7 @@ import ( "github.com/Layr-Labs/eigensdk-go/crypto/bls" "gorm.io/gorm" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) type MessageBlsAggregation struct { diff --git a/aggregator/database/models/operator_set_update.go b/aggregator/database/models/operator_set_update.go index 29b2762b..3da30223 100644 --- a/aggregator/database/models/operator_set_update.go +++ b/aggregator/database/models/operator_set_update.go @@ -3,8 +3,8 @@ package models import ( "gorm.io/gorm" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) type OperatorSetUpdateMessage struct { diff --git a/aggregator/database/models/state_root_update.go b/aggregator/database/models/state_root_update.go index e06847ce..21aa51fc 100644 --- a/aggregator/database/models/state_root_update.go +++ b/aggregator/database/models/state_root_update.go @@ -1,7 +1,7 @@ package models import ( - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/core/types/messages" "gorm.io/gorm" ) diff --git a/aggregator/gen.go b/aggregator/gen.go index 603679ae..89297b70 100644 --- a/aggregator/gen.go +++ b/aggregator/gen.go @@ -1,8 +1,8 @@ package aggregator -//go:generate mockgen -destination=./mocks/rest_aggregator.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RestAggregatorer -//go:generate mockgen -destination=./mocks/rpc_aggregator.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RpcAggregatorer -//go:generate mockgen -destination=./mocks/message_blsagg.go -package=mocks github.com/NethermindEth/near-sffl/aggregator/blsagg MessageBlsAggregationService -//go:generate mockgen -destination=./mocks/rollup_broadcaster.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RollupBroadcasterer -//go:generate mockgen -destination=./mocks/operator_registrations_inmemory.go -package=mocks github.com/NethermindEth/near-sffl/aggregator OperatorRegistrationsService +//go:generate mockgen -destination=./mocks/rest_aggregator.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RestAggregatorer +//go:generate mockgen -destination=./mocks/rpc_aggregator.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RpcAggregatorer +//go:generate mockgen -destination=./mocks/message_blsagg.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator/blsagg MessageBlsAggregationService +//go:generate mockgen -destination=./mocks/rollup_broadcaster.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RollupBroadcasterer +//go:generate mockgen -destination=./mocks/operator_registrations_inmemory.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator OperatorRegistrationsService //go:generate mockgen -destination=./mocks/eth_client.go -package=mocks github.com/Layr-Labs/eigensdk-go/chainio/clients/eth Client diff --git a/aggregator/mocks/chain.go b/aggregator/mocks/chain.go index bc5af735..8c6b115a 100644 --- a/aggregator/mocks/chain.go +++ b/aggregator/mocks/chain.go @@ -6,9 +6,9 @@ import ( opstateretriever "github.com/Layr-Labs/eigensdk-go/contracts/bindings/OperatorStateRetriever" "github.com/Layr-Labs/eigensdk-go/crypto/bls" - "github.com/NethermindEth/near-sffl/aggregator/types" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - coretypes "github.com/NethermindEth/near-sffl/core/types" + "github.com/Nuffle-Labs/nffl/aggregator/types" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + coretypes "github.com/Nuffle-Labs/nffl/core/types" ) // ====== TaskManager Mocks ====== diff --git a/aggregator/mocks/message_blsagg.go b/aggregator/mocks/message_blsagg.go index 4d82ffea..6a2cb43e 100644 --- a/aggregator/mocks/message_blsagg.go +++ b/aggregator/mocks/message_blsagg.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator/blsagg (interfaces: MessageBlsAggregationService) +// Source: github.com/Nuffle-Labs/nffl/aggregator/blsagg (interfaces: MessageBlsAggregationService) // // Generated by this command: // -// mockgen -destination=./mocks/message_blsagg.go -package=mocks github.com/NethermindEth/near-sffl/aggregator/blsagg MessageBlsAggregationService +// mockgen -destination=./mocks/message_blsagg.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator/blsagg MessageBlsAggregationService // // Package mocks is a generated GoMock package. package mocks @@ -15,7 +15,7 @@ import ( bls "github.com/Layr-Labs/eigensdk-go/crypto/bls" types "github.com/Layr-Labs/eigensdk-go/types" - blsagg "github.com/NethermindEth/near-sffl/aggregator/blsagg" + blsagg "github.com/Nuffle-Labs/nffl/aggregator/blsagg" gomock "go.uber.org/mock/gomock" ) diff --git a/aggregator/mocks/operator_registrations_inmemory.go b/aggregator/mocks/operator_registrations_inmemory.go index 16fddc21..e2260333 100644 --- a/aggregator/mocks/operator_registrations_inmemory.go +++ b/aggregator/mocks/operator_registrations_inmemory.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator (interfaces: OperatorRegistrationsService) +// Source: github.com/Nuffle-Labs/nffl/aggregator (interfaces: OperatorRegistrationsService) // // Generated by this command: // -// mockgen -destination=./mocks/operator_registrations_inmemory.go -package=mocks github.com/NethermindEth/near-sffl/aggregator OperatorRegistrationsService +// mockgen -destination=./mocks/operator_registrations_inmemory.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator OperatorRegistrationsService // // Package mocks is a generated GoMock package. package mocks diff --git a/aggregator/mocks/rest_aggregator.go b/aggregator/mocks/rest_aggregator.go index 95c9b132..b5c019c6 100644 --- a/aggregator/mocks/rest_aggregator.go +++ b/aggregator/mocks/rest_aggregator.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator (interfaces: RestAggregatorer) +// Source: github.com/Nuffle-Labs/nffl/aggregator (interfaces: RestAggregatorer) // // Generated by this command: // -// mockgen -destination=./mocks/rest_aggregator.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RestAggregatorer +// mockgen -destination=./mocks/rest_aggregator.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RestAggregatorer // // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ package mocks import ( reflect "reflect" - types "github.com/NethermindEth/near-sffl/aggregator/types" + types "github.com/Nuffle-Labs/nffl/aggregator/types" gomock "go.uber.org/mock/gomock" ) diff --git a/aggregator/mocks/rollup_broadcaster.go b/aggregator/mocks/rollup_broadcaster.go index b048ec4b..638de23d 100644 --- a/aggregator/mocks/rollup_broadcaster.go +++ b/aggregator/mocks/rollup_broadcaster.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator (interfaces: RollupBroadcasterer) +// Source: github.com/Nuffle-Labs/nffl/aggregator (interfaces: RollupBroadcasterer) // // Generated by this command: // -// mockgen -destination=./mocks/rollup_broadcaster.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RollupBroadcasterer +// mockgen -destination=./mocks/rollup_broadcaster.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RollupBroadcasterer // // Package mocks is a generated GoMock package. package mocks @@ -12,8 +12,8 @@ import ( context "context" reflect "reflect" - contractSFFLRegistryRollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + contractSFFLRegistryRollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" gomock "go.uber.org/mock/gomock" ) diff --git a/aggregator/mocks/rpc_aggregator.go b/aggregator/mocks/rpc_aggregator.go index 2768a7ed..81b316a0 100644 --- a/aggregator/mocks/rpc_aggregator.go +++ b/aggregator/mocks/rpc_aggregator.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/aggregator (interfaces: RpcAggregatorer) +// Source: github.com/Nuffle-Labs/nffl/aggregator (interfaces: RpcAggregatorer) // // Generated by this command: // -// mockgen -destination=./mocks/rpc_aggregator.go -package=mocks github.com/NethermindEth/near-sffl/aggregator RpcAggregatorer +// mockgen -destination=./mocks/rpc_aggregator.go -package=mocks github.com/Nuffle-Labs/nffl/aggregator RpcAggregatorer // // Package mocks is a generated GoMock package. package mocks @@ -13,7 +13,7 @@ import ( reflect "reflect" types "github.com/Layr-Labs/eigensdk-go/types" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" gomock "go.uber.org/mock/gomock" ) diff --git a/aggregator/rest_server/metrics.go b/aggregator/rest_server/metrics.go index 44497ee4..d0ac5481 100644 --- a/aggregator/rest_server/metrics.go +++ b/aggregator/rest_server/metrics.go @@ -3,7 +3,7 @@ package rest_server import ( "fmt" - "github.com/NethermindEth/near-sffl/aggregator" + "github.com/Nuffle-Labs/nffl/aggregator" "github.com/prometheus/client_golang/prometheus" ) diff --git a/aggregator/rest_server/server.go b/aggregator/rest_server/server.go index 7a2b9d13..0e28c43c 100644 --- a/aggregator/rest_server/server.go +++ b/aggregator/rest_server/server.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/mux" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/aggregator" - "github.com/NethermindEth/near-sffl/core" + "github.com/Nuffle-Labs/nffl/aggregator" + "github.com/Nuffle-Labs/nffl/core" ) var ( diff --git a/aggregator/rest_server/server_test.go b/aggregator/rest_server/server_test.go index a512b84a..9a16e41f 100644 --- a/aggregator/rest_server/server_test.go +++ b/aggregator/rest_server/server_test.go @@ -4,9 +4,9 @@ import ( "encoding/json" "fmt" sdklogging "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/NethermindEth/near-sffl/aggregator/mocks" - "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/tests" + "github.com/Nuffle-Labs/nffl/aggregator/mocks" + "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/tests" "net/http" "net/http/httptest" "testing" @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" - aggtypes "github.com/NethermindEth/near-sffl/aggregator/types" + aggtypes "github.com/Nuffle-Labs/nffl/aggregator/types" ) func TestGetStateRootUpdateAggregation(t *testing.T) { diff --git a/aggregator/rollup_broadcaster.go b/aggregator/rollup_broadcaster.go index 4c18634c..57db3442 100644 --- a/aggregator/rollup_broadcaster.go +++ b/aggregator/rollup_broadcaster.go @@ -11,11 +11,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - registryrollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/types/messages" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) const ( diff --git a/aggregator/rollup_writer.go b/aggregator/rollup_writer.go index 3dfe144f..27428070 100644 --- a/aggregator/rollup_writer.go +++ b/aggregator/rollup_writer.go @@ -13,10 +13,10 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - registryrollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/safeclient" - "github.com/NethermindEth/near-sffl/core/types/messages" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) const ( diff --git a/aggregator/rpc_server/metrics.go b/aggregator/rpc_server/metrics.go index 67c725d1..0ae713a8 100644 --- a/aggregator/rpc_server/metrics.go +++ b/aggregator/rpc_server/metrics.go @@ -2,7 +2,7 @@ package rpc_server import ( "fmt" - "github.com/NethermindEth/near-sffl/aggregator" + "github.com/Nuffle-Labs/nffl/aggregator" "github.com/prometheus/client_golang/prometheus" ) diff --git a/aggregator/rpc_server/server.go b/aggregator/rpc_server/server.go index 97b0384e..9d4d1b4c 100644 --- a/aggregator/rpc_server/server.go +++ b/aggregator/rpc_server/server.go @@ -6,15 +6,15 @@ import ( "net/rpc" "strings" - "github.com/NethermindEth/near-sffl/aggregator/blsagg" - "github.com/NethermindEth/near-sffl/core" + "github.com/Nuffle-Labs/nffl/aggregator/blsagg" + "github.com/Nuffle-Labs/nffl/core" "github.com/prometheus/client_golang/prometheus" "github.com/Layr-Labs/eigensdk-go/logging" eigentypes "github.com/Layr-Labs/eigensdk-go/types" - "github.com/NethermindEth/near-sffl/aggregator" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) var ( diff --git a/aggregator/rpc_server/server_test.go b/aggregator/rpc_server/server_test.go index 2fc12563..e9a0310e 100644 --- a/aggregator/rpc_server/server_test.go +++ b/aggregator/rpc_server/server_test.go @@ -6,9 +6,9 @@ import ( "github.com/Layr-Labs/eigensdk-go/crypto/bls" "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/NethermindEth/near-sffl/aggregator/mocks" - "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator/mocks" + "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" "github.com/stretchr/testify/assert" "go.uber.org/mock/gomock" ) diff --git a/aggregator/rpc_server_test.go b/aggregator/rpc_server_test.go index f8a6373c..e16e688a 100644 --- a/aggregator/rpc_server_test.go +++ b/aggregator/rpc_server_test.go @@ -14,10 +14,10 @@ import ( "github.com/Layr-Labs/eigensdk-go/crypto/bls" eigentypes "github.com/Layr-Labs/eigensdk-go/types" - "github.com/NethermindEth/near-sffl/aggregator/types" - "github.com/NethermindEth/near-sffl/core" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/aggregator/types" + "github.com/Nuffle-Labs/nffl/core" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) func TestProcessSignedCheckpointTaskResponse(t *testing.T) { diff --git a/aggregator/types/types.go b/aggregator/types/types.go index e1df6a02..1b3af4ef 100644 --- a/aggregator/types/types.go +++ b/aggregator/types/types.go @@ -4,7 +4,7 @@ import ( "time" eigentypes "github.com/Layr-Labs/eigensdk-go/types" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/core/types/messages" "github.com/ethereum/go-ethereum/common" ) diff --git a/cli/actions/deposit_into_strategy.go b/cli/actions/deposit_into_strategy.go index 601a96d4..0df8ffb3 100644 --- a/cli/actions/deposit_into_strategy.go +++ b/cli/actions/deposit_into_strategy.go @@ -4,8 +4,8 @@ import ( "fmt" "math/big" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/operator" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/operator" "github.com/ethereum/go-ethereum/common" "github.com/urfave/cli" ) diff --git a/cli/actions/print_operator_status.go b/cli/actions/print_operator_status.go index 05231089..ca626e1e 100644 --- a/cli/actions/print_operator_status.go +++ b/cli/actions/print_operator_status.go @@ -1,8 +1,8 @@ package actions import ( - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/operator" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/operator" "github.com/urfave/cli" ) diff --git a/cli/actions/register_operator_with_avs.go b/cli/actions/register_operator_with_avs.go index 33ad1de0..a8ff0d79 100644 --- a/cli/actions/register_operator_with_avs.go +++ b/cli/actions/register_operator_with_avs.go @@ -5,8 +5,8 @@ import ( "os" sdkecdsa "github.com/Layr-Labs/eigensdk-go/crypto/ecdsa" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/operator" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/operator" "github.com/urfave/cli" ) diff --git a/cli/actions/register_operator_with_eigenlayer.go b/cli/actions/register_operator_with_eigenlayer.go index c52aa02d..cff007f4 100644 --- a/cli/actions/register_operator_with_eigenlayer.go +++ b/cli/actions/register_operator_with_eigenlayer.go @@ -3,8 +3,8 @@ package actions import ( "github.com/urfave/cli" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/operator" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/operator" ) func RegisterOperatorWithEigenlayer(ctx *cli.Context) error { diff --git a/cli/actions/utils.go b/cli/actions/utils.go index e12a7d29..eddad9dc 100644 --- a/cli/actions/utils.go +++ b/cli/actions/utils.go @@ -5,7 +5,7 @@ import ( "log" sdkutils "github.com/Layr-Labs/eigensdk-go/utils" - optypes "github.com/NethermindEth/near-sffl/operator/types" + optypes "github.com/Nuffle-Labs/nffl/operator/types" ) func readNodeConfig(configPath string) (*optypes.NodeConfig, error) { diff --git a/cli/main.go b/cli/main.go index 555f5ae4..a6decfde 100644 --- a/cli/main.go +++ b/cli/main.go @@ -4,8 +4,8 @@ import ( "log" "os" - "github.com/NethermindEth/near-sffl/cli/actions" - "github.com/NethermindEth/near-sffl/core/config" + "github.com/Nuffle-Labs/nffl/cli/actions" + "github.com/Nuffle-Labs/nffl/core/config" "github.com/urfave/cli" ) diff --git a/config-files/aggregator-docker-compose.yaml b/config-files/aggregator-docker-compose.yaml index eed6f40f..85aca60d 100644 --- a/config-files/aggregator-docker-compose.yaml +++ b/config-files/aggregator-docker-compose.yaml @@ -16,4 +16,4 @@ rollup_ids_to_registry_addresses: # metrics related enable_metrics: true -metrics_ip_port_address: near-sffl-aggregator:9091 \ No newline at end of file +metrics_ip_port_address: nffl-aggregator:9091 \ No newline at end of file diff --git a/config-files/operator0-docker-compose.anvil.yaml b/config-files/operator0-docker-compose.anvil.yaml index 79e9ee14..5f6533bb 100644 --- a/config-files/operator0-docker-compose.anvil.yaml +++ b/config-files/operator0-docker-compose.anvil.yaml @@ -29,12 +29,12 @@ ecdsa_private_key_store_path: tests/keys/ecdsa/1/key.json bls_private_key_store_path: tests/keys/bls/1/key.json # address which the aggregator listens on for operator signed messages -aggregator_server_ip_port_address: near-sffl-aggregator:8090 +aggregator_server_ip_port_address: nffl-aggregator:8090 # avs node spec compliance https://eigen.nethermind.io/docs/spec/intro -eigen_metrics_ip_port_address: near-sffl-operator0:9090 +eigen_metrics_ip_port_address: nffl-operator0:9090 enable_metrics: true -node_api_ip_port_address: near-sffl-operator0:9010 +node_api_ip_port_address: nffl-operator0:9010 enable_node_api: true # we need to register the operator on startup when running the docker compose file diff --git a/config-files/operator1-docker-compose.anvil.yaml b/config-files/operator1-docker-compose.anvil.yaml index 1b190874..10738474 100644 --- a/config-files/operator1-docker-compose.anvil.yaml +++ b/config-files/operator1-docker-compose.anvil.yaml @@ -29,12 +29,12 @@ ecdsa_private_key_store_path: tests/keys/ecdsa/2/key.json bls_private_key_store_path: tests/keys/bls/2/key.json # address which the aggregator listens on for operator signed messages -aggregator_server_ip_port_address: near-sffl-aggregator:8090 +aggregator_server_ip_port_address: nffl-aggregator:8090 # avs node spec compliance https://eigen.nethermind.io/docs/spec/intro -eigen_metrics_ip_port_address: near-sffl-operator1:9091 +eigen_metrics_ip_port_address: nffl-operator1:9091 enable_metrics: true -node_api_ip_port_address: near-sffl-operator1:9011 +node_api_ip_port_address: nffl-operator1:9011 enable_node_api: true # we need to register the operator on startup when running the docker compose file diff --git a/config-files/plugin.anvil.yaml b/config-files/plugin.anvil.yaml index 4310383f..e16f8e59 100644 --- a/config-files/plugin.anvil.yaml +++ b/config-files/plugin.anvil.yaml @@ -11,5 +11,5 @@ eth_rpc_url: http://mainnet-anvil:8545 eth_ws_url: ws://mainnet-anvil:8545 # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/keys/ecdsa/1/key.json -bls_private_key_store_path: /near-sffl/keys/bls/1/key.json +ecdsa_private_key_store_path: /nffl/keys/ecdsa/1/key.json +bls_private_key_store_path: /nffl/keys/bls/1/key.json diff --git a/config-files/relayer1-docker-compose.yaml b/config-files/relayer1-docker-compose.yaml index dfa495c2..937c2b0e 100644 --- a/config-files/relayer1-docker-compose.yaml +++ b/config-files/relayer1-docker-compose.yaml @@ -2,5 +2,5 @@ production: false rpc_url: ws://rollup1-anvil:8547 da_account_id: da3.test.near key_path: /root/.near-credentials/localnet/da3.test.near.json -network: http://near-sffl-indexer:3030 +network: http://nffl-indexer:3030 metrics_ip_port_address: rollup1-relayer:9091 \ No newline at end of file diff --git a/core/chainio/avs_reader.go b/core/chainio/avs_reader.go index 46050ce5..34024c68 100644 --- a/core/chainio/avs_reader.go +++ b/core/chainio/avs_reader.go @@ -14,12 +14,12 @@ import ( "github.com/Layr-Labs/eigensdk-go/chainio/clients/eth" "github.com/Layr-Labs/eigensdk-go/logging" - erc20mock "github.com/NethermindEth/near-sffl/contracts/bindings/ERC20Mock" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/types/messages" + erc20mock "github.com/Nuffle-Labs/nffl/contracts/bindings/ERC20Mock" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) type AvsReaderer interface { diff --git a/core/chainio/avs_subscriber.go b/core/chainio/avs_subscriber.go index b11f9557..a6a70980 100644 --- a/core/chainio/avs_subscriber.go +++ b/core/chainio/avs_subscriber.go @@ -9,8 +9,8 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" ) type AvsSubscriberer interface { diff --git a/core/chainio/avs_writer.go b/core/chainio/avs_writer.go index 0f3338d1..2c38c924 100644 --- a/core/chainio/avs_writer.go +++ b/core/chainio/avs_writer.go @@ -3,8 +3,8 @@ package chainio import ( "context" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/types/messages" "github.com/Layr-Labs/eigensdk-go/chainio/clients/avsregistry" "github.com/Layr-Labs/eigensdk-go/chainio/clients/eth" @@ -14,7 +14,7 @@ import ( gethcommon "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" ) type AvsWriterer interface { diff --git a/core/chainio/bindings.go b/core/chainio/bindings.go index 98305f73..98a51c1a 100644 --- a/core/chainio/bindings.go +++ b/core/chainio/bindings.go @@ -8,11 +8,11 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" - erc20mock "github.com/NethermindEth/near-sffl/contracts/bindings/ERC20Mock" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - sfflregcoord "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryCoordinator" - csservicemanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLServiceManager" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" + erc20mock "github.com/Nuffle-Labs/nffl/contracts/bindings/ERC20Mock" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + sfflregcoord "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryCoordinator" + csservicemanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLServiceManager" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" ) type AvsManagersBindings struct { diff --git a/core/chainio/gen.go b/core/chainio/gen.go index 95d85ea3..9be4a684 100644 --- a/core/chainio/gen.go +++ b/core/chainio/gen.go @@ -1,5 +1,5 @@ package chainio -//go:generate mockgen -destination=./mocks/avs_subscriber.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsSubscriberer -//go:generate mockgen -destination=./mocks/avs_writer.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsWriterer -//go:generate mockgen -destination=./mocks/avs_reader.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsReaderer +//go:generate mockgen -destination=./mocks/avs_subscriber.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsSubscriberer +//go:generate mockgen -destination=./mocks/avs_writer.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsWriterer +//go:generate mockgen -destination=./mocks/avs_reader.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsReaderer diff --git a/core/chainio/mocks/avs_reader.go b/core/chainio/mocks/avs_reader.go index 0ff5beeb..ca20bab3 100644 --- a/core/chainio/mocks/avs_reader.go +++ b/core/chainio/mocks/avs_reader.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/core/chainio (interfaces: AvsReaderer) +// Source: github.com/Nuffle-Labs/nffl/core/chainio (interfaces: AvsReaderer) // // Generated by this command: // -// mockgen -destination=./mocks/avs_reader.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsReaderer +// mockgen -destination=./mocks/avs_reader.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsReaderer // // Package mocks is a generated GoMock package. package mocks @@ -15,10 +15,10 @@ import ( contractOperatorStateRetriever "github.com/Layr-Labs/eigensdk-go/contracts/bindings/OperatorStateRetriever" types "github.com/Layr-Labs/eigensdk-go/types" - contractERC20Mock "github.com/NethermindEth/near-sffl/contracts/bindings/ERC20Mock" - contractSFFLOperatorSetUpdateRegistry "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - contractSFFLTaskManager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + contractERC20Mock "github.com/Nuffle-Labs/nffl/contracts/bindings/ERC20Mock" + contractSFFLOperatorSetUpdateRegistry "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + contractSFFLTaskManager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" bind "github.com/ethereum/go-ethereum/accounts/abi/bind" common "github.com/ethereum/go-ethereum/common" gomock "go.uber.org/mock/gomock" diff --git a/core/chainio/mocks/avs_subscriber.go b/core/chainio/mocks/avs_subscriber.go index e858c7a5..430dba25 100644 --- a/core/chainio/mocks/avs_subscriber.go +++ b/core/chainio/mocks/avs_subscriber.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/core/chainio (interfaces: AvsSubscriberer) +// Source: github.com/Nuffle-Labs/nffl/core/chainio (interfaces: AvsSubscriberer) // // Generated by this command: // -// mockgen -destination=./mocks/avs_subscriber.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsSubscriberer +// mockgen -destination=./mocks/avs_subscriber.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsSubscriberer // // Package mocks is a generated GoMock package. package mocks @@ -13,8 +13,8 @@ import ( contractBLSApkRegistry "github.com/Layr-Labs/eigensdk-go/contracts/bindings/BLSApkRegistry" contractRegistryCoordinator "github.com/Layr-Labs/eigensdk-go/contracts/bindings/RegistryCoordinator" - contractSFFLOperatorSetUpdateRegistry "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - contractSFFLTaskManager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" + contractSFFLOperatorSetUpdateRegistry "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + contractSFFLTaskManager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" types "github.com/ethereum/go-ethereum/core/types" event "github.com/ethereum/go-ethereum/event" gomock "go.uber.org/mock/gomock" diff --git a/core/chainio/mocks/avs_writer.go b/core/chainio/mocks/avs_writer.go index 6565135a..a7677b87 100644 --- a/core/chainio/mocks/avs_writer.go +++ b/core/chainio/mocks/avs_writer.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/core/chainio (interfaces: AvsWriterer) +// Source: github.com/Nuffle-Labs/nffl/core/chainio (interfaces: AvsWriterer) // // Generated by this command: // -// mockgen -destination=./mocks/avs_writer.go -package=mocks github.com/NethermindEth/near-sffl/core/chainio AvsWriterer +// mockgen -destination=./mocks/avs_writer.go -package=mocks github.com/Nuffle-Labs/nffl/core/chainio AvsWriterer // // Package mocks is a generated GoMock package. package mocks @@ -17,8 +17,8 @@ import ( contractRegistryCoordinator "github.com/Layr-Labs/eigensdk-go/contracts/bindings/RegistryCoordinator" bls "github.com/Layr-Labs/eigensdk-go/crypto/bls" types "github.com/Layr-Labs/eigensdk-go/types" - contractSFFLTaskManager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + contractSFFLTaskManager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" common "github.com/ethereum/go-ethereum/common" types0 "github.com/ethereum/go-ethereum/core/types" gomock "go.uber.org/mock/gomock" diff --git a/core/config/config.go b/core/config/config.go index 0349083d..031c858c 100644 --- a/core/config/config.go +++ b/core/config/config.go @@ -183,7 +183,7 @@ var ( Usage: "Load configuration from `FILE`", } SFFLDeploymentFileFlag = cli.StringFlag{ - Name: "sffl-deployment", + Name: "nffl-deployment", Required: true, Usage: "Load SFFL contract addresses from `FILE`", } diff --git a/core/metricable.go b/core/metricable.go index 88608b64..ecda116a 100644 --- a/core/metricable.go +++ b/core/metricable.go @@ -5,7 +5,7 @@ import ( rpccalls "github.com/Layr-Labs/eigensdk-go/metrics/collectors/rpc_calls" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/core/safeclient" ) type Metricable interface { diff --git a/core/safeclient/client_test.go b/core/safeclient/client_test.go index 47e6facb..d2aba8dd 100644 --- a/core/safeclient/client_test.go +++ b/core/safeclient/client_test.go @@ -18,7 +18,7 @@ import ( "github.com/Layr-Labs/eigensdk-go/chainio/clients/eth" "github.com/Layr-Labs/eigensdk-go/chainio/mocks" "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/NethermindEth/near-sffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/core/safeclient" ) type MockNetwork struct { diff --git a/core/safeclient/gen.go b/core/safeclient/gen.go index 2d313bf6..73eba400 100644 --- a/core/safeclient/gen.go +++ b/core/safeclient/gen.go @@ -1,5 +1,5 @@ package safeclient -//go:generate mockgen -destination=./mocks/safe_client.go -package=mocks github.com/NethermindEth/near-sffl/core/safeclient SafeClient +//go:generate mockgen -destination=./mocks/safe_client.go -package=mocks github.com/Nuffle-Labs/nffl/core/safeclient SafeClient //go:generate mockgen -destination=./mocks/eth_client.go -package=mocks github.com/Layr-Labs/eigensdk-go/chainio/clients/eth Client //go:generate mockgen -destination=./mocks/subscription.go -package=mocks github.com/ethereum/go-ethereum Subscription diff --git a/core/safeclient/mocks/safe_client.go b/core/safeclient/mocks/safe_client.go index e1d11d10..215a6439 100644 --- a/core/safeclient/mocks/safe_client.go +++ b/core/safeclient/mocks/safe_client.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/core/safeclient (interfaces: SafeClient) +// Source: github.com/Nuffle-Labs/nffl/core/safeclient (interfaces: SafeClient) // // Generated by this command: // -// mockgen -destination=./mocks/safe_client.go -package=mocks github.com/NethermindEth/near-sffl/core/safeclient SafeClient +// mockgen -destination=./mocks/safe_client.go -package=mocks github.com/Nuffle-Labs/nffl/core/safeclient SafeClient // // Package mocks is a generated GoMock package. package mocks diff --git a/core/types/messages/aggregation.go b/core/types/messages/aggregation.go index 93a7933e..9cb8224f 100644 --- a/core/types/messages/aggregation.go +++ b/core/types/messages/aggregation.go @@ -3,10 +3,10 @@ package messages import ( "github.com/Layr-Labs/eigensdk-go/crypto/bls" - registryrollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - coretypes "github.com/NethermindEth/near-sffl/core/types" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + coretypes "github.com/Nuffle-Labs/nffl/core/types" ) type MessageBlsAggregation struct { diff --git a/core/types/messages/checkpoint_task.go b/core/types/messages/checkpoint_task.go index e97f5b26..20ef921a 100644 --- a/core/types/messages/checkpoint_task.go +++ b/core/types/messages/checkpoint_task.go @@ -8,10 +8,10 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/ethereum/go-ethereum/accounts/abi" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/smt" - coretypes "github.com/NethermindEth/near-sffl/core/types" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/smt" + coretypes "github.com/Nuffle-Labs/nffl/core/types" ) type CheckpointTaskResponse struct { diff --git a/core/types/messages/operator_set_update.go b/core/types/messages/operator_set_update.go index a35f2345..18ebd53e 100644 --- a/core/types/messages/operator_set_update.go +++ b/core/types/messages/operator_set_update.go @@ -9,9 +9,9 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/ethereum/go-ethereum/accounts/abi" - registryrollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - "github.com/NethermindEth/near-sffl/core" - coretypes "github.com/NethermindEth/near-sffl/core/types" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + "github.com/Nuffle-Labs/nffl/core" + coretypes "github.com/Nuffle-Labs/nffl/core/types" ) type OperatorSetUpdateMessage struct { diff --git a/core/types/messages/state_root_update.go b/core/types/messages/state_root_update.go index f6e77b94..7b343aa0 100644 --- a/core/types/messages/state_root_update.go +++ b/core/types/messages/state_root_update.go @@ -9,9 +9,9 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/ethereum/go-ethereum/accounts/abi" - servicemanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLServiceManager" - "github.com/NethermindEth/near-sffl/core" - coretypes "github.com/NethermindEth/near-sffl/core/types" + servicemanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLServiceManager" + "github.com/Nuffle-Labs/nffl/core" + coretypes "github.com/Nuffle-Labs/nffl/core/types" ) type StateRootUpdateMessage struct { diff --git a/core/utils.go b/core/utils.go index e51a918b..b587084f 100644 --- a/core/utils.go +++ b/core/utils.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/accounts/abi" "golang.org/x/crypto/sha3" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" ) func Keccak256(data []byte) [32]byte { diff --git a/docker-compose.yml b/docker-compose.yml index 1a79ad78..52fe708b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" networks: - near-sffl: - name: near-sffl + nffl: + name: nffl driver: bridge services: @@ -22,7 +22,7 @@ services: timeout: 3s retries: 30 networks: - - near-sffl + - nffl mainnet-anvil: image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 @@ -39,7 +39,7 @@ services: timeout: 10s retries: 5 networks: - - near-sffl + - nffl mainnet-anvil-setup: image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 @@ -56,7 +56,7 @@ services: environment: - ETH_RPC_URL=http://mainnet-anvil:8545 networks: - - near-sffl + - nffl rollup0-anvil: image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 @@ -73,10 +73,10 @@ services: timeout: 10s retries: 5 networks: - - near-sffl + - nffl rollup0-relayer: - image: near-sffl-test-relayer:latest + image: nffl-test-relayer:latest container_name: rollup0-relayer depends_on: rollup0-anvil: @@ -96,11 +96,11 @@ services: - --key-path - /root/.near-credentials/localnet/da2.test.near.json - --network - - http://near-sffl-indexer:3030 + - http://nffl-indexer:3030 - --metrics-ip-port-address - rollup0-relayer:9091 networks: - - near-sffl + - nffl rollup1-anvil: image: ghcr.io/foundry-rs/foundry:latest@sha256:8b843eb65cc7b155303b316f65d27173c862b37719dc095ef3a2ef27ce8d3c00 @@ -117,10 +117,10 @@ services: timeout: 30s retries: 15 networks: - - near-sffl + - nffl rollup1-relayer: - image: near-sffl-test-relayer:latest + image: nffl-test-relayer:latest container_name: rollup1-relayer depends_on: rollup1-anvil: @@ -137,11 +137,11 @@ services: - --path - /etc/relayer/relayer1-docker-compose.yaml networks: - - near-sffl + - nffl indexer: - image: near-sffl-indexer:latest - container_name: near-sffl-indexer + image: nffl-indexer:latest + container_name: nffl-indexer depends_on: rmq: condition: service_healthy @@ -170,11 +170,11 @@ services: - --metrics-ip-port-address - "0.0.0.0:9090" networks: - - near-sffl + - nffl indexer-setup: image: debian:bookworm - container_name: near-sffl-indexer-setup + container_name: nffl-indexer-setup volumes: - near_cli_data:/near-cli - near_cli_keys:/root/.near-credentials @@ -185,16 +185,16 @@ services: rm -rf /near-cli/* rm -rf /root/.near-credentials/* networks: - - near-sffl + - nffl near-da-deploy: image: node:16 - container_name: near-sffl-near-da-deploy + container_name: nffl-near-da-deploy depends_on: indexer: condition: service_healthy volumes: - - ./:/near-sffl/ + - ./:/nffl/ - near_cli_data:/near-cli - near_cli_keys:/root/.near-credentials entrypoint: sh @@ -203,38 +203,38 @@ services: - | npm i -g near-cli@3.0.0 near create-account da2.test.near --masterAccount test.near - near deploy da2.test.near /near-sffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f + near deploy da2.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f near create-account da3.test.near --masterAccount test.near - near deploy da3.test.near /near-sffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f + near deploy da3.test.near /nffl/tests/near/near_da_blob_store.wasm --initFunction new --initArgs {} --masterAccount test.near -f environment: - NEAR_ENV=localnet - NEAR_CLI_LOCALNET_NETWORK_ID=localnet - NEAR_HELPER_ACCOUNT=near - NEAR_CLI_LOCALNET_KEY_PATH=/near-cli/validator_key.json - - NEAR_NODE_URL=http://near-sffl-indexer:3030 + - NEAR_NODE_URL=http://nffl-indexer:3030 networks: - - near-sffl + - nffl aggregator: - image: near-sffl-aggregator - container_name: near-sffl-aggregator + image: nffl-aggregator + container_name: nffl-aggregator depends_on: mainnet-anvil-setup: condition: service_completed_successfully expose: - 9091 volumes: - - ./:/near-sffl/ - working_dir: /near-sffl + - ./:/nffl/ + working_dir: /nffl command: - --config - config-files/aggregator-docker-compose.yaml - - --sffl-deployment + - --nffl-deployment - contracts/evm/script/output/31337/sffl_avs_deployment_output.json - --ecdsa-private-key - "0x2a871d0798f97d79848a013d4936a73bf4cc922c825d33c1cf7073dff6d409c6" networks: - - near-sffl + - nffl agreator-health: image: debian:bookworm @@ -243,16 +243,16 @@ services: condition: service_started command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" healthcheck: - test: ["CMD", "nc", "-zv", "near-sffl-aggregator", "9091"] + test: ["CMD", "nc", "-zv", "nffl-aggregator", "9091"] interval: 15s timeout: 10s retries: 5 networks: - - near-sffl + - nffl operator0: - image: near-sffl-operator - container_name: near-sffl-operator0 + image: nffl-operator + container_name: nffl-operator0 depends_on: rmq: condition: service_healthy @@ -263,14 +263,14 @@ services: expose: - 9090 # prometheus metrics port (defined in operator0-docker-compose.anvil.yaml file) volumes: - - ./:/near-sffl/ - working_dir: /near-sffl + - ./:/nffl/ + working_dir: /nffl environment: - OPERATOR_BLS_KEY_PASSWORD=fDUMDLmBROwlzzPXyIcy - OPERATOR_ECDSA_KEY_PASSWORD=EnJuncq01CiVk9UbuBYl command: --config config-files/operator0-docker-compose.anvil.yaml networks: - - near-sffl + - nffl operator0-health: image: debian:bookworm @@ -279,30 +279,30 @@ services: condition: service_started command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" healthcheck: - test: ["CMD", "nc", "-zv", "near-sffl-operator0", "9090"] + test: ["CMD", "nc", "-zv", "nffl-operator0", "9090"] interval: 15s timeout: 10s retries: 5 networks: - - near-sffl + - nffl operator1: - image: near-sffl-operator - container_name: near-sffl-operator1 + image: nffl-operator + container_name: nffl-operator1 depends_on: operator0-health: condition: service_healthy expose: - 9091 # prometheus metrics port (defined in operator1-docker-compose.anvil.yaml file) volumes: - - ./:/near-sffl/ - working_dir: /near-sffl + - ./:/nffl/ + working_dir: /nffl environment: - OPERATOR_BLS_KEY_PASSWORD=2EVEUyHCrHZdfdo8lp29 - OPERATOR_ECDSA_KEY_PASSWORD=isru1gvtykIavuk1Fg1Q command: --config config-files/operator1-docker-compose.anvil.yaml networks: - - near-sffl + - nffl operator1-health: image: debian:bookworm @@ -311,12 +311,12 @@ services: condition: service_started command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" healthcheck: - test: ["CMD", "nc", "-zv", "near-sffl-operator1", "9091"] + test: ["CMD", "nc", "-zv", "nffl-operator1", "9091"] interval: 15s timeout: 10s retries: 5 networks: - - near-sffl + - nffl # METRICS RELATED grafana: @@ -336,7 +336,7 @@ services: ports: - 3000:3000 networks: - - near-sffl + - nffl prometheus: image: prom/prometheus:v2.42.0 @@ -356,7 +356,7 @@ services: ports: - 9090:9090 networks: - - near-sffl + - nffl # so that we can access the host from within the container # needed to get the metrics from host.docker.internal:9184/metrics extra_hosts: diff --git a/docs/docs/operator/registration.md b/docs/docs/operator/registration.md index 3dfe868a..0ee5feed 100644 --- a/docs/docs/operator/registration.md +++ b/docs/docs/operator/registration.md @@ -38,8 +38,8 @@ Install [Docker Engine on Linux](https://docs.docker.com/engine/install/ubuntu/) Clone the NFFL repository and execute the following. ```bash -git clone https://github.com/NethermindEth/near-sffl.git -cd near-sffl/setup/plugin +git clone https://github.com/Nuffle-Labs/nffl.git +cd nffl/setup/plugin cp .env.example .env ``` @@ -80,8 +80,8 @@ eth_rpc_url: https://ethereum-holesky-rpc.publicnode.com eth_ws_url: wss://ethereum-holesky-rpc.publicnode.com # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/config/keys/ecdsa.json -bls_private_key_store_path: /near-sffl/config/keys/bls.json +ecdsa_private_key_store_path: /nffl/config/keys/ecdsa.json +bls_private_key_store_path: /nffl/config/keys/bls.json ``` You'll need to refer to the [Setup](./setup) again before running the node for diff --git a/docs/docs/operator/setup.md b/docs/docs/operator/setup.md index 68af9196..1f4c35d2 100644 --- a/docs/docs/operator/setup.md +++ b/docs/docs/operator/setup.md @@ -68,26 +68,26 @@ Install [Docker Engine on Linux](https://docs.docker.com/engine/install/ubuntu/) Clone the NFFL repository and execute the following. ```bash -git clone https://github.com/NethermindEth/near-sffl.git -cp near-sffl/setup/operator/.env.example near-sffl/setup/operator/.env -cp near-sffl/setup/plugin/.env.example near-sffl/setup/plugin/.env +git clone https://github.com/Nuffle-Labs/nffl.git +cp nffl/setup/operator/.env.example nffl/setup/operator/.env +cp nffl/setup/plugin/.env.example nffl/setup/plugin/.env ``` ### Step 4: Copy your EigenLayer operator keys to the setup directories ```bash -cp near-sffl/setup/plugin/config/keys/ecdsa.json -cp near-sffl/setup/plugin/config/keys/bls.json +cp nffl/setup/plugin/config/keys/ecdsa.json +cp nffl/setup/plugin/config/keys/bls.json # Using a placeholder ECDSA key only as we'll not be using the # register_operator_on_startup configuration -cp near-sffl/setup/operator/config/keys/ecdsa.example.json near-sffl/setup/operator/config/keys/ecdsa.json -cp near-sffl/setup/operator/config/keys/bls.json +cp nffl/setup/operator/config/keys/ecdsa.example.json nffl/setup/operator/config/keys/ecdsa.json +cp nffl/setup/operator/config/keys/bls.json ``` ### Step 5: Update your `.env` files -You should have something similar to this in your `near-sffl/setup/plugin/.env`: +You should have something similar to this in your `nffl/setup/plugin/.env`: ```bash # Operator BLS and ECDSA key passwords (from config/keys files) BLS_KEY_PASSWORD=fDUMDLmBROwlzzPXyIcy @@ -98,7 +98,7 @@ Set your EigenLayer ECDSA and BLS key passwords in the `ECDSA_KEY_PASSWORD` and `BLS_KEY_PASSWORD` fields. Then, for the node environment variables, you should have something similar to -this in your `near-sffl/setup/operator/.env`: +this in your `nffl/setup/operator/.env`: ```bash # Tagged release for SFFL containers SFFL_RELEASE=latest @@ -144,8 +144,8 @@ eth_rpc_url: https://ethereum-holesky-rpc.publicnode.com eth_ws_url: wss://ethereum-holesky-rpc.publicnode.com # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/config/keys/ecdsa.json -bls_private_key_store_path: /near-sffl/config/keys/bls.json +ecdsa_private_key_store_path: /nffl/config/keys/ecdsa.json +bls_private_key_store_path: /nffl/config/keys/bls.json ``` Then, in `setup/operator/config/operator.yaml`, set all the relevant fields @@ -169,11 +169,11 @@ eth_rpc_url: https://ethereum-holesky-rpc.publicnode.com eth_ws_url: wss://ethereum-holesky-rpc.publicnode.com # You should change this! # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/config/keys/ecdsa.json -bls_private_key_store_path: /near-sffl/config/keys/bls.json +ecdsa_private_key_store_path: /nffl/config/keys/ecdsa.json +bls_private_key_store_path: /nffl/config/keys/bls.json # Aggregator server IP and port -aggregator_server_ip_port_address: near-sffl-aggregator:8090 +aggregator_server_ip_port_address: nffl-aggregator:8090 # Operator EigenLayer metrics server IP and port enable_metrics: true @@ -221,13 +221,13 @@ contract addresses. Follow the command below in the operator setup directory: ```bash -# cd near-sffl/setup/operator +# cd nffl/setup/operator docker compose --profile indexer up ``` You should run it until it starts syncing. You'll see a log similar to: ``` -near-sffl-indexer | 2024-04-20T22:24:00.296255Z INFO stats: #161784536 Waiting for peers 0 peers ⬇ 0 B/s ⬆ 0 B/s NaN bps 0 gas/s CPU: 0%, Mem: 13.7 GB +nffl-indexer | 2024-04-20T22:24:00.296255Z INFO stats: #161784536 Waiting for peers 0 peers ⬇ 0 B/s ⬆ 0 B/s NaN bps 0 gas/s CPU: 0%, Mem: 13.7 GB ``` At this point, stop the execution with `Ctrl+C`. We're going to use NEAR's @@ -269,7 +269,7 @@ After that, you can use the operator plugin in order to register your operator. Simply go to your operator plugin setup directory and run: ```bash -# cd near-sffl/setup/plugin +# cd nffl/setup/plugin ./register.sh ``` diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js index 5009ea31..eb92bd97 100644 --- a/docs/docusaurus.config.js +++ b/docs/docusaurus.config.js @@ -15,8 +15,8 @@ const config = { url: 'https://nffl.nethermind.io', baseUrl: '/', - organizationName: 'NethermindEth', - projectName: 'near-sffl', + organizationName: 'Nuffle Labs', + projectName: 'nffl', onBrokenLinks: 'throw', onBrokenMarkdownLinks: 'warn', @@ -46,7 +46,7 @@ const config = { themeConfig: /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ ({ - image: 'img/near-sffl-social-card.jpg', + image: 'img/nffl-social-card.jpg', navbar: { title: 'NFFL', logo: { @@ -61,7 +61,7 @@ const config = { label: 'Docs', }, { - href: 'https://github.com/NethermindEth/near-sffl', + href: 'https://github.com/Nuffle-Labs/nffl', label: 'GitHub', position: 'right', }, @@ -125,7 +125,7 @@ const config = { items: [ { label: 'GitHub', - href: 'https://github.com/NethermindEth/near-sffl', + href: 'https://github.com/Nuffle-Labs/nffl', }, ], }, diff --git a/go.mod b/go.mod index aab0b2a9..26404bfe 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/NethermindEth/near-sffl +module github.com/Nuffle-Labs/nffl go 1.21 diff --git a/operator/attestor/attestor.go b/operator/attestor/attestor.go index 77e4c84c..b3e911be 100644 --- a/operator/attestor/attestor.go +++ b/operator/attestor/attestor.go @@ -14,11 +14,11 @@ import ( ethtypes "github.com/ethereum/go-ethereum/core/types" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/safeclient" - "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/operator/consumer" - optypes "github.com/NethermindEth/near-sffl/operator/types" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/operator/consumer" + optypes "github.com/Nuffle-Labs/nffl/operator/types" ) const ( diff --git a/operator/attestor/notifier.go b/operator/attestor/notifier.go index 1ebf4fef..989634f8 100644 --- a/operator/attestor/notifier.go +++ b/operator/attestor/notifier.go @@ -4,7 +4,7 @@ import ( "container/list" "sync" - "github.com/NethermindEth/near-sffl/operator/consumer" + "github.com/Nuffle-Labs/nffl/operator/consumer" ) type BlockPredicate = func(consumer.BlockData) bool diff --git a/operator/attestor/notifier_test.go b/operator/attestor/notifier_test.go index 8d71e3b6..1654378b 100644 --- a/operator/attestor/notifier_test.go +++ b/operator/attestor/notifier_test.go @@ -10,7 +10,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/stretchr/testify/assert" - "github.com/NethermindEth/near-sffl/operator/consumer" + "github.com/Nuffle-Labs/nffl/operator/consumer" ) const NUM_OF_BLOCKS = 1000 diff --git a/operator/avs_manager.go b/operator/avs_manager.go index 5c905fc6..89d0f39e 100644 --- a/operator/avs_manager.go +++ b/operator/avs_manager.go @@ -18,12 +18,12 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/crypto" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core/chainio" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" - optypes "github.com/NethermindEth/near-sffl/operator/types" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core/chainio" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" + optypes "github.com/Nuffle-Labs/nffl/operator/types" ) type AvsManagerer interface { diff --git a/operator/cmd/main.go b/operator/cmd/main.go index 0a23205c..1b32ecce 100644 --- a/operator/cmd/main.go +++ b/operator/cmd/main.go @@ -8,9 +8,9 @@ import ( "github.com/urfave/cli" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/operator" - optypes "github.com/NethermindEth/near-sffl/operator/types" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/operator" + optypes "github.com/Nuffle-Labs/nffl/operator/types" sdkutils "github.com/Layr-Labs/eigensdk-go/utils" ) diff --git a/operator/consumer/cmd/main.go b/operator/consumer/cmd/main.go index bb21a049..8da04108 100644 --- a/operator/consumer/cmd/main.go +++ b/operator/consumer/cmd/main.go @@ -7,7 +7,7 @@ import ( "os" "github.com/Layr-Labs/eigensdk-go/logging" - "github.com/NethermindEth/near-sffl/operator/consumer" + "github.com/Nuffle-Labs/nffl/operator/consumer" "github.com/urfave/cli" ) diff --git a/operator/consumer/consumer.go b/operator/consumer/consumer.go index e8189639..bb211c85 100644 --- a/operator/consumer/consumer.go +++ b/operator/consumer/consumer.go @@ -12,7 +12,7 @@ import ( "github.com/prometheus/client_golang/prometheus" rmq "github.com/rabbitmq/amqp091-go" - "github.com/NethermindEth/near-sffl/core" + "github.com/Nuffle-Labs/nffl/core" ) const ( diff --git a/operator/gen.go b/operator/gen.go index 0b30820a..aa0efae1 100644 --- a/operator/gen.go +++ b/operator/gen.go @@ -1,3 +1,3 @@ package operator -//go:generate mockgen -destination=./mocks/rpc_client.go -package=mocks github.com/NethermindEth/near-sffl/operator AggregatorRpcClienter +//go:generate mockgen -destination=./mocks/rpc_client.go -package=mocks github.com/Nuffle-Labs/nffl/operator AggregatorRpcClienter diff --git a/operator/mocks/attestor.go b/operator/mocks/attestor.go index fdd51947..936abe94 100644 --- a/operator/mocks/attestor.go +++ b/operator/mocks/attestor.go @@ -7,9 +7,9 @@ import ( eigentypes "github.com/Layr-Labs/eigensdk-go/types" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/core" - messages "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/operator/attestor" + "github.com/Nuffle-Labs/nffl/core" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/operator/attestor" ) type MockAttestor struct { diff --git a/operator/mocks/consumer.go b/operator/mocks/consumer.go index 92f547bb..a8796254 100644 --- a/operator/mocks/consumer.go +++ b/operator/mocks/consumer.go @@ -3,7 +3,7 @@ package mocks import ( "context" - "github.com/NethermindEth/near-sffl/operator/consumer" + "github.com/Nuffle-Labs/nffl/operator/consumer" rmq "github.com/rabbitmq/amqp091-go" ) diff --git a/operator/mocks/rpc_client.go b/operator/mocks/rpc_client.go index 95a56ddb..818522c1 100644 --- a/operator/mocks/rpc_client.go +++ b/operator/mocks/rpc_client.go @@ -1,9 +1,9 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/NethermindEth/near-sffl/operator (interfaces: AggregatorRpcClienter) +// Source: github.com/Nuffle-Labs/nffl/operator (interfaces: AggregatorRpcClienter) // // Generated by this command: // -// mockgen -destination=./mocks/rpc_client.go -package=mocks github.com/NethermindEth/near-sffl/operator AggregatorRpcClienter +// mockgen -destination=./mocks/rpc_client.go -package=mocks github.com/Nuffle-Labs/nffl/operator AggregatorRpcClienter // // Package mocks is a generated GoMock package. package mocks @@ -11,7 +11,7 @@ package mocks import ( reflect "reflect" - messages "github.com/NethermindEth/near-sffl/core/types/messages" + messages "github.com/Nuffle-Labs/nffl/core/types/messages" prometheus "github.com/prometheus/client_golang/prometheus" gomock "go.uber.org/mock/gomock" ) diff --git a/operator/operator.go b/operator/operator.go index a3649ab1..d40af326 100644 --- a/operator/operator.go +++ b/operator/operator.go @@ -24,13 +24,13 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/safeclient" - "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/operator/attestor" - optypes "github.com/NethermindEth/near-sffl/operator/types" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/operator/attestor" + optypes "github.com/Nuffle-Labs/nffl/operator/types" ) const ( diff --git a/operator/operator_test.go b/operator/operator_test.go index 885206e3..f1c9505f 100644 --- a/operator/operator_test.go +++ b/operator/operator_test.go @@ -11,15 +11,15 @@ import ( "github.com/Layr-Labs/eigensdk-go/crypto/bls" sdklogging "github.com/Layr-Labs/eigensdk-go/logging" "github.com/Layr-Labs/eigensdk-go/metrics" - aggtypes "github.com/NethermindEth/near-sffl/aggregator/types" - opsetupdatereg "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" - taskmanager "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLTaskManager" - chainiomocks "github.com/NethermindEth/near-sffl/core/chainio/mocks" - safeclientmocks "github.com/NethermindEth/near-sffl/core/safeclient/mocks" - coretypes "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/core/types/messages" - "github.com/NethermindEth/near-sffl/operator/consumer" - "github.com/NethermindEth/near-sffl/operator/mocks" + aggtypes "github.com/Nuffle-Labs/nffl/aggregator/types" + opsetupdatereg "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLOperatorSetUpdateRegistry" + taskmanager "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLTaskManager" + chainiomocks "github.com/Nuffle-Labs/nffl/core/chainio/mocks" + safeclientmocks "github.com/Nuffle-Labs/nffl/core/safeclient/mocks" + coretypes "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/operator/consumer" + "github.com/Nuffle-Labs/nffl/operator/mocks" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/event" diff --git a/operator/rpc_client.go b/operator/rpc_client.go index 5563d00b..2a28f356 100644 --- a/operator/rpc_client.go +++ b/operator/rpc_client.go @@ -12,8 +12,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/types/messages" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/types/messages" ) const ( diff --git a/plugin/cmd/operator_plugin.go b/plugin/cmd/operator_plugin.go index abd6a96d..23b894f5 100644 --- a/plugin/cmd/operator_plugin.go +++ b/plugin/cmd/operator_plugin.go @@ -14,10 +14,10 @@ import ( "github.com/Layr-Labs/eigensdk-go/logging" "github.com/Layr-Labs/eigensdk-go/signerv2" "github.com/Layr-Labs/eigensdk-go/utils" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/safeclient" - "github.com/NethermindEth/near-sffl/operator" - optypes "github.com/NethermindEth/near-sffl/operator/types" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/operator" + optypes "github.com/Nuffle-Labs/nffl/operator/types" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/urfave/cli" diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 926c4664..61707db7 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -13,34 +13,34 @@ scrape_configs: static_configs: - targets: ["localhost:9090"] - - job_name: "sffl-operator0" + - job_name: "nffl-operator0" scrape_interval: 5s static_configs: - - targets: ["near-sffl-operator0:9090"] + - targets: ["nffl-operator0:9090"] labels: role: "operator" instance: "0" - - job_name: "sffl-operator1" + - job_name: "nffl-operator1" scrape_interval: 5s static_configs: # host.docker.internal might not work on linux # TODO: do https://stackoverflow.com/a/67158212/4971151 # - targets: ["host.docker.internal:9090"] - - targets: ["near-sffl-operator1:9091"] + - targets: ["nffl-operator1:9091"] labels: role: "operator" instance: "1" - - job_name: "sffl-aggregator" + - job_name: "nffl-aggregator" scrape_interval: 5s static_configs: - - targets: ["near-sffl-aggregator:9091"] + - targets: ["nffl-aggregator:9091"] - - job_name: "sffl-indexer" + - job_name: "nffl-indexer" scrape_interval: 5s static_configs: - - targets: ["near-sffl-indexer:9090"] + - targets: ["nffl-indexer:9090"] relabel_configs: # is this actually useful? We already have the job name \ No newline at end of file diff --git a/relayer/cmd/main.go b/relayer/cmd/main.go index 5ae045a9..ab2322f3 100644 --- a/relayer/cmd/main.go +++ b/relayer/cmd/main.go @@ -11,8 +11,8 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/urfave/cli" - "github.com/NethermindEth/near-sffl/relayer" - "github.com/NethermindEth/near-sffl/relayer/config" + "github.com/Nuffle-Labs/nffl/relayer" + "github.com/Nuffle-Labs/nffl/relayer/config" ) func main() { diff --git a/relayer/relayer.go b/relayer/relayer.go index 4cab69b5..7633c3e6 100644 --- a/relayer/relayer.go +++ b/relayer/relayer.go @@ -12,9 +12,9 @@ import ( near "github.com/near/rollup-data-availability/gopkg/da-rpc" "github.com/prometheus/client_golang/prometheus" - "github.com/NethermindEth/near-sffl/core" - "github.com/NethermindEth/near-sffl/core/safeclient" - "github.com/NethermindEth/near-sffl/relayer/config" + "github.com/Nuffle-Labs/nffl/core" + "github.com/Nuffle-Labs/nffl/core/safeclient" + "github.com/Nuffle-Labs/nffl/relayer/config" ) const ( diff --git a/setup/aggregator/docker-compose.yml b/setup/aggregator/docker-compose.yml index 2ccafb44..2f067e3e 100644 --- a/setup/aggregator/docker-compose.yml +++ b/setup/aggregator/docker-compose.yml @@ -1,22 +1,22 @@ version: "3" networks: - near-sffl-aggregator: + nffl-aggregator: driver: bridge services: - near-sffl-aggregator: - image: ghcr.io/nethermindeth/near-sffl/aggregator:${SFFL_RELEASE} - container_name: near-sffl-aggregator + nffl-aggregator: + image: ghcr.io/nuffle-labs/nffl/aggregator:${SFFL_RELEASE} + container_name: nffl-aggregator volumes: - - ./:/near-sffl/ + - ./:/nffl/ networks: - - near-sffl-aggregator - working_dir: /near-sffl + - nffl-aggregator + working_dir: /nffl command: - --config - config/aggregator.yaml - - --sffl-deployment + - --nffl-deployment - config/deployment/17000.json - --ecdsa-private-key - ${ECDSA_PRIVATE_KEY} @@ -40,7 +40,7 @@ services: - grafana_data_aggregator:/var/lib/grafana - ../../grafana/provisioning:/etc/grafana/provisioning networks: - - near-sffl-aggregator + - nffl-aggregator environment: - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin} - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin} @@ -57,7 +57,7 @@ services: - ./prometheus:/etc/prometheus - prometheus_data_aggregator:/prometheus networks: - - near-sffl-aggregator + - nffl-aggregator command: - "--config.file=/etc/prometheus/prometheus.yml" - "--storage.tsdb.path=/prometheus" diff --git a/setup/aggregator/prometheus/prometheus.yml b/setup/aggregator/prometheus/prometheus.yml index 377a80b3..3b13888e 100644 --- a/setup/aggregator/prometheus/prometheus.yml +++ b/setup/aggregator/prometheus/prometheus.yml @@ -13,7 +13,7 @@ scrape_configs: static_configs: - targets: ["localhost:9090"] - - job_name: "sffl-aggregator" + - job_name: "nffl-aggregator" scrape_interval: 5s static_configs: - - targets: ["near-sffl-aggregator:9091"] + - targets: ["nffl-aggregator:9091"] diff --git a/setup/operator/config/operator.yaml b/setup/operator/config/operator.yaml index 8933f85e..43754658 100644 --- a/setup/operator/config/operator.yaml +++ b/setup/operator/config/operator.yaml @@ -16,11 +16,11 @@ eth_rpc_url: https://ethereum-holesky-rpc.publicnode.com eth_ws_url: wss://ethereum-holesky-rpc.publicnode.com # You should change this! # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/config/keys/ecdsa.json -bls_private_key_store_path: /near-sffl/config/keys/bls.json +ecdsa_private_key_store_path: /nffl/config/keys/ecdsa.json +bls_private_key_store_path: /nffl/config/keys/bls.json # Aggregator server IP and port -aggregator_server_ip_port_address: near-sffl-aggregator:8090 +aggregator_server_ip_port_address: nffl-aggregator:8090 # Operator EigenLayer metrics server IP and port enable_metrics: true diff --git a/setup/operator/docker-compose.yml b/setup/operator/docker-compose.yml index d6aa115a..f20b04d7 100644 --- a/setup/operator/docker-compose.yml +++ b/setup/operator/docker-compose.yml @@ -1,8 +1,8 @@ version: "3" networks: - near-sffl: - name: near-sffl + nffl: + name: nffl driver: bridge services: @@ -22,12 +22,12 @@ services: timeout: 3s retries: 30 networks: - - near-sffl + - nffl - near-sffl-indexer: + nffl-indexer: profiles: [indexer] - image: ghcr.io/nethermindeth/near-sffl/indexer:${SFFL_RELEASE} - container_name: near-sffl-indexer + image: ghcr.io/nuffle-labs/nffl/indexer:${SFFL_RELEASE} + container_name: nffl-indexer depends_on: rmq: condition: service_healthy @@ -37,15 +37,15 @@ services: environment: - CHAIN_ID=${NEAR_CHAIN_ID} volumes: - - ./:/near-sffl/ + - ./:/nffl/ - ${NEAR_HOME_DIR}:/root/.near - ${NEAR_KEYS_DIR}:/root/.near-credentials command: - --config - - /near-sffl/config/indexer.yaml + - /nffl/config/indexer.yaml restart: unless-stopped networks: - - near-sffl + - nffl logging: driver: "json-file" options: @@ -53,27 +53,27 @@ services: max-file: "10" compress: "true" - near-sffl-operator: + nffl-operator: profiles: [operator] - image: ghcr.io/nethermindeth/near-sffl/operator:${SFFL_RELEASE} - container_name: near-sffl-operator + image: ghcr.io/nuffle-labs/nffl/operator:${SFFL_RELEASE} + container_name: nffl-operator depends_on: rmq: condition: service_healthy - near-sffl-indexer: + nffl-indexer: condition: service_healthy ports: - "127.0.0.1:9091:9091" volumes: - - ./:/near-sffl/ - working_dir: /near-sffl + - ./:/nffl/ + working_dir: /nffl environment: - OPERATOR_BLS_KEY_PASSWORD=${OPERATOR_BLS_KEY_PASSWORD} - OPERATOR_ECDSA_KEY_PASSWORD=${OPERATOR_ECDSA_KEY_PASSWORD} command: --config config/operator.yaml restart: unless-stopped networks: - - near-sffl + - nffl logging: driver: "json-file" options: @@ -85,16 +85,16 @@ services: profiles: [operator] image: debian:bookworm depends_on: - near-sffl-operator: + nffl-operator: condition: service_started command: sh -c "apt update && apt install -y netcat-traditional && sleep infinity" healthcheck: - test: ["CMD", "nc", "-zv", "near-sffl-operator", "9091"] + test: ["CMD", "nc", "-zv", "nffl-operator", "9091"] interval: 5s timeout: 75s retries: 15 networks: - - near-sffl + - nffl grafana: profiles: [operator] @@ -111,7 +111,7 @@ services: ports: - "127.0.0.1:3000:3000" networks: - - near-sffl + - nffl prometheus: profiles: [operator] @@ -132,7 +132,7 @@ services: ports: - "127.0.0.1:9090:9090" networks: - - near-sffl + - nffl extra_hosts: - "host.docker.internal:host-gateway" diff --git a/setup/operator/prometheus/prometheus.yml b/setup/operator/prometheus/prometheus.yml index aed55840..173c4a20 100644 --- a/setup/operator/prometheus/prometheus.yml +++ b/setup/operator/prometheus/prometheus.yml @@ -13,15 +13,15 @@ scrape_configs: static_configs: - targets: ["localhost:9090"] - - job_name: "sffl-operator" + - job_name: "nffl-operator" scrape_interval: 5s static_configs: - - targets: ["near-sffl-operator:9091"] + - targets: ["nffl-operator:9091"] labels: role: "operator" instance: "0" - - job_name: "sffl-indexer" + - job_name: "nffl-indexer" scrape_interval: 5s static_configs: - - targets: ["near-sffl-indexer:9092"] + - targets: ["nffl-indexer:9092"] diff --git a/setup/plugin/config/operator.yaml b/setup/plugin/config/operator.yaml index 2ae3bade..249159c5 100644 --- a/setup/plugin/config/operator.yaml +++ b/setup/plugin/config/operator.yaml @@ -11,5 +11,5 @@ eth_rpc_url: https://ethereum-holesky-rpc.publicnode.com eth_ws_url: wss://ethereum-holesky-rpc.publicnode.com # EigenLayer ECDSA and BLS private key paths -ecdsa_private_key_store_path: /near-sffl/config/keys/ecdsa.json -bls_private_key_store_path: /near-sffl/config/keys/bls.json +ecdsa_private_key_store_path: /nffl/config/keys/ecdsa.json +bls_private_key_store_path: /nffl/config/keys/bls.json diff --git a/setup/plugin/register.sh b/setup/plugin/register.sh index 55bb632c..92103720 100755 --- a/setup/plugin/register.sh +++ b/setup/plugin/register.sh @@ -8,7 +8,7 @@ fi echo "Using operator plugin to opt-in into NEAR SFFL" docker run --rm \ - -v $(pwd):/near-sffl/ \ + -v $(pwd):/nffl/ \ --env-file .env \ --pull=always \ - ghcr.io/nethermindeth/near-sffl/operator-plugin:latest --config /near-sffl/config/operator.yaml --operation-type opt-in + ghcr.io/nuffle-labs/nffl/operator-plugin:latest --config /nffl/config/operator.yaml --operation-type opt-in diff --git a/setup/relayer/docker-compose.yml b/setup/relayer/docker-compose.yml index b0a881e1..34b09793 100644 --- a/setup/relayer/docker-compose.yml +++ b/setup/relayer/docker-compose.yml @@ -1,17 +1,17 @@ version: "3" networks: - near-sffl-relayer: + nffl-relayer: driver: bridge services: relayer_421614: - image: ghcr.io/nethermindeth/near-sffl/relayer:${SFFL_RELEASE} - container_name: near-sffl-relayer-421614 + image: ghcr.io/nuffle-labs/nffl/relayer:${SFFL_RELEASE} + container_name: nffl-relayer-421614 volumes: - ${NEAR_KEYS_DIR}:/root/.near-credentials networks: - - near-sffl-relayer + - nffl-relayer expose: - 9091 command: @@ -25,7 +25,7 @@ services: - --network - ${NEAR_RPC_URL} - --metrics-ip-port-address - - near-sffl-relayer-421614:9091 + - nffl-relayer-421614:9091 restart: unless-stopped logging: driver: "json-file" @@ -35,12 +35,12 @@ services: compress: "true" relayer_11155420: - image: ghcr.io/nethermindeth/near-sffl/relayer:${SFFL_RELEASE} - container_name: near-sffl-relayer-11155420 + image: ghcr.io/nuffle-labs/nffl/relayer:${SFFL_RELEASE} + container_name: nffl-relayer-11155420 volumes: - ${NEAR_KEYS_DIR}:/root/.near-credentials networks: - - near-sffl-relayer + - nffl-relayer expose: - 9091 command: @@ -54,7 +54,7 @@ services: - --network - ${NEAR_RPC_URL} - --metrics-ip-port-address - - near-sffl-relayer-11155420:9091 + - nffl-relayer-11155420:9091 restart: unless-stopped logging: driver: "json-file" @@ -71,7 +71,7 @@ services: - grafana_data_relayer:/var/lib/grafana - ../../grafana/provisioning:/etc/grafana/provisioning networks: - - near-sffl-relayer + - nffl-relayer environment: - GF_SECURITY_ADMIN_USER=${ADMIN_USER:-admin} - GF_SECURITY_ADMIN_PASSWORD=${ADMIN_PASSWORD:-admin} @@ -88,7 +88,7 @@ services: - ./prometheus:/etc/prometheus - prometheus_data_relayer:/prometheus networks: - - near-sffl-relayer + - nffl-relayer command: - "--config.file=/etc/prometheus/prometheus.yml" - "--storage.tsdb.path=/prometheus" diff --git a/setup/relayer/prometheus/prometheus.yml b/setup/relayer/prometheus/prometheus.yml index b4772990..301fb913 100644 --- a/setup/relayer/prometheus/prometheus.yml +++ b/setup/relayer/prometheus/prometheus.yml @@ -13,14 +13,14 @@ scrape_configs: static_configs: - targets: ["localhost:9090"] - - job_name: "sffl-relayer" + - job_name: "nffl-relayer" scrape_interval: 5s static_configs: - - targets: ["near-sffl-relayer-421614:9091"] + - targets: ["nffl-relayer-421614:9091"] labels: role: "relayer" instance: "1" - - targets: ["near-sffl-relayer-11155420:9091"] + - targets: ["nffl-relayer-11155420:9091"] labels: role: "operator" instance: "1" diff --git a/static/avs_metadata.json b/static/avs_metadata.json index 091b639d..d51fca9b 100644 --- a/static/avs_metadata.json +++ b/static/avs_metadata.json @@ -2,6 +2,6 @@ "name": "Nuffle Fast Finality Layer", "website": "https://nffl.nethermind.io", "description": "The Nuffle Fast Finality Layer (NFFL) is a protocol designed to greatly enhance cross-chain communication by providing faster finality for rollups, leveraging the flexibility of NEAR DA and the strong economic security of an AVS.", - "logo": "https://raw.githubusercontent.com/NethermindEth/near-sffl/main/static/logo.png", + "logo": "https://raw.githubusercontent.com/Nuffle-Labs/nfflmain/static/logo.png", "twitter": "https://twitter.com/nufflelabs" } \ No newline at end of file diff --git a/tests/integration/integration_test.go b/tests/integration/integration_test.go index 8d7d49b9..9549a8a9 100644 --- a/tests/integration/integration_test.go +++ b/tests/integration/integration_test.go @@ -31,18 +31,18 @@ import ( "github.com/testcontainers/testcontainers-go/modules/rabbitmq" "github.com/testcontainers/testcontainers-go/wait" - "github.com/NethermindEth/near-sffl/aggregator" - restserver "github.com/NethermindEth/near-sffl/aggregator/rest_server" - rpcserver "github.com/NethermindEth/near-sffl/aggregator/rpc_server" - aggtypes "github.com/NethermindEth/near-sffl/aggregator/types" - registryrollup "github.com/NethermindEth/near-sffl/contracts/bindings/SFFLRegistryRollup" - transparentproxy "github.com/NethermindEth/near-sffl/contracts/bindings/TransparentUpgradeableProxy" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/config" - "github.com/NethermindEth/near-sffl/core/types" - "github.com/NethermindEth/near-sffl/operator" - optypes "github.com/NethermindEth/near-sffl/operator/types" - "github.com/NethermindEth/near-sffl/tests/integration/utils" + "github.com/Nuffle-Labs/nffl/aggregator" + restserver "github.com/Nuffle-Labs/nffl/aggregator/rest_server" + rpcserver "github.com/Nuffle-Labs/nffl/aggregator/rpc_server" + aggtypes "github.com/Nuffle-Labs/nffl/aggregator/types" + registryrollup "github.com/Nuffle-Labs/nffl/contracts/bindings/SFFLRegistryRollup" + transparentproxy "github.com/Nuffle-Labs/nffl/contracts/bindings/TransparentUpgradeableProxy" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/config" + "github.com/Nuffle-Labs/nffl/core/types" + "github.com/Nuffle-Labs/nffl/operator" + optypes "github.com/Nuffle-Labs/nffl/operator/types" + "github.com/Nuffle-Labs/nffl/tests/integration/utils" ) const ( @@ -178,7 +178,7 @@ type testEnv struct { func setupTestEnv(t *testing.T, ctx context.Context) *testEnv { containersCtx, cancelContainersCtx := context.WithCancel(context.Background()) - networkName := "near-sffl" + networkName := "nffl" net, err := testcontainers.GenericNetwork(containersCtx, testcontainers.GenericNetworkRequest{ NetworkRequest: testcontainers.NetworkRequest{ Driver: "bridge", @@ -593,7 +593,7 @@ func startIndexer(t *testing.T, ctx context.Context, name string, rollupAnvils [ } req := testcontainers.ContainerRequest{ - Image: "near-sffl-indexer", + Image: "nffl-indexer", Name: name, Cmd: append([]string{"--rmq-address", amqpUrl}, rollupArgs...), ExposedPorts: []string{"3030/tcp"}, diff --git a/tests/integration/registration_test.go b/tests/integration/registration_test.go index a12c5152..5072c062 100644 --- a/tests/integration/registration_test.go +++ b/tests/integration/registration_test.go @@ -17,10 +17,10 @@ import ( "github.com/Layr-Labs/eigensdk-go/signerv2" "github.com/Layr-Labs/eigensdk-go/types" sdkutils "github.com/Layr-Labs/eigensdk-go/utils" - "github.com/NethermindEth/near-sffl/core/chainio" - "github.com/NethermindEth/near-sffl/core/safeclient" - optypes "github.com/NethermindEth/near-sffl/operator/types" - "github.com/NethermindEth/near-sffl/tests/integration/utils" + "github.com/Nuffle-Labs/nffl/core/chainio" + "github.com/Nuffle-Labs/nffl/core/safeclient" + optypes "github.com/Nuffle-Labs/nffl/operator/types" + "github.com/Nuffle-Labs/nffl/tests/integration/utils" "github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/common" "github.com/testcontainers/testcontainers-go" @@ -35,7 +35,7 @@ func TestRegistration(t *testing.T) { t.Fatalf("Failed to create logger: %s", err.Error()) } - networkName := "near-sffl-registration" + networkName := "nffl-registration" net, err := testcontainers.GenericNetwork(ctx, testcontainers.GenericNetworkRequest{ NetworkRequest: testcontainers.NetworkRequest{ Driver: "bridge", @@ -153,7 +153,7 @@ func runOperatorPluginContainer(t *testing.T, ctx context.Context, name, network } req := testcontainers.ContainerRequest{ - Image: "near-sffl-operator-plugin", + Image: "nffl-operator-plugin", Name: name, Networks: []string{networkName}, Env: map[string]string{ @@ -163,7 +163,7 @@ func runOperatorPluginContainer(t *testing.T, ctx context.Context, name, network Files: []testcontainers.ContainerFile{ { HostFilePath: "../../config-files/plugin.anvil.yaml", - ContainerFilePath: "/near-sffl/config.yml", + ContainerFilePath: "/nffl/config.yml", }, }, Mounts: testcontainers.ContainerMounts{ @@ -171,13 +171,13 @@ func runOperatorPluginContainer(t *testing.T, ctx context.Context, name, network Source: testcontainers.GenericBindMountSource{ HostPath: keysPath, }, - Target: testcontainers.ContainerMountTarget("/near-sffl/keys/"), + Target: testcontainers.ContainerMountTarget("/nffl/keys/"), ReadOnly: true, }, }, Cmd: []string{ "--config", - "/near-sffl/config.yml", + "/nffl/config.yml", "--operation-type", operation, }, diff --git a/tests/integration/utils/containers.go b/tests/integration/utils/containers.go index ebab433d..f961204d 100644 --- a/tests/integration/utils/containers.go +++ b/tests/integration/utils/containers.go @@ -17,14 +17,14 @@ import ( "github.com/testcontainers/testcontainers-go" "github.com/testcontainers/testcontainers-go/wait" - "github.com/NethermindEth/near-sffl/relayer/config" + "github.com/Nuffle-Labs/nffl/relayer/config" ) const ( NearNetworkId = "localnet" - NetworkName = "near-sffl" - // TODO(edwin): near-sffl-test-relayer -> near-sffl-relayer? - RelayerImageName = "near-sffl-test-relayer" + NetworkName = "nffl" + // TODO(edwin): nffl-test-relayer -> nffl-relayer? + RelayerImageName = "nffl-test-relayer" RelayerContainerName = "relayer" IndexerPort = "3030" MetricsPort = "9091"