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.

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

Add parisnet #27

Merged
merged 4 commits into from
May 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,6 @@ mempool:

local:
docker-compose -f docker-compose.yml up -d --build

local-test:
docker-compose -f docker-compose.test.yml up -d --build
52 changes: 52 additions & 0 deletions build/dipdup.testnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,51 @@ mempool:
tzkt: oxfordnet_tzkt
rpc: oxfordnet_rpc

parisnet:
filters:
kinds:
- endorsement
- endorsement_with_dal
- transaction
- activate_account
- ballot
- delegation
- double_baking_evidence
- double_endorsement_evidence
- origination
- proposals
- reveal
- seed_nonce_revelation
- register_global_constant
- set_deposits_limit
- preendorsement
- double_preendorsement_evidence
- tx_rollup_commit
- tx_rollup_dispatch_tickets
- tx_rollup_finalize_commitment
- tx_rollup_origination
- tx_rollup_rejection
- tx_rollup_remove_commitment
- tx_rollup_return_bond
- tx_rollup_submit_batch
- transfer_ticket
- vdf_revelation
- Increase_paid_storage
- drain_delegate
- update_consensus_key
- smart_rollup_add_messages
- smart_rollup_originate
- smart_rollup_execute_outbox_message
- smart_rollup_refute
- smart_rollup_publish
- smart_rollup_recover_bond
- smart_rollup_timeout
- smart_rollup_cement
- dal_publish_commitment
datasources:
tzkt: parisnet_tzkt
rpc: parisnet_rpc

database:
kind: postgres
host: ${POSTGRES_HOST:-db}
Expand Down Expand Up @@ -131,6 +176,13 @@ datasources:
kind: tezos-node
url: https://rpc.tzkt.io/oxfordnet

parisnet_tzkt:
kind: tzkt
url: https://api.parisnet.tzkt.io
parisnet_rpc:
kind: tezos-node
url: https://rpc.tzkt.io/parisnet

profiler:
server: ${PROFILER_SERVER}
project: tezos-testnet-mempool
5 changes: 5 additions & 0 deletions cmd/mempool/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ func (indexer *Indexer) handleContent(ctx context.Context, tx bun.IDB, content n
return indexer.handleEndorsement(ctx, tx, content, operation)
case node.KindEndorsementWithSlot:
return indexer.handleEndorsementWithSlot(ctx, tx, content, operation)
case node.KindEndorsementWithDal:
return indexer.handleEndorsement(ctx, tx, content, operation)
case node.KindNonceRevelation:
var model models.NonceRevelation
return defaultHandler(ctx, tx, content, operation, &model)
Expand Down Expand Up @@ -306,6 +308,9 @@ func (indexer *Indexer) handleContent(ctx context.Context, tx bun.IDB, content n
case node.KindSrTimeout:
var model models.SmartRollupTimeout
return defaultHandler(ctx, tx, content, operation, &model)
case node.KindDalPublishCommitment:
var model models.DalPublishCommitment
return defaultHandler(ctx, tx, content, operation, &model)
case node.KindEvent:
default:
indexer.warn().Str("kind", content.Kind).Msg("unknown operation kind")
Expand Down
27 changes: 27 additions & 0 deletions cmd/mempool/models/dal_publish_commitment.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package models

import "github.com/uptrace/bun"

// DalPublishCommitment -
type DalPublishCommitment struct {
bun.BaseModel `bun:"table:dal_publish_commitment"`

MempoolOperation
Fee int64 `comment:"Fee to the baker, produced block, in which the operation was included (micro tez)." json:"fee,string"`
Counter int64 `bun:",pk" comment:"An account nonce which is used to prevent operation replay." json:"counter,string"`
GasLimit int64 `comment:"A cap on the amount of gas a given operation can consume." json:"gas_limit,string"`
StorageLimit int64 `comment:"A cap on the amount of storage a given operation can consume." json:"storage_limit,string"`
Source string `comment:"Address of the account who has sent the operation." index:"sr_refute_source_idx" json:"source,omitempty"`
SlotHeader SlotHeader `comment:"Published slot header" json:"slot_header"`
}

type SlotHeader struct {
SlotIndex int `json:"slot_index"`
Commitment string `json:"commitment"`
CommitmentProof string `json:"commitment_proof"`
}

// SetMempoolOperation -
func (i *DalPublishCommitment) SetMempoolOperation(operaiton MempoolOperation) {
i.MempoolOperation = operaiton
}
6 changes: 5 additions & 1 deletion cmd/mempool/models/mempool_operation.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type DefaultConstraint interface {
Transaction | TransferTicket | TxRollupCommit | TxRollupDispatchTickets | TxRollupFinalizeCommitment | TxRollupOrigination |
TxRollupRejection | TxRollupRemoveCommitment | TxRollupReturnBond | TxRollupSubmitBatch | VdfRevelation | IncreasePaidStorage |
UpdateConsensusKey | DelegateDrain | SmartRollupAddMessage | SmartRollupCement | SmartRollupExecute |
SmartRollupOriginate | SmartRollupPublish | SmartRollupRecoverBond | SmartRollupRefute | SmartRollupTimeout
SmartRollupOriginate | SmartRollupPublish | SmartRollupRecoverBond | SmartRollupRefute | SmartRollupTimeout | DalPublishCommitment
}

// ChangableMempoolOperation -
Expand Down Expand Up @@ -208,6 +208,8 @@ func getModelByKind(kind string) (interface{}, error) {
return &DoubleEndorsing{}, nil
case node.KindEndorsement:
return &Endorsement{}, nil
case node.KindEndorsementWithDal:
return &Endorsement{}, nil
case node.KindNonceRevelation:
return &NonceRevelation{}, nil
case node.KindOrigination:
Expand Down Expand Up @@ -268,6 +270,8 @@ func getModelByKind(kind string) (interface{}, error) {
return &SmartRollupRefute{}, nil
case node.KindSrTimeout:
return &SmartRollupTimeout{}, nil
case node.KindDalPublishCommitment:
return &DalPublishCommitment{}, nil

default:
return nil, errors.Wrap(node.ErrUnknownKind, kind)
Expand Down
2 changes: 2 additions & 0 deletions cmd/mempool/tzkt/data.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ var toTzKTKinds = map[string]string{
node.KindDoubleBaking: data.KindDoubleBaking,
node.KindDoubleEndorsing: data.KindDoubleEndorsing,
node.KindEndorsement: data.KindEndorsement,
node.KindEndorsementWithDal: data.KindEndorsement,
node.KindNonceRevelation: data.KindNonceRevelation,
node.KindOrigination: data.KindOrigination,
node.KindProposal: data.KindProposal,
Expand Down Expand Up @@ -44,6 +45,7 @@ var toTzKTKinds = map[string]string{
node.KindSrRecoverBond: data.KindSrRecoverBond,
node.KindSrRefute: data.KindSrRefute,
node.KindSrTimeout: data.KindSrRefute,
node.KindDalPublishCommitment: data.KindDalPublishCommitment,
}

// OperationMessage -
Expand Down
9 changes: 9 additions & 0 deletions cmd/mempool/tzkt/processors.go
Original file line number Diff line number Diff line change
Expand Up @@ -341,3 +341,12 @@ func operationFromSrRefute(model data.SmartRollupRefute) data.Operation {
Hash: model.Hash,
}
}

func operationFromDalPublishCommitment(model data.DalPublishCommitment) data.Operation {
return data.Operation{
Type: node.KindDalPublishCommitment,
Level: model.Level,
ID: model.ID,
Hash: model.Hash,
}
}
5 changes: 5 additions & 0 deletions cmd/mempool/tzkt/tzkt.go
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,9 @@ func (tzkt *TzKT) getAPIOperation(model interface{}) (data.Operation, error) {
case *data.SmartRollupRefute:
return operationFromSrRefute(*operation), nil

case *data.DalPublishCommitment:
return operationFromDalPublishCommitment(*operation), nil

default:
return data.Operation{}, errors.Wrapf(ErrInvalidOperationType, "%T", model)
}
Expand Down Expand Up @@ -591,6 +594,8 @@ func (tzkt *TzKT) getTableData(ctx context.Context, table *tableState, indexerSt
return getOperations(ctx, table, filters, tzkt.api.GetSmartRollupRecoverBond, operationFromSrRecoverBond)
case data.KindSrRefute:
return getOperations(ctx, table, filters, tzkt.api.GetSmartRollupRefute, operationFromSrRefute)
case data.KindDalPublishCommitment:
return getOperations(ctx, table, filters, tzkt.api.GetDalPublishCommitment, operationFromDalPublishCommitment)
default:
return errors.Wrap(ErrUnknownOperationKind, table.Table)
}
Expand Down
41 changes: 12 additions & 29 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ go 1.22
require (
github.com/btcsuite/btcutil v1.0.2
github.com/dipdup-io/workerpool v0.0.4
github.com/dipdup-net/go-lib v0.3.6
github.com/dipdup-net/go-lib v0.4.2
github.com/grafana/pyroscope-go v1.1.1
github.com/json-iterator/go v1.1.12
github.com/karlseguin/ccache v2.0.3+incompatible
github.com/lib/pq v1.10.9
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.30.0
github.com/rs/zerolog v1.31.0
github.com/spf13/cobra v1.6.1
github.com/ubiq/go-ubiq v3.0.1+incompatible
github.com/uptrace/bun v1.1.14
golang.org/x/crypto v0.17.0
github.com/uptrace/bun v1.1.17
golang.org/x/crypto v0.21.0
)

require (
Expand All @@ -34,32 +34,23 @@ require (
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
github.com/ebellocchia/go-base58 v0.1.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
github.com/go-pg/pg/v10 v10.10.6 // indirect
github.com/go-pg/zerochecker v0.2.0 // indirect
github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
github.com/go-playground/validator/v10 v10.15.0 // indirect
github.com/go-sql-driver/mysql v1.7.1 // indirect
github.com/go-playground/validator/v10 v10.18.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/grafana/pyroscope-go/godeltaprof v0.1.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
github.com/jackc/pgx/v5 v5.5.4 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/karlseguin/expect v1.0.8 // indirect
github.com/klauspost/compress v1.17.3 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-sqlite3 v1.14.19 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/moby/patternmatcher v0.5.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
Expand All @@ -84,25 +75,17 @@ require (
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
github.com/uptrace/bun/dialect/pgdialect v1.1.14 // indirect
github.com/vmihailenco/bufpool v0.1.11 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.0 // indirect
github.com/vmihailenco/tagparser v0.1.2 // indirect
github.com/uptrace/bun/dialect/pgdialect v1.1.17 // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // indirect
golang.org/x/mod v0.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.10.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
google.golang.org/grpc v1.58.3 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/mysql v1.5.1 // indirect
gorm.io/driver/postgres v1.5.2 // indirect
gorm.io/driver/sqlite v1.5.2 // indirect
gorm.io/gorm v1.25.3 // indirect
mellium.im/sasl v0.3.1 // indirect
)
Loading
Loading