diff --git a/pkg/chains/solana/proto_helpers.go b/pkg/chains/solana/proto_helpers.go index 228e3281d..4963cbbac 100644 --- a/pkg/chains/solana/proto_helpers.go +++ b/pkg/chains/solana/proto_helpers.go @@ -1257,12 +1257,8 @@ func ConvertSubmitTransactionReplyFromProto(p *SubmitTransactionReply) (*solana. if p == nil { return nil, nil } - sig, err := ConvertSignatureFromProto(p.Signature) - if err != nil { - return nil, err - } + return &solana.SubmitTransactionReply{ - Signature: sig, IdempotencyKey: p.IdempotencyKey, Status: solana.TransactionStatus(p.Status), }, nil @@ -1273,7 +1269,6 @@ func ConvertSubmitTransactionReplyToProto(r *solana.SubmitTransactionReply) *Sub return nil } return &SubmitTransactionReply{ - Signature: r.Signature[:], IdempotencyKey: r.IdempotencyKey, Status: TxStatus(r.Status), } diff --git a/pkg/chains/solana/solana.pb.go b/pkg/chains/solana/solana.pb.go index 654b3c91e..fae5ff077 100644 --- a/pkg/chains/solana/solana.pb.go +++ b/pkg/chains/solana/solana.pb.go @@ -2757,7 +2757,6 @@ func (x *SimulateTransactionAccountsOpts) GetAddresses() [][]byte { // Submit transaction result. type SubmitTransactionReply struct { state protoimpl.MessageState `protogen:"open.v1"` - Signature []byte `protobuf:"bytes,1,opt,name=signature,proto3" json:"signature,omitempty"` // 64-byte signature IdempotencyKey string `protobuf:"bytes,2,opt,name=idempotency_key,json=idempotencyKey,proto3" json:"idempotency_key,omitempty"` // echo key Status TxStatus `protobuf:"varint,3,opt,name=status,proto3,enum=loop.solana.TxStatus" json:"status,omitempty"` unknownFields protoimpl.UnknownFields @@ -2794,13 +2793,6 @@ func (*SubmitTransactionReply) Descriptor() ([]byte, []int) { return file_solana_proto_rawDescGZIP(), []int{42} } -func (x *SubmitTransactionReply) GetSignature() []byte { - if x != nil { - return x.Signature - } - return nil -} - func (x *SubmitTransactionReply) GetIdempotencyKey() string { if x != nil { return x.IdempotencyKey @@ -4190,9 +4182,8 @@ const file_solana_proto_rawDesc = "" + "\x04opts\x18\x03 \x01(\v2\x1b.loop.solana.SimulateTXOptsR\x04opts\"v\n" + "\x1fSimulateTransactionAccountsOpts\x125\n" + "\bencoding\x18\x01 \x01(\x0e2\x19.loop.solana.EncodingTypeR\bencoding\x12\x1c\n" + - "\taddresses\x18\x02 \x03(\fR\taddresses\"\x8e\x01\n" + - "\x16SubmitTransactionReply\x12\x1c\n" + - "\tsignature\x18\x01 \x01(\fR\tsignature\x12'\n" + + "\taddresses\x18\x02 \x03(\fR\taddresses\"p\n" + + "\x16SubmitTransactionReply\x12'\n" + "\x0fidempotency_key\x18\x02 \x01(\tR\x0eidempotencyKey\x12-\n" + "\x06status\x18\x03 \x01(\x0e2\x15.loop.solana.TxStatusR\x06status\"\x95\x01\n" + "\x18SubmitTransactionRequest\x12,\n" + diff --git a/pkg/chains/solana/solana.proto b/pkg/chains/solana/solana.proto index f777780a0..2e75b772d 100644 --- a/pkg/chains/solana/solana.proto +++ b/pkg/chains/solana/solana.proto @@ -342,7 +342,6 @@ message SimulateTransactionAccountsOpts { // Submit transaction result. message SubmitTransactionReply { - bytes signature = 1; // 64-byte signature string idempotency_key = 2; // echo key TxStatus status = 3; } diff --git a/pkg/loop/internal/relayerset/relayerset_test.go b/pkg/loop/internal/relayerset/relayerset_test.go index 49c5ce314..5dc88a537 100644 --- a/pkg/loop/internal/relayerset/relayerset_test.go +++ b/pkg/loop/internal/relayerset/relayerset_test.go @@ -834,7 +834,6 @@ func Test_RelayerSet_SolanaService(t *testing.T) { EncodedTransaction: "BASE64TX==", } expected := &soltypes.SubmitTransactionReply{ - Signature: soltypes.Signature{0xaa, 0xbb}, IdempotencyKey: "idem-123", Status: soltypes.TxSuccess, } @@ -845,7 +844,6 @@ func Test_RelayerSet_SolanaService(t *testing.T) { out, err := sol.SubmitTransaction(ctx, req) require.NoError(t, err) require.Equal(t, expected.IdempotencyKey, out.IdempotencyKey) - require.Equal(t, expected.Signature, out.Signature) require.Equal(t, expected.Status, out.Status) }, }, diff --git a/pkg/types/chains/solana/txm_types.go b/pkg/types/chains/solana/txm_types.go index d7f4004e7..726e8fdff 100644 --- a/pkg/types/chains/solana/txm_types.go +++ b/pkg/types/chains/solana/txm_types.go @@ -26,7 +26,6 @@ type ComputeConfig struct { } type SubmitTransactionReply struct { - Signature Signature IdempotencyKey string Status TransactionStatus }