@@ -3,9 +3,10 @@ package module
33import (
44 "context"
55 "fmt"
6+ "time"
7+
68 "github.com/ethereum/go-ethereum/common"
79 "github.com/hyperledger-labs/yui-relayer/log"
8- "time"
910
1011 "github.com/ethereum/go-ethereum/crypto"
1112
@@ -50,8 +51,8 @@ func (pr *Prover) SetupForRelay(ctx context.Context) error {
5051// CreateInitialLightClientState returns a pair of ClientState and ConsensusState based on the state of the self chain at `height`.
5152// These states will be submitted to the counterparty chain as MsgCreateClient.
5253// If `height` is nil, the latest finalized height is selected automatically.
53- func (pr * Prover ) CreateInitialLightClientState (height exported.Height ) (exported.ClientState , exported.ConsensusState , error ) {
54- latestHeight , err := pr .chain .LatestHeight ()
54+ func (pr * Prover ) CreateInitialLightClientState (ctx context. Context , height exported.Height ) (exported.ClientState , exported.ConsensusState , error ) {
55+ latestHeight , err := pr .chain .LatestHeight (context . TODO () )
5556 if err != nil {
5657 return nil , nil , err
5758 }
@@ -74,12 +75,12 @@ func (pr *Prover) CreateInitialLightClientState(height exported.Height) (exporte
7475}
7576
7677// GetLatestFinalizedHeader returns the latest finalized header from the chain
77- func (pr * Prover ) GetLatestFinalizedHeader () (out core.Header , err error ) {
78- latestHeight , err := pr .chain .LatestHeight ()
78+ func (pr * Prover ) GetLatestFinalizedHeader (ctx context. Context ) (out core.Header , err error ) {
79+ latestHeight , err := pr .chain .LatestHeight (context . TODO () )
7980 if err != nil {
8081 return nil , err
8182 }
82- header , err := pr .GetLatestFinalizedHeaderByLatestHeight (latestHeight .GetRevisionHeight ())
83+ header , err := pr .GetLatestFinalizedHeaderByLatestHeight (context . TODO (), latestHeight .GetRevisionHeight ())
8384 if err != nil {
8485 return nil , err
8586 }
@@ -88,7 +89,7 @@ func (pr *Prover) GetLatestFinalizedHeader() (out core.Header, err error) {
8889}
8990
9091// GetLatestFinalizedHeaderByLatestHeight returns the latest finalized verifiable header from the chain
91- func (pr * Prover ) GetLatestFinalizedHeaderByLatestHeight (latestBlockNumber uint64 ) (core.Header , error ) {
92+ func (pr * Prover ) GetLatestFinalizedHeaderByLatestHeight (ctx context. Context , latestBlockNumber uint64 ) (core.Header , error ) {
9293 height , finalizedHeader , err := queryLatestFinalizedHeader (pr .chain .Header , latestBlockNumber )
9394 if err != nil {
9495 return nil , err
@@ -98,10 +99,10 @@ func (pr *Prover) GetLatestFinalizedHeaderByLatestHeight(latestBlockNumber uint6
9899}
99100
100101// SetupHeadersForUpdate creates a new header based on a given header
101- func (pr * Prover ) SetupHeadersForUpdate (counterparty core.FinalityAwareChain , latestFinalizedHeader core.Header ) ([]core.Header , error ) {
102+ func (pr * Prover ) SetupHeadersForUpdate (ctx context. Context , counterparty core.FinalityAwareChain , latestFinalizedHeader core.Header ) ([]core.Header , error ) {
102103 header := latestFinalizedHeader .(* Header )
103104 // LCP doesn't need height / EVM needs latest height
104- latestHeightOnDstChain , err := counterparty .LatestHeight ()
105+ latestHeightOnDstChain , err := counterparty .LatestHeight (context . TODO () )
105106 if err != nil {
106107 return nil , err
107108 }
@@ -113,10 +114,10 @@ func (pr *Prover) SetupHeadersForUpdate(counterparty core.FinalityAwareChain, la
113114 if err = pr .chain .Codec ().UnpackAny (csRes .ClientState , & cs ); err != nil {
114115 return nil , err
115116 }
116- return pr .SetupHeadersForUpdateByLatestHeight (cs .GetLatestHeight (), header )
117+ return pr .SetupHeadersForUpdateByLatestHeight (context . TODO (), cs .GetLatestHeight (), header )
117118}
118119
119- func (pr * Prover ) SetupHeadersForUpdateByLatestHeight (clientStateLatestHeight exported.Height , latestFinalizedHeader * Header ) ([]core.Header , error ) {
120+ func (pr * Prover ) SetupHeadersForUpdateByLatestHeight (ctx context. Context , clientStateLatestHeight exported.Height , latestFinalizedHeader * Header ) ([]core.Header , error ) {
120121 queryVerifiableNeighboringEpochHeader := func (height uint64 , limitHeight uint64 ) (core.Header , error ) {
121122 ethHeaders , err := queryFinalizedHeader (pr .chain .Header , height , limitHeight )
122123 if err != nil {
@@ -128,7 +129,7 @@ func (pr *Prover) SetupHeadersForUpdateByLatestHeight(clientStateLatestHeight ex
128129 }
129130 return pr .withProofAndValidators (height , ethHeaders )
130131 }
131- latestHeight , err := pr .chain .LatestHeight ()
132+ latestHeight , err := pr .chain .LatestHeight (context . TODO () )
132133 if err != nil {
133134 return nil , err
134135 }
@@ -146,8 +147,8 @@ func (pr *Prover) ProveState(ctx core.QueryContext, path string, value []byte) (
146147 return proof , proofHeight , err
147148}
148149
149- func (pr * Prover ) CheckRefreshRequired (counterparty core.ChainInfoICS02Querier ) (bool , error ) {
150- cpQueryHeight , err := counterparty .LatestHeight ()
150+ func (pr * Prover ) CheckRefreshRequired (ctx context. Context , counterparty core.ChainInfoICS02Querier ) (bool , error ) {
151+ cpQueryHeight , err := counterparty .LatestHeight (context . TODO () )
151152 if err != nil {
152153 return false , fmt .Errorf ("failed to get the latest height of the counterparty chain: %+v" , err )
153154 }
@@ -174,12 +175,12 @@ func (pr *Prover) CheckRefreshRequired(counterparty core.ChainInfoICS02Querier)
174175 }
175176 lcLastTimestamp := time .Unix (0 , int64 (cons .GetTimestamp ()))
176177
177- selfQueryHeight , err := pr .chain .LatestHeight ()
178+ selfQueryHeight , err := pr .chain .LatestHeight (context . TODO () )
178179 if err != nil {
179180 return false , fmt .Errorf ("failed to get the latest height of the self chain: %+v" , err )
180181 }
181182
182- selfTimestamp , err := pr .chain .Timestamp (selfQueryHeight )
183+ selfTimestamp , err := pr .chain .Timestamp (context . TODO (), selfQueryHeight )
183184 if err != nil {
184185 return false , fmt .Errorf ("failed to get timestamp of the self chain: %+v" , err )
185186 }
0 commit comments