Skip to content

Commit

Permalink
[NUF-170] Move the registries from Nethermind to Nuffle (#313)
Browse files Browse the repository at this point in the history
  • Loading branch information
Fly-Style authored Nov 15, 2024
1 parent 69b2a2d commit 66dcb37
Show file tree
Hide file tree
Showing 98 changed files with 411 additions and 411 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:

env:
REGISTRY: ghcr.io
IMAGE_NAME: nethermindeth/near-sffl
IMAGE_NAME: nuffle-labs/nffl

jobs:
custom-build:
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/compose-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand 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

Expand Down
20 changes: 10 additions & 10 deletions aggregator/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
22 changes: 11 additions & 11 deletions aggregator/aggregator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions aggregator/blsagg/message_blsagg.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
8 changes: 4 additions & 4 deletions aggregator/cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
6 changes: 3 additions & 3 deletions aggregator/database/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions aggregator/database/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion aggregator/database/gen.go
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions aggregator/database/mocks/database.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aggregator/database/models/message_bls_aggregation.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions aggregator/database/models/operator_set_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion aggregator/database/models/state_root_update.go
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
10 changes: 5 additions & 5 deletions aggregator/gen.go
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions aggregator/mocks/chain.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 ======
Expand Down
6 changes: 3 additions & 3 deletions aggregator/mocks/message_blsagg.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions aggregator/mocks/operator_registrations_inmemory.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions aggregator/mocks/rest_aggregator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 66dcb37

Please sign in to comment.