Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

intergate prover contract, update abi, change signature logic #716

Merged
merged 1 commit into from
Oct 25, 2024
Merged

intergate prover contract, update abi, change signature logic #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cmd/apinode/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ var defaultTestnetConfig = &Config{
BootNodeMultiAddr: "/dns4/bootnode-0.testnet.iotex.one/tcp/4689/ipfs/12D3KooWFnaTYuLo8Mkbm3wzaWHtUuaxBRe24Uiopu15Wr5EhD3o",
IoTeXChainID: 2,
ChainEndpoint: "https://babel-api.testnet.iotex.io",
BeginningBlockNumber: 28345000,
TaskManagerContractAddr: "0x65aF86776CCFc60781a70c38F44625853d7A842A",
BeginningBlockNumber: 28685000,
TaskManagerContractAddr: "0x7AEF1Ed51c1EF3f9e118e25De5D65Ff9F7E2fd29",
env: "TESTNET",
}

Expand Down
8 changes: 4 additions & 4 deletions cmd/prover/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ var (
VMEndpoints: `{"1":"localhost:4001","2":"localhost:4002","3":"zkwasm:4001","4":"wasm:4001"}`,
ChainEndpoint: "https://babel-api.testnet.iotex.io",
DatasourceDSN: "postgres://postgres:mysecretpassword@postgres:5432/w3bstream?sslmode=disable",
ProjectContractAddr: "0x4804e93c2A0A44BC055aA6e4b6d5Ead3FC2596Cd",
RouterContractAddr: "0x145C282cCc7f60c6B19664b01e08c5Cae7C97CbB",
TaskManagerContractAddr: "0x65aF86776CCFc60781a70c38F44625853d7A842A",
ProjectContractAddr: "0x2e45132c8fFeBa7490d57A6118Bd060E55161564",
RouterContractAddr: "0xBAB5D88AbECd06c3969fa3CE2597DDD31d13e3C3",
TaskManagerContractAddr: "0x7AEF1Ed51c1EF3f9e118e25De5D65Ff9F7E2fd29",
ProverOperatorPrvKey: "a5f4e99aa80342d5451e8f8fd0dc357ccddb70d3827428fb1fc366f70833497f",
BeginningBlockNumber: 28345000,
BeginningBlockNumber: 28685000,
LocalDBDir: "./local_db",
env: "TESTNET",
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/sequencer/api/http.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ func (s *httpServer) submitBlock(c *gin.Context, req *jsonRpcReq, rsp *jsonRpcRs
},
Nonce: new(big.Int).SetUint64(nonce),
},
minter.BlockInfo{
minter.BlockHeader{
Meta: h.Meta,
Prevhash: h.PrevHash,
MerkleRoot: h.MerkleRoot,
Expand Down
56 changes: 30 additions & 26 deletions cmd/sequencer/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,40 @@ import (
)

type Config struct {
LogLevel slog.Level `env:"LOG_LEVEL,optional"`
ServiceEndpoint string `env:"HTTP_SERVICE_ENDPOINT"`
BootNodeMultiAddr string `env:"BOOTNODE_MULTIADDR"`
IoTeXChainID int `env:"IOTEX_CHAINID"`
ChainEndpoint string `env:"CHAIN_ENDPOINT,optional"`
OperatorPrvKey string `env:"OPERATOR_PRIVATE_KEY,optional"`
LocalDBDir string `env:"LOCAL_DB_DIRECTORY,optional"`
BeginningBlockNumber uint64 `env:"BEGINNING_BLOCK_NUMBER,optional"`
ProverContractAddr string `env:"PROVER_CONTRACT_ADDRESS,optional"`
DaoContractAddr string `env:"DAO_CONTRACT_ADDRESS,optional"`
MinterContractAddr string `env:"MINTER_CONTRACT_ADDRESS,optional"`
TaskManagerContractAddr string `env:"TASK_MANAGER_CONTRACT_ADDRESS,optional"`
env string `env:"-"`
LogLevel slog.Level `env:"LOG_LEVEL,optional"`
ServiceEndpoint string `env:"HTTP_SERVICE_ENDPOINT"`
BootNodeMultiAddr string `env:"BOOTNODE_MULTIADDR"`
IoTeXChainID int `env:"IOTEX_CHAINID"`
DatasourceDSN string `env:"DATASOURCE_DSN"`
ChainEndpoint string `env:"CHAIN_ENDPOINT,optional"`
OperatorPrvKey string `env:"OPERATOR_PRIVATE_KEY,optional"`
LocalDBDir string `env:"LOCAL_DB_DIRECTORY,optional"`
BeginningBlockNumber uint64 `env:"BEGINNING_BLOCK_NUMBER,optional"`
ProverContractAddr string `env:"PROVER_CONTRACT_ADDRESS,optional"`
DaoContractAddr string `env:"DAO_CONTRACT_ADDRESS,optional"`
MinterContractAddr string `env:"MINTER_CONTRACT_ADDRESS,optional"`
TaskManagerContractAddr string `env:"TASK_MANAGER_CONTRACT_ADDRESS,optional"`
BlockHeaderValidatorContractAddr string `env:"BLOCK_HEADER_VALIDATOR_CONTRACT_ADDRESS,optional"`
env string `env:"-"`
}

var (
defaultTestnetConfig = &Config{
LogLevel: slog.LevelInfo,
ServiceEndpoint: ":9001",
BootNodeMultiAddr: "/dns4/bootnode-0.testnet.iotex.one/tcp/4689/ipfs/12D3KooWFnaTYuLo8Mkbm3wzaWHtUuaxBRe24Uiopu15Wr5EhD3o",
IoTeXChainID: 2,
ChainEndpoint: "https://babel-api.testnet.iotex.io",
OperatorPrvKey: "33e6ba3e033131026903f34dfa208feb88c284880530cf76280b68d38041c67b",
ProverContractAddr: "0xf9b850A50Ef236CADf4406Edf5a0B588142D238D",
DaoContractAddr: "0xA7b3c2a257693363a9f043CC9338DbA88E1f83aF",
MinterContractAddr: "0x102a1352557B3f6c65FBb44bF7959F8eacC30992",
TaskManagerContractAddr: "0x65aF86776CCFc60781a70c38F44625853d7A842A",
LocalDBDir: "./local_db",
BeginningBlockNumber: 28345000,
env: "TESTNET",
LogLevel: slog.LevelInfo,
ServiceEndpoint: ":9001",
BootNodeMultiAddr: "/dns4/bootnode-0.testnet.iotex.one/tcp/4689/ipfs/12D3KooWFnaTYuLo8Mkbm3wzaWHtUuaxBRe24Uiopu15Wr5EhD3o",
DatasourceDSN: "postgres://postgres:mysecretpassword@postgres:5432/w3bstream?sslmode=disable",
IoTeXChainID: 2,
ChainEndpoint: "https://babel-api.testnet.iotex.io",
OperatorPrvKey: "33e6ba3e033131026903f34dfa208feb88c284880530cf76280b68d38041c67b",
ProverContractAddr: "0x92aE72A5f15ee8cF61f950A60a600e17875644b2",
DaoContractAddr: "0xAF2C7967BD575C5a4b9a19333faC8d24744775f0",
MinterContractAddr: "0xeC0e0749Ec1434C6B23A7175B1309C8AEBa29da9",
TaskManagerContractAddr: "0x7AEF1Ed51c1EF3f9e118e25De5D65Ff9F7E2fd29",
BlockHeaderValidatorContractAddr: "0xd74263530C4e555CEEb3901d4165D83B4071A5e7",
LocalDBDir: "./local_db",
BeginningBlockNumber: 28685000,
env: "TESTNET",
}
)

Expand Down
14 changes: 6 additions & 8 deletions cmd/sequencer/db/db.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ type blockHead struct {

type prover struct {
gorm.Model
ProverID uint64 `gorm:"uniqueIndex:prover_id,not null"`
OperatorAddr common.Address `gorm:"index:prover_operator,not null"`
Prover common.Address `gorm:"uniqueIndex:prover,not null"`
}

type task struct {
Expand Down Expand Up @@ -119,19 +118,18 @@ func (p *DB) Provers() ([]common.Address, error) {
}
res := make([]common.Address, 0, len(ts))
for _, t := range ts {
res = append(res, t.OperatorAddr)
res = append(res, t.Prover)
}
return res, nil
}

func (p *DB) UpsertProver(id uint64, operator common.Address) error {
func (p *DB) UpsertProver(addr common.Address) error {
t := prover{
ProverID: id,
OperatorAddr: operator,
Prover: addr,
}
err := p.db.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "prover_id"}},
DoUpdates: clause.AssignmentColumns([]string{"operator_addr"}),
Columns: []clause.Column{{Name: "prover"}},
DoNothing: true,
}).Create(&t).Error
return errors.Wrap(err, "failed to upsert prover")
}
Expand Down
17 changes: 12 additions & 5 deletions cmd/sequencer/sequencer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/iotexproject/w3bstream/cmd/sequencer/api"
"github.com/iotexproject/w3bstream/cmd/sequencer/config"
"github.com/iotexproject/w3bstream/cmd/sequencer/db"
"github.com/iotexproject/w3bstream/datasource"
"github.com/iotexproject/w3bstream/monitor"
"github.com/iotexproject/w3bstream/p2p"
"github.com/iotexproject/w3bstream/task/assigner"
Expand Down Expand Up @@ -42,10 +43,11 @@ func (s *Sequencer) Start() error {
SettleTask: s.database.DeleteTask,
},
&monitor.ContractAddr{
Prover: common.HexToAddress(s.config.ProverContractAddr),
Dao: common.HexToAddress(s.config.DaoContractAddr),
Minter: common.HexToAddress(s.config.MinterContractAddr),
TaskManager: common.HexToAddress(s.config.TaskManagerContractAddr),
Prover: common.HexToAddress(s.config.ProverContractAddr),
Dao: common.HexToAddress(s.config.DaoContractAddr),
Minter: common.HexToAddress(s.config.MinterContractAddr),
TaskManager: common.HexToAddress(s.config.TaskManagerContractAddr),
BlockHeaderValidator: common.HexToAddress(s.config.BlockHeaderValidatorContractAddr),
},
s.config.BeginningBlockNumber,
s.config.ChainEndpoint,
Expand All @@ -57,7 +59,12 @@ func (s *Sequencer) Start() error {
log.Fatal(errors.Wrap(err, "failed to new p2p pubsub"))
}

