Skip to content

Commit

Permalink
change dapplink-labs to Manta-Network
Browse files Browse the repository at this point in the history
  • Loading branch information
guoshijiang committed Jan 9, 2025
1 parent 0e614df commit b077f98
Show file tree
Hide file tree
Showing 26 changed files with 84 additions and 84 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ./...
Expand Down
24 changes: 12 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,25 @@ parent:
-->

<div align="center">
<h1> l2fp-aggregator </h1>
<h1> manta-fp-aggregator </h1>
</div>

<div align="center">
<a href="https://github.com/dapplink-labs/l2fp-aggregator/releases/latest">
<img alt="Version" src="https://img.shields.io/github/tag/dapplink-labs/l2fp-aggregator.svg" />
<a href="https://github.com/Manta-Network/manta-fp-aggregator/releases/latest">
<img alt="Version" src="https://img.shields.io/github/tag/Manta-Network/manta-fp-aggregator.svg" />
</a>
<a href="https://github.com/dapplink-labs/l2fp-aggregator/blob/main/LICENSE">
<img alt="License: Apache-2.0" src="https://img.shields.io/github/license/dapplink-labs/l2fp-aggregator.svg" />
<a href="https://github.com/Manta-Network/manta-fp-aggregator/blob/main/LICENSE">
<img alt="License: Apache-2.0" src="https://img.shields.io/github/license/Manta-Network/manta-fp-aggregator.svg" />
</a>
<a href="https://pkg.go.dev/github.com/dapplink-labs/l2fp-aggregator">
<img alt="GoDoc" src="https://godoc.org/github.com/dapplink-labs/l2fp-aggregator?status.svg" />
<a href="https://pkg.go.dev/github.com/Manta-Network/manta-fp-aggregator">
<img alt="GoDoc" src="https://godoc.org/github.com/Manta-Network/manta-fp-aggregator?status.svg" />
</a>
<a href="https://goreportcard.com/report/github.com/dapplink-labs/l2fp-aggregator">
<img alt="Go report card" src="https://goreportcard.com/badge/github.com/dapplink-labs/l2fp-aggregator"/>
<a href="https://goreportcard.com/report/github.com/Manta-Network/manta-fp-aggregator">
<img alt="Go report card" src="https://goreportcard.com/badge/github.com/Manta-Network/manta-fp-aggregator"/>
</a>
</div>

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/)

Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions cmd/cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion common/cliapp/lifecycle.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/dapplink-labs/l2fp-aggregator
module github.com/Manta-Network/manta-fp-aggregator

go 1.23.4

Expand Down
1 change: 0 additions & 1 deletion l2fp-contracts
Submodule l2fp-contracts deleted from 7866fc
26 changes: 13 additions & 13 deletions manager/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions manager/router/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manager/sdk/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions manager/service.go
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions manager/sign.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion manager/types/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions manta-fp-contracts
Submodule manta-fp-contracts added at 7062ea
2 changes: 1 addition & 1 deletion node/deal_msg.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
22 changes: 11 additions & 11 deletions node/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions synchronizer/babylon_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions synchronizer/babylon_synchronizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions synchronizer/contracts/finality_relayer_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions synchronizer/eth_process.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions synchronizer/eth_synchronizer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion synchronizer/node/babylon_header_traversal.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion synchronizer/node/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
2 changes: 1 addition & 1 deletion synchronizer/node/eth_header_traversal.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion ws/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b077f98

Please sign in to comment.