Skip to content

Commit

Permalink
fixed: adding catchup and query for arbitrary operation
Browse files Browse the repository at this point in the history
  • Loading branch information
@olegfomenko
olegfomenko committed Jun 26, 2024
1 parent 9c147d9 commit 0b0aff7
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 8 deletions.
14 changes: 7 additions & 7 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ require (
github.com/btcsuite/btcd/btcec/v2 v2.3.2
github.com/cosmos/cosmos-sdk v0.46.12
github.com/ethereum/go-ethereum v1.10.26
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
github.com/hashicorp/vault/api v1.8.2
github.com/ignite/cli v0.26.1
github.com/prometheus/client_golang v1.18.0
github.com/rarimo/go-merkle v0.0.0-20231004122345-36fa49031c66
github.com/rarimo/rarimo-core v1.1.2
github.com/rarimo/rarimo-core v1.1.3-rc1
github.com/rubenv/sql-migrate v1.2.0
github.com/tendermint/tendermint v0.34.28
gitlab.com/distributed_lab/figure v2.1.0+incompatible
gitlab.com/distributed_lab/kit v1.11.1
gitlab.com/distributed_lab/logan v3.8.1+incompatible
golang.org/x/net v0.24.0
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8
google.golang.org/grpc v1.64.0
google.golang.org/protobuf v1.34.1
)

require (
Expand Down Expand Up @@ -160,10 +160,10 @@ require (
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/text v0.15.0 // indirect
golang.org/x/time v0.5.0 // indirect
google.golang.org/genproto v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/square/go-jose.v2 v2.5.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
7 changes: 7 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -956,6 +956,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1/go.mod h1:5SN9VR2LTsRFsrEC6FHgRbTWrTHu6tqPeKxEQv15giM=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU=
github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0=
github.com/gtank/merlin v0.1.1-0.20191105220539-8318aed1a79f/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s=
Expand Down Expand Up @@ -1306,6 +1307,8 @@ github.com/rarimo/rarimo-core v1.1.1-rc1 h1:0/jdSHUu3YHPWUHFL02wCWq0SJxKT6E/3EWb
github.com/rarimo/rarimo-core v1.1.1-rc1/go.mod h1:AsSuY7alcrFzQ+pS0z3WN0cesmQcgHRTzTP/F2z5/0U=
github.com/rarimo/rarimo-core v1.1.2 h1:Qfrc6wqCvjezZdpxAeHEKHrEtpBhozkClAy/I5JcbOw=
github.com/rarimo/rarimo-core v1.1.2/go.mod h1:MlkjdHXyAi6xQWuJOuDQPWQyRyp/2yRzMOiqxHAZ4WI=
github.com/rarimo/rarimo-core v1.1.3-rc1 h1:BfJdIeFNg8NvGj5mXBvPn5dLfnD/KxTBCiqba3wH1bg=
github.com/rarimo/rarimo-core v1.1.3-rc1/go.mod h1:InfFSGsvN0Y/A4baQE7TioGYxHHK1EsCRFcrmOMe4BE=
github.com/rarimo/tss-lib/v2 v2.0.1 h1:q2ar8txLLal41lXy7Xv8AXVQ7TWeXX0fzWfbUIF81qU=
github.com/rarimo/tss-lib/v2 v2.0.1/go.mod h1:s4LRfEqj89DhfNb+oraW0dURt5LtOHWXb9Gtkghn0L8=
github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM=
Expand Down Expand Up @@ -1845,6 +1848,7 @@ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down Expand Up @@ -2135,8 +2139,10 @@ google.golang.org/genproto v0.0.0-20240415180920-8c6c420018be h1:g4aX8SUFA8V5F4L
google.golang.org/genproto v0.0.0-20240415180920-8c6c420018be/go.mod h1:FeSdT5fk+lkxatqJP38MsUicGqHax5cLtmy/6TAuxO4=
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be h1:Zz7rLWqp0ApfsR/l7+zSHhY3PMiH2xqgxlfYfAfNpoU=
google.golang.org/genproto/googleapis/api v0.0.0-20240415180920-8c6c420018be/go.mod h1:dvdCTIoAGbkWbcIKBniID56/7XHTt6WfxXNMxuziJ+w=
google.golang.org/genproto/googleapis/api v0.0.0-20240513163218-0867130af1f8/go.mod h1:vPrPUTsDCYxXWjP7clS81mZ6/803D8K4iM9Ma27VKas=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be h1:LG9vZxsWGOmUKieR8wPAUR3u3MpnYFQZROPIMaXh7/A=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240513163218-0867130af1f8/go.mod h1:I7Y+G38R2bu5j1aLzfFmQfTcU/WnFuqDwLZAbvKTKpM=
google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag=
google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
Expand All @@ -2159,6 +2165,7 @@ google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
Expand Down
1 change: 1 addition & 0 deletions internal/cli/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ func Run(args []string) {
go pool.NewIdentityAggregatedTransferOperationSubscriber(ctx.Pool(), ctx.Tendermint(), ctx.Log()).Run(ctx.Context())
go pool.NewWorldCoinIdentityTransferOperationSubscriber(ctx.Pool(), ctx.Tendermint(), ctx.Log()).Run(ctx.Context())
go pool.NewCSCARootUpdateOperationSubscriber(ctx.Pool(), ctx.Tendermint(), ctx.Log()).Run(ctx.Context())
go pool.NewArbitraryOperationSubscriber(ctx.Pool(), ctx.Tendermint(), ctx.Log()).Run(ctx.Context())
go pool.NewOperationCatchupper(ctx.Pool(), ctx.Client(), ctx.Log()).Run(ctx.Context())

manager := core.NewSessionManager()
Expand Down
1 change: 1 addition & 0 deletions internal/pool/catchupper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ var acceptableOperationTypes = map[rarimo.OpType]struct{}{
rarimo.OpType_IDENTITY_AGGREGATED_TRANSFER: {},
rarimo.OpType_WORLDCOIN_IDENTITY_TRANSFER: {},
rarimo.OpType_CSCA_ROOT_UPDATE: {},
rarimo.OpType_ARBITRARY: {},
}

// OperationCatchupper catches up old unsigned operations from core.
Expand Down
13 changes: 12 additions & 1 deletion internal/pool/subscriber.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const (
OpQueryWorldCoinIdentityTransfer = "tm.event='Tx' AND operation_approved.operation_type='WORLDCOIN_IDENTITY_TRANSFER'"
OpQueryIdentityAggregatedTransfer = "tm.event='NewBlock' AND operation_approved.operation_type='IDENTITY_AGGREGATED_TRANSFER'"
OpQueryCSCARootUpdate = "tm.event='NewBlock' AND operation_approved.operation_type='CSCA_ROOT_UPDATE'"
OpQueryArbitrary = "tm.event='NewBlock' AND operation_approved.operation_type='ARBITRARY'"
OpPoolSize = 1000
)

Expand Down Expand Up @@ -111,7 +112,7 @@ func NewTransferOperationSubscriber(pool *Pool, tendermint *http.HTTP, log *loga
}
}

// NewCSCARootUpdateOperationSubscriber creates the subscriber instance for listening new transfer operations
// NewCSCARootUpdateOperationSubscriber creates the subscriber instance for listening new CSCA root update operations
func NewCSCARootUpdateOperationSubscriber(pool *Pool, tendermint *http.HTTP, log *logan.Entry) *OperationSubscriber {
return &OperationSubscriber{
pool: pool,
Expand All @@ -121,6 +122,16 @@ func NewCSCARootUpdateOperationSubscriber(pool *Pool, tendermint *http.HTTP, log
}
}

// NewArbitraryOperationSubscriber creates the subscriber instance for listening new arbitrary operations
func NewArbitraryOperationSubscriber(pool *Pool, tendermint *http.HTTP, log *logan.Entry) *OperationSubscriber {
return &OperationSubscriber{
pool: pool,
log: log,
client: tendermint,
query: OpQueryArbitrary,
}
}

func (o *OperationSubscriber) Run(ctx context.Context) {
o.log.Infof("[Pool] Subscribing to the pool. Query: %s", o.query)

Expand Down

0 comments on commit 0b0aff7

Please sign in to comment.