From faee6c5a6d81e65dab70823ac8b8aafacf805b63 Mon Sep 17 00:00:00 2001 From: Marcin Gorzynski Date: Tue, 19 May 2026 15:38:42 +0200 Subject: [PATCH] relayer: update client bindings to 0xsequence/relayer@0b3c169 --- lib/mock/relayer.mock.go | 7 ++++--- relayer/proto/relayer.gen.go | 18 ++++++++++-------- relayer/relayer.go | 2 +- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/lib/mock/relayer.mock.go b/lib/mock/relayer.mock.go index 051d26fa..d08e3678 100644 --- a/lib/mock/relayer.mock.go +++ b/lib/mock/relayer.mock.go @@ -310,12 +310,13 @@ func (mr *RelayerMockRecorder) GetMetaTxnNonce(ctx, walletContractAddress, space } // GetMetaTxnReceipt mocks base method. -func (m *Relayer) GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*proto.MetaTxnReceipt, error) { +func (m *Relayer) GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*proto.MetaTxnReceipt, bool, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetMetaTxnReceipt", ctx, metaTxID) ret0, _ := ret[0].(*proto.MetaTxnReceipt) - ret1, _ := ret[1].(error) - return ret0, ret1 + ret1, _ := ret[1].(bool) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 } // GetMetaTxnReceipt indicates an expected call of GetMetaTxnReceipt. diff --git a/relayer/proto/relayer.gen.go b/relayer/proto/relayer.gen.go index 3f29ca2a..f925295b 100644 --- a/relayer/proto/relayer.gen.go +++ b/relayer/proto/relayer.gen.go @@ -1,4 +1,4 @@ -// sequence-relayer v0.4.1 17923978b5bea530cea7f2517b8c22eea7e51e57 +// sequence-relayer v0.4.1 bbe47231e764cdbdf21f7181326c5b1709f630a3 // -- // Code generated by webrpc-gen@v0.32.2 with golang generator. DO NOT EDIT. // @@ -35,7 +35,7 @@ func WebRPCSchemaVersion() string { // Schema hash generated from your RIDL schema func WebRPCSchemaHash() string { - return "17923978b5bea530cea7f2517b8c22eea7e51e57" + return "bbe47231e764cdbdf21f7181326c5b1709f630a3" } // @@ -62,7 +62,7 @@ type RelayerClient interface { // For backwards compat, we can leave the current GetMetaTxnReceipt how it is, an deprecate it, and introduce // new, GetTransactionReceipt and WaitTransactionReceipt methods // we can also accept metaTxnId and txnHash .. so can take either or.. I wonder if ERC-4337 has any convention on this? - GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, error) + GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, bool, error) Simulate(ctx context.Context, wallet string, transactions string) ([]*SimulateResult, error) SimulateV3(ctx context.Context, wallet string, calls string) ([]*SimulateV3Result, error) // TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date @@ -136,7 +136,7 @@ type RelayerServer interface { // For backwards compat, we can leave the current GetMetaTxnReceipt how it is, an deprecate it, and introduce // new, GetTransactionReceipt and WaitTransactionReceipt methods // we can also accept metaTxnId and txnHash .. so can take either or.. I wonder if ERC-4337 has any convention on this? - GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, error) + GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, bool, error) Simulate(ctx context.Context, wallet string, transactions string) ([]*SimulateResult, error) SimulateV3(ctx context.Context, wallet string, calls string) ([]*SimulateV3Result, error) // TODO: deprecated, to be removed by https://github.com/0xsequence/stack/pull/356 at a later date @@ -950,12 +950,13 @@ func (c *relayerClient) GetMetaTxnNonce(ctx context.Context, walletContractAddre return out.Ret0, err } -func (c *relayerClient) GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, error) { +func (c *relayerClient) GetMetaTxnReceipt(ctx context.Context, metaTxID string) (*MetaTxnReceipt, bool, error) { in := struct { Arg0 string `json:"metaTxID"` }{metaTxID} out := struct { Ret0 *MetaTxnReceipt `json:"receipt"` + Ret1 bool `json:"metaTxnEnqueued"` }{} resp, err := doHTTPRequest(ctx, c.client, c.urls[7], in, &out) @@ -966,7 +967,7 @@ func (c *relayerClient) GetMetaTxnReceipt(ctx context.Context, metaTxID string) } } - return out.Ret0, err + return out.Ret0, out.Ret1, err } func (c *relayerClient) Simulate(ctx context.Context, wallet string, transactions string) ([]*SimulateResult, error) { @@ -2067,7 +2068,7 @@ func (s *relayerService) serveGetMetaTxnReceiptJSON(ctx context.Context, w http. } // Call service method implementation. - ret0, err := s.RelayerServer.GetMetaTxnReceipt(ctx, reqPayload.Arg0) + ret0, ret1, err := s.RelayerServer.GetMetaTxnReceipt(ctx, reqPayload.Arg0) if err != nil { rpcErr, ok := err.(WebRPCError) if !ok { @@ -2079,7 +2080,8 @@ func (s *relayerService) serveGetMetaTxnReceiptJSON(ctx context.Context, w http. respPayload := struct { Ret0 *MetaTxnReceipt `json:"receipt"` - }{ret0} + Ret1 bool `json:"metaTxnEnqueued"` + }{ret0, ret1} respBody, err := json.Marshal(respPayload) if err != nil { s.sendErrorJSON(w, r, ErrWebrpcBadResponse.WithCausef("failed to marshal json response: %w", err)) diff --git a/relayer/relayer.go b/relayer/relayer.go index f9ef1ccf..4661e57a 100644 --- a/relayer/relayer.go +++ b/relayer/relayer.go @@ -384,7 +384,7 @@ func (r *Client) waitMetaTxnReceipt(ctx context.Context, metaTxnID sequence.Meta default: } - metaTxnReceipt, err := r.GetMetaTxnReceipt(ctx, metaTxnID.String()) + metaTxnReceipt, _, err := r.GetMetaTxnReceipt(ctx, metaTxnID.String()) if metaTxnReceipt == nil && err == nil { // currently we assume that if the receipt is nil, and error is nil, then // we're still searching for the transaction. This is a hack, and we should