From b077f987a885dbe085d942cf3160286256bc5426 Mon Sep 17 00:00:00 2001 From: guoshijiang Date: Thu, 9 Jan 2025 16:20:00 +0800 Subject: [PATCH] change dapplink-labs to Manta-Network --- .gitignore | 4 +-- .gitmodules | 6 ++--- Makefile | 4 +-- README.md | 24 ++++++++--------- cmd/cli.go | 16 ++++++------ common/cliapp/lifecycle.go | 2 +- go.mod | 2 +- l2fp-contracts | 1 - manager/manager.go | 26 +++++++++---------- manager/router/registry.go | 4 +-- manager/sdk/sdk.go | 2 +- manager/service.go | 4 +-- manager/sign.go | 8 +++--- manager/types/types.go | 2 +- manta-fp-contracts | 1 + node/deal_msg.go | 2 +- node/node.go | 22 ++++++++-------- synchronizer/babylon_process.go | 4 +-- synchronizer/babylon_synchronizer.go | 8 +++--- .../contracts/finality_relayer_manager.go | 4 +-- synchronizer/eth_process.go | 4 +-- synchronizer/eth_synchronizer.go | 10 +++---- synchronizer/node/babylon_header_traversal.go | 2 +- synchronizer/node/client.go | 2 +- synchronizer/node/eth_header_traversal.go | 2 +- ws/client/client.go | 2 +- 26 files changed, 84 insertions(+), 84 deletions(-) delete mode 160000 l2fp-contracts create mode 160000 manta-fp-contracts diff --git a/.gitignore b/.gitignore index fe686f1..1b21169 100644 --- a/.gitignore +++ b/.gitignore @@ -26,8 +26,8 @@ go.work.sum .idea # Binaries for programs and plugins -l2fp-aggregator +manta-fp-aggregator -l2-fp-contracts/* +manta-fp-contracts/* key.store/* diff --git a/.gitmodules b/.gitmodules index e5da44e..c4254cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "l2fp-contracts"] - path = l2fp-contracts - url = git@github.com:dapplink-labs/l2fp-contracts.git +[submodule "manta-fp-contracts"] + path = manta-fp-contracts + url = https://github.com/Manta-Network/manta-fp-contracts diff --git a/Makefile b/Makefile index 980b07d..19f34a5 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,10 @@ BLSApkRegistryAbiPath := ./l2fp-contracts/out/BLSApkRegistry.sol/BLSApkRegistry. build: - env GO111MODULE=on go build -o l2fp-aggregator ./cmd + env GO111MODULE=on go build -o manta-fp-aggregator ./cmd clean: - rm l2fp-aggregator + rm manta-fp-aggregator test: go test -v ./... diff --git a/README.md b/README.md index 9ecc710..d9d084a 100644 --- a/README.md +++ b/README.md @@ -4,25 +4,25 @@ parent: -->
-

l2fp-aggregator

+

manta-fp-aggregator

- - Version + + Version - - License: Apache-2.0 + + License: Apache-2.0 - - GoDoc + + GoDoc - - Go report card + + Go report card
-l2fp-aggregator is a decentralized system where nodes first register with the contract and then receive transaction state proofs generated by Babylon and Symbiotic Finality Providers. Once more than two-thirds of the nodes complete the signature verification, the aggregated signature is submitted to the l2fp-contracts contract on Ethereum. The contract verifies the validity of the entire signature and subsequently adjusts the fraud proof window for the relevant transactions on L2 contracts on L1, reducing the fraud proof time proportionally to the staking ratio. +manta-fp-aggregator is a decentralized system where nodes first register with the contract and then receive transaction state proofs generated by Babylon and Symbiotic Finality Providers. Once more than two-thirds of the nodes complete the signature verification, the aggregated signature is submitted to the l2fp-contracts contract on Ethereum. The contract verifies the validity of the entire signature and subsequently adjusts the fraud proof window for the relevant transactions on L2 contracts on L1, reducing the fraud proof time proportionally to the staking ratio. **Note**: Requires [Go 1.22+](https://golang.org/dl/) @@ -44,8 +44,8 @@ Or check out the latest [release](https://github.com/eniac-x-labs/finality-node) * start the service ```bash -./l2fp-aggregator manager -./l2fp-aggregator node +./manta-fp-aggregator manager +./manta-fp-aggregator node ``` ## Contributing diff --git a/cmd/cli.go b/cmd/cli.go index fa26d38..27adb4c 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -13,14 +13,14 @@ import ( "github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/params" - "github.com/dapplink-labs/l2fp-aggregator/common/cliapp" - "github.com/dapplink-labs/l2fp-aggregator/config" - "github.com/dapplink-labs/l2fp-aggregator/manager" - "github.com/dapplink-labs/l2fp-aggregator/node" - "github.com/dapplink-labs/l2fp-aggregator/node/conversion" - "github.com/dapplink-labs/l2fp-aggregator/sign" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/ws/server" + "github.com/Manta-Network/manta-fp-aggregator/common/cliapp" + "github.com/Manta-Network/manta-fp-aggregator/config" + "github.com/Manta-Network/manta-fp-aggregator/manager" + "github.com/Manta-Network/manta-fp-aggregator/node" + "github.com/Manta-Network/manta-fp-aggregator/node/conversion" + "github.com/Manta-Network/manta-fp-aggregator/sign" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/ws/server" "github.com/urfave/cli/v2" ) diff --git a/common/cliapp/lifecycle.go b/common/cliapp/lifecycle.go index 927de8a..ade5d36 100644 --- a/common/cliapp/lifecycle.go +++ b/common/cliapp/lifecycle.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - "github.com/dapplink-labs/l2fp-aggregator/common/opio" + "github.com/Manta-Network/manta-fp-aggregator/common/opio" "github.com/urfave/cli/v2" ) diff --git a/go.mod b/go.mod index 4ddff0f..bf78939 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/dapplink-labs/l2fp-aggregator +module github.com/Manta-Network/manta-fp-aggregator go 1.23.4 diff --git a/l2fp-contracts b/l2fp-contracts deleted file mode 160000 index 7866fc0..0000000 --- a/l2fp-contracts +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7866fc0895d0be5c7da37925cbcee3cba5b0ab0c diff --git a/manager/manager.go b/manager/manager.go index 2db40ad..35bc17d 100644 --- a/manager/manager.go +++ b/manager/manager.go @@ -23,19 +23,19 @@ import ( "github.com/ethereum/go-ethereum/ethclient" "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/bindings/bls" - "github.com/dapplink-labs/l2fp-aggregator/bindings/finality" - "github.com/dapplink-labs/l2fp-aggregator/client" - common2 "github.com/dapplink-labs/l2fp-aggregator/common" - "github.com/dapplink-labs/l2fp-aggregator/config" - "github.com/dapplink-labs/l2fp-aggregator/manager/router" - "github.com/dapplink-labs/l2fp-aggregator/manager/rpc" - "github.com/dapplink-labs/l2fp-aggregator/manager/types" - "github.com/dapplink-labs/l2fp-aggregator/sign" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer/node" - "github.com/dapplink-labs/l2fp-aggregator/ws/server" + "github.com/Manta-Network/manta-fp-aggregator/bindings/bls" + "github.com/Manta-Network/manta-fp-aggregator/bindings/finality" + "github.com/Manta-Network/manta-fp-aggregator/client" + common2 "github.com/Manta-Network/manta-fp-aggregator/common" + "github.com/Manta-Network/manta-fp-aggregator/config" + "github.com/Manta-Network/manta-fp-aggregator/manager/router" + "github.com/Manta-Network/manta-fp-aggregator/manager/rpc" + "github.com/Manta-Network/manta-fp-aggregator/manager/types" + "github.com/Manta-Network/manta-fp-aggregator/sign" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer/node" + "github.com/Manta-Network/manta-fp-aggregator/ws/server" types2 "github.com/babylonlabs-io/babylon/x/btcstaking/types" types3 "github.com/babylonlabs-io/babylon/x/finality/types" diff --git a/manager/router/registry.go b/manager/router/registry.go index d17df28..14fb890 100644 --- a/manager/router/registry.go +++ b/manager/router/registry.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/manager/types" - "github.com/dapplink-labs/l2fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/manager/types" + "github.com/Manta-Network/manta-fp-aggregator/store" "github.com/gin-gonic/gin" "github.com/prometheus/client_golang/prometheus" diff --git a/manager/sdk/sdk.go b/manager/sdk/sdk.go index 1c86879..16f5e22 100644 --- a/manager/sdk/sdk.go +++ b/manager/sdk/sdk.go @@ -6,7 +6,7 @@ import ( "github.com/ethereum/go-ethereum/log" - _rpc "github.com/dapplink-labs/l2fp-aggregator/manager/rpc" + _rpc "github.com/Manta-Network/manta-fp-aggregator/manager/rpc" ) type FinalitySDK struct { diff --git a/manager/service.go b/manager/service.go index fda0665..35b707e 100644 --- a/manager/service.go +++ b/manager/service.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/manager/sdk" - "github.com/dapplink-labs/l2fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/manager/sdk" + "github.com/Manta-Network/manta-fp-aggregator/store" ) var NotVerifiedBlock = errors.New("the manager has not verified this block") diff --git a/manager/sign.go b/manager/sign.go index 2db8e5b..a482846 100644 --- a/manager/sign.go +++ b/manager/sign.go @@ -7,10 +7,10 @@ import ( "sync" "time" - "github.com/dapplink-labs/l2fp-aggregator/manager/types" - "github.com/dapplink-labs/l2fp-aggregator/node/common" - "github.com/dapplink-labs/l2fp-aggregator/sign" - "github.com/dapplink-labs/l2fp-aggregator/ws/server" + "github.com/Manta-Network/manta-fp-aggregator/manager/types" + "github.com/Manta-Network/manta-fp-aggregator/node/common" + "github.com/Manta-Network/manta-fp-aggregator/sign" + "github.com/Manta-Network/manta-fp-aggregator/ws/server" tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" diff --git a/manager/types/types.go b/manager/types/types.go index 239581f..684c3e9 100644 --- a/manager/types/types.go +++ b/manager/types/types.go @@ -4,7 +4,7 @@ import ( "context" "math/big" - "github.com/dapplink-labs/l2fp-aggregator/sign" + "github.com/Manta-Network/manta-fp-aggregator/sign" ) type SignMsgRequest struct { diff --git a/manta-fp-contracts b/manta-fp-contracts new file mode 160000 index 0000000..7062eaa --- /dev/null +++ b/manta-fp-contracts @@ -0,0 +1 @@ +Subproject commit 7062eaa86ec0d605df20106e065b4777a79a32d0 diff --git a/node/deal_msg.go b/node/deal_msg.go index 8fc78c3..0ed3fea 100644 --- a/node/deal_msg.go +++ b/node/deal_msg.go @@ -4,7 +4,7 @@ import ( "errors" "fmt" - "github.com/dapplink-labs/l2fp-aggregator/manager/types" + "github.com/Manta-Network/manta-fp-aggregator/manager/types" tdtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" tmtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" diff --git a/node/node.go b/node/node.go index 512c74c..59ba0dc 100644 --- a/node/node.go +++ b/node/node.go @@ -17,17 +17,17 @@ import ( "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/bindings/bls" - "github.com/dapplink-labs/l2fp-aggregator/bindings/finality" - "github.com/dapplink-labs/l2fp-aggregator/client" - common3 "github.com/dapplink-labs/l2fp-aggregator/common" - "github.com/dapplink-labs/l2fp-aggregator/config" - "github.com/dapplink-labs/l2fp-aggregator/manager/types" - common2 "github.com/dapplink-labs/l2fp-aggregator/node/common" - "github.com/dapplink-labs/l2fp-aggregator/sign" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer" - wsclient "github.com/dapplink-labs/l2fp-aggregator/ws/client" + "github.com/Manta-Network/manta-fp-aggregator/bindings/bls" + "github.com/Manta-Network/manta-fp-aggregator/bindings/finality" + "github.com/Manta-Network/manta-fp-aggregator/client" + common3 "github.com/Manta-Network/manta-fp-aggregator/common" + "github.com/Manta-Network/manta-fp-aggregator/config" + "github.com/Manta-Network/manta-fp-aggregator/manager/types" + common2 "github.com/Manta-Network/manta-fp-aggregator/node/common" + "github.com/Manta-Network/manta-fp-aggregator/sign" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer" + wsclient "github.com/Manta-Network/manta-fp-aggregator/ws/client" "github.com/consensys/gnark-crypto/ecc/bn254" tdtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types" diff --git a/synchronizer/babylon_process.go b/synchronizer/babylon_process.go index 443a2f8..8251f21 100644 --- a/synchronizer/babylon_process.go +++ b/synchronizer/babylon_process.go @@ -4,8 +4,8 @@ import ( types3 "github.com/babylonlabs-io/babylon/x/btccheckpoint/types" "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/dapplink-labs/l2fp-aggregator/common" - "github.com/dapplink-labs/l2fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/common" + "github.com/Manta-Network/manta-fp-aggregator/store" types2 "github.com/babylonlabs-io/babylon/x/btcstaking/types" "github.com/babylonlabs-io/babylon/x/finality/types" diff --git a/synchronizer/babylon_synchronizer.go b/synchronizer/babylon_synchronizer.go index 78eca47..6cab180 100644 --- a/synchronizer/babylon_synchronizer.go +++ b/synchronizer/babylon_synchronizer.go @@ -8,10 +8,10 @@ import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/common/tasks" - "github.com/dapplink-labs/l2fp-aggregator/config" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer/node" + "github.com/Manta-Network/manta-fp-aggregator/common/tasks" + "github.com/Manta-Network/manta-fp-aggregator/config" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer/node" "github.com/cometbft/cometbft/rpc/client/http" types2 "github.com/cometbft/cometbft/types" diff --git a/synchronizer/contracts/finality_relayer_manager.go b/synchronizer/contracts/finality_relayer_manager.go index bef131d..df8b795 100644 --- a/synchronizer/contracts/finality_relayer_manager.go +++ b/synchronizer/contracts/finality_relayer_manager.go @@ -7,8 +7,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/bindings/finality" - "github.com/dapplink-labs/l2fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/bindings/finality" + "github.com/Manta-Network/manta-fp-aggregator/store" ) type FinalityRelayerManager struct { diff --git a/synchronizer/eth_process.go b/synchronizer/eth_process.go index 9b44d17..3352300 100644 --- a/synchronizer/eth_process.go +++ b/synchronizer/eth_process.go @@ -3,8 +3,8 @@ package synchronizer import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer/contracts" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer/contracts" ) type EthEventProcess struct { diff --git a/synchronizer/eth_synchronizer.go b/synchronizer/eth_synchronizer.go index 6682a52..efd0bb6 100644 --- a/synchronizer/eth_synchronizer.go +++ b/synchronizer/eth_synchronizer.go @@ -11,11 +11,11 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/common/tasks" - "github.com/dapplink-labs/l2fp-aggregator/config" - "github.com/dapplink-labs/l2fp-aggregator/store" - "github.com/dapplink-labs/l2fp-aggregator/synchronizer/node" - node2 "github.com/dapplink-labs/l2fp-aggregator/synchronizer/node" + "github.com/Manta-Network/manta-fp-aggregator/common/tasks" + "github.com/Manta-Network/manta-fp-aggregator/config" + "github.com/Manta-Network/manta-fp-aggregator/store" + "github.com/Manta-Network/manta-fp-aggregator/synchronizer/node" + node2 "github.com/Manta-Network/manta-fp-aggregator/synchronizer/node" ) type EthSynchronizer struct { diff --git a/synchronizer/node/babylon_header_traversal.go b/synchronizer/node/babylon_header_traversal.go index 32d8e72..67b6980 100644 --- a/synchronizer/node/babylon_header_traversal.go +++ b/synchronizer/node/babylon_header_traversal.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/common/bigint" + "github.com/Manta-Network/manta-fp-aggregator/common/bigint" "github.com/cometbft/cometbft/rpc/client/http" types2 "github.com/cometbft/cometbft/types" diff --git a/synchronizer/node/client.go b/synchronizer/node/client.go index b888d39..950d365 100644 --- a/synchronizer/node/client.go +++ b/synchronizer/node/client.go @@ -16,7 +16,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rpc" - "github.com/dapplink-labs/l2fp-aggregator/common/retry" + "github.com/Manta-Network/manta-fp-aggregator/common/retry" ) const ( diff --git a/synchronizer/node/eth_header_traversal.go b/synchronizer/node/eth_header_traversal.go index c7b65f1..7776c0b 100644 --- a/synchronizer/node/eth_header_traversal.go +++ b/synchronizer/node/eth_header_traversal.go @@ -8,7 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/common/bigint" + "github.com/Manta-Network/manta-fp-aggregator/common/bigint" ) type EthHeaderTraversal struct { diff --git a/ws/client/client.go b/ws/client/client.go index ceff50c..1890a4f 100644 --- a/ws/client/client.go +++ b/ws/client/client.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/log" - "github.com/dapplink-labs/l2fp-aggregator/ws/client/tm" + "github.com/Manta-Network/manta-fp-aggregator/ws/client/tm" tmsync "github.com/tendermint/tendermint/libs/sync" tmtypes "github.com/tendermint/tendermint/rpc/jsonrpc/types"