From 8a49da4fc1e7465ad70ccd5bd6d395ea7322dcb8 Mon Sep 17 00:00:00 2001 From: Daniel Olshansky Date: Wed, 13 Dec 2023 20:16:30 -0800 Subject: [PATCH] Add back the hack for session rollover --- go.mod | 4 ++-- pkg/relayer/proxy/relay_verifier.go | 8 +++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 08aa46324..ddb25c1fd 100644 --- a/go.mod +++ b/go.mod @@ -24,7 +24,6 @@ require ( github.com/athanorlabs/go-dleq v0.1.0 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 - github.com/cosmos/cosmos-proto v1.0.0-beta.2 github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/gogoproto v1.4.11 github.com/cosmos/ibc-go/v7 v7.1.0 @@ -46,7 +45,6 @@ require ( go.uber.org/multierr v1.11.0 golang.org/x/crypto v0.15.0 golang.org/x/sync v0.5.0 - google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb google.golang.org/grpc v1.59.0 gopkg.in/yaml.v2 v2.4.0 ) @@ -90,6 +88,7 @@ require ( github.com/containerd/cgroups v1.1.0 // indirect github.com/coreos/go-systemd/v22 v22.5.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0 // indirect @@ -285,6 +284,7 @@ require ( google.golang.org/api v0.143.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/genproto v0.0.0-20230913181813-007df8e322eb // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/pkg/relayer/proxy/relay_verifier.go b/pkg/relayer/proxy/relay_verifier.go index 8fa075d9c..abb9e4d8a 100644 --- a/pkg/relayer/proxy/relay_verifier.go +++ b/pkg/relayer/proxy/relay_verifier.go @@ -6,7 +6,6 @@ import ( sdkerrors "cosmossdk.io/errors" ring_secp256k1 "github.com/athanorlabs/go-dleq/secp256k1" "github.com/noot/ring-go" - "github.com/pokt-network/poktroll/x/service/types" sharedtypes "github.com/pokt-network/poktroll/x/shared/types" ) @@ -95,8 +94,11 @@ func (rp *relayerProxy) VerifyRelayRequest( }). Msg("verifying relay request session") - currentBlock := rp.blockClient.LastNBlocks(ctx, 1)[0] - session, err := rp.sessionQuerier.GetSession(ctx, appAddress, service.Id, currentBlock.Height()) + // TODO_IN_THIS_PR: Either slow down blocks, or increase numBlocksPerSession, + // or create a ticket related to session rollovers and link to it here. + // currentBlock := rp.blockClient.LastNBlocks(ctx, 1)[0] + // session, err := rp.sessionQuerier.GetSession(ctx, appAddress, service.Id, currentBlock.Height()) + session, err := rp.sessionQuerier.GetSession(ctx, appAddress, service.Id, relayRequest.Meta.SessionHeader.SessionStartBlockHeight) if err != nil { return err }