if err := assigner.Run(s.database, s.privateKey, s.config.ChainEndpoint, common.HexToAddress(s.config.MinterContractAddr)); err != nil {
datasource, err := datasource.NewPostgres(s.config.DatasourceDSN)
if err != nil {
return errors.Wrap(err, "failed to new datasource")
}

if err := assigner.Run(s.database, s.privateKey, s.config.ChainEndpoint, datasource.Retrieve, common.HexToAddress(s.config.MinterContractAddr)); err != nil {
log.Fatal(errors.Wrap(err, "failed to run task assigner"))
}

Expand Down
63 changes: 38 additions & 25 deletions monitor/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"github.com/ethereum/go-ethereum/ethclient"
"github.com/pkg/errors"

"github.com/iotexproject/w3bstream/smartcontracts/go/blockheadervalidator"
"github.com/iotexproject/w3bstream/smartcontracts/go/dao"
"github.com/iotexproject/w3bstream/smartcontracts/go/minter"
"github.com/iotexproject/w3bstream/smartcontracts/go/project"
Expand All @@ -31,7 +32,7 @@ type (
AssignTask func(uint64, common.Hash, common.Address) error
SettleTask func(uint64, common.Hash, common.Hash) error
UpsertProject func(uint64, string, common.Hash) error
UpsertProver func(uint64, common.Address) error
UpsertProver func(common.Address) error
)

type Handler struct {
Expand All @@ -46,25 +47,27 @@ type Handler struct {
}

type ContractAddr struct {
Prover common.Address
Project common.Address
Dao common.Address
Minter common.Address
TaskManager common.Address
Prover common.Address
Project common.Address
Dao common.Address
Minter common.Address
TaskManager common.Address
BlockHeaderValidator common.Address
}

type contract struct {
h *Handler
addr *ContractAddr
beginningBlockNumber uint64
listStepSize uint64
watchInterval time.Duration
client *ethclient.Client
daoInstance *dao.Dao
minterInstance *minter.Minter
taskManagerInstance *taskmanager.Taskmanager
proverInstance *prover.Prover
projectInstance *project.Project
h *Handler
addr *ContractAddr
beginningBlockNumber uint64
listStepSize uint64
watchInterval time.Duration
client *ethclient.Client
daoInstance *dao.Dao
minterInstance *minter.Minter
taskManagerInstance *taskmanager.Taskmanager
proverInstance *prover.Prover
projectInstance *project.Project
blockHeaderValidatorInstance *blockheadervalidator.Blockheadervalidator
}

var (
Expand All @@ -73,7 +76,7 @@ var (
taskAssignedTopic = crypto.Keccak256Hash([]byte("TaskAssigned(uint256,bytes32,address,uint256)"))
taskSettledTopic = crypto.Keccak256Hash([]byte("TaskSettled(uint256,bytes32,address)"))
projectConfigUpdatedTopic = crypto.Keccak256Hash([]byte("ProjectConfigUpdated(uint256,string,bytes32)"))
operatorSetTopic = crypto.Keccak256Hash([]byte("OperatorSet(uint256,address)"))
proverSetTopic = crypto.Keccak256Hash([]byte("BeneficiarySet(address,address)"))
)

var allTopic = []common.Hash{
Expand All @@ -82,7 +85,7 @@ var allTopic = []common.Hash{
taskAssignedTopic,
taskSettledTopic,
projectConfigUpdatedTopic,
operatorSetTopic,
proverSetTopic,
}

var emptyAddr = common.Address{}
Expand All @@ -104,6 +107,9 @@ func (a *ContractAddr) all() []common.Address {
if !bytes.Equal(a.TaskManager[:], emptyAddr[:]) {
all = append(all, a.TaskManager)
}
if !bytes.Equal(a.BlockHeaderValidator[:], emptyAddr[:]) {
all = append(all, a.BlockHeaderValidator)
}
return all
}

Expand All @@ -129,10 +135,10 @@ func (c *contract) processLogs(logs []types.Log) error {
return err
}
case nbitsSetTopic:
if c.minterInstance == nil || c.h.UpsertNBits == nil {
if c.blockHeaderValidatorInstance == nil || c.h.UpsertNBits == nil {
continue
}
e, err := c.minterInstance.ParseNBitsSet(l)
e, err := c.blockHeaderValidatorInstance.ParseNBitsSet(l)
if err != nil {
return errors.Wrap(err, "failed to parse nbits set event")
}
Expand Down Expand Up @@ -172,15 +178,15 @@ func (c *contract) processLogs(logs []types.Log) error {
if err := c.h.UpsertProject(e.ProjectId.Uint64(), e.Uri, e.Hash); err != nil {
return err
}
case operatorSetTopic:
case proverSetTopic:
if c.proverInstance == nil || c.h.UpsertProver == nil {
continue
}
e, err := c.proverInstance.ParseOperatorSet(l)
e, err := c.proverInstance.ParseBeneficiarySet(l)
if err != nil {
return errors.Wrap(err, "failed to parse operator set event")
return errors.Wrap(err, "failed to parse prover set event")
}
if err := c.h.UpsertProver(e.Id.Uint64(), e.Operator); err != nil {
if err := c.h.UpsertProver(e.Prover); err != nil {
return err
}
}
Expand Down Expand Up @@ -320,6 +326,13 @@ func Run(h *Handler, addr *ContractAddr, beginningBlockNumber uint64, chainEndpo
}
c.projectInstance = projectInstance
}
if !bytes.Equal(addr.BlockHeaderValidator[:], emptyAddr[:]) {
blockHeaderValidatorInstance, err := blockheadervalidator.NewBlockheadervalidator(addr.BlockHeaderValidator, client)
if err != nil {
return errors.Wrap(err, "failed to new block header validator contract instance")
}
c.blockHeaderValidatorInstance = blockHeaderValidatorInstance
}

listedBlockNumber, err := c.list()
if err != nil {
Expand Down
Loading
Loading