@@ -2,12 +2,14 @@ package txserver
22
33import (
44 "context"
5+ "encoding/hex"
56 "encoding/json"
67 "errors"
78 "fmt"
89 "math/big"
910 "os"
1011 "strings"
12+ "time"
1113
1214 "github.com/cosmos/cosmos-sdk/client"
1315 "github.com/cosmos/cosmos-sdk/client/flags"
@@ -33,6 +35,7 @@ import (
3335 etherminttypes "github.com/evmos/ethermint/types"
3436 evmtypes "github.com/evmos/ethermint/x/evm/types"
3537 rpchttp "github.com/tendermint/tendermint/rpc/client/http"
38+ coretypes "github.com/tendermint/tendermint/rpc/core/types"
3639 "github.com/zeta-chain/zetacore/cmd/zetacored/config"
3740 "github.com/zeta-chain/zetacore/pkg/chains"
3841 "github.com/zeta-chain/zetacore/pkg/coin"
@@ -48,11 +51,12 @@ const EmissionsPoolAddress = "zeta1w43fn2ze2wyhu5hfmegr6vp52c3dgn0srdgymy"
4851
4952// ZetaTxServer is a ZetaChain tx server for E2E test
5053type ZetaTxServer struct {
51- clientCtx client.Context
52- txFactory tx.Factory
53- name []string
54- mnemonic []string
55- address []string
54+ clientCtx client.Context
55+ txFactory tx.Factory
56+ name []string
57+ mnemonic []string
58+ address []string
59+ blockTimeout time.Duration
5660}
5761
5862// NewZetaTxServer returns a new TxServer with provided account
@@ -102,11 +106,12 @@ func NewZetaTxServer(rpcAddr string, names []string, mnemonics []string, chainID
102106 txf := newFactory (clientCtx )
103107
104108 return ZetaTxServer {
105- clientCtx : clientCtx ,
106- txFactory : txf ,
107- name : names ,
108- mnemonic : mnemonics ,
109- address : addresses ,
109+ clientCtx : clientCtx ,
110+ txFactory : txf ,
111+ name : names ,
112+ mnemonic : mnemonics ,
113+ address : addresses ,
114+ blockTimeout : 1 * time .Minute ,
110115 }, nil
111116}
112117
@@ -157,6 +162,7 @@ func (zts ZetaTxServer) GetAccountMnemonic(index int) string {
157162}
158163
159164// BroadcastTx broadcasts a tx to ZetaChain with the provided msg from the account
165+ // and waiting for blockTime for tx to be included in the block
160166func (zts ZetaTxServer ) BroadcastTx (account string , msg sdktypes.Msg ) (* sdktypes.TxResponse , error ) {
161167 // Find number and sequence and set it
162168 acc , err := zts .clientCtx .Keyring .Key (account )
@@ -188,8 +194,61 @@ func (zts ZetaTxServer) BroadcastTx(account string, msg sdktypes.Msg) (*sdktypes
188194 return nil , err
189195 }
190196
191- // Broadcast tx
192- return zts .clientCtx .BroadcastTx (txBytes )
197+ return broadcastWithBlockTimeout (zts , txBytes )
198+ }
199+
200+ func broadcastWithBlockTimeout (zts ZetaTxServer , txBytes []byte ) (* sdktypes.TxResponse , error ) {
201+ res , err := zts .clientCtx .BroadcastTx (txBytes )
202+ if err != nil {
203+ if res == nil {
204+ return nil , err
205+ }
206+ return & sdktypes.TxResponse {
207+ Code : res .Code ,
208+ Codespace : res .Codespace ,
209+ TxHash : res .TxHash ,
210+ }, err
211+ }
212+
213+ exitAfter := time .After (zts .blockTimeout )
214+ hash , err := hex .DecodeString (res .TxHash )
215+ if err != nil {
216+ return nil , err
217+ }
218+ for {
219+ select {
220+ case <- exitAfter :
221+ return nil , fmt .Errorf ("timed out after waiting for tx to get included in the block: %d" , zts .blockTimeout )
222+ case <- time .After (time .Millisecond * 100 ):
223+ resTx , err := zts .clientCtx .Client .Tx (context .TODO (), hash , false )
224+ if err == nil {
225+ txRes , err := mkTxResult (zts .clientCtx , resTx )
226+ if err == nil {
227+ return txRes , nil
228+ }
229+ }
230+ }
231+ }
232+ }
233+
234+ func mkTxResult (clientCtx client.Context , resTx * coretypes.ResultTx ) (* sdktypes.TxResponse , error ) {
235+ txb , err := clientCtx .TxConfig .TxDecoder ()(resTx .Tx )
236+ if err != nil {
237+ return nil , err
238+ }
239+ p , ok := txb .(intoAny )
240+ if ! ok {
241+ return nil , fmt .Errorf ("expecting a type implementing intoAny, got: %T" , txb )
242+ }
243+ resBlock , err := clientCtx .Client .Block (context .TODO (), & resTx .Height )
244+ if err != nil {
245+ return nil , err
246+ }
247+ return sdktypes .NewResponseResultTx (resTx , p .AsAny (), resBlock .Block .Time .Format (time .RFC3339 )), nil
248+ }
249+
250+ type intoAny interface {
251+ AsAny () * codectypes.Any
193252}
194253
195254// DeploySystemContractsAndZRC20 deploys the system contracts and ZRC20 contracts
@@ -373,7 +432,7 @@ func newContext(
373432 WithLegacyAmino (codec .NewLegacyAmino ()).
374433 WithInput (os .Stdin ).
375434 WithOutput (os .Stdout ).
376- WithBroadcastMode (flags .BroadcastBlock ).
435+ WithBroadcastMode (flags .BroadcastSync ).
377436 WithClient (rpc ).
378437 WithSkipConfirmation (true ).
379438 WithFromName ("creator" ).
0 commit comments