Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions pkg/chains/solana/proto_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -1273,7 +1269,6 @@ func ConvertSubmitTransactionReplyToProto(r *solana.SubmitTransactionReply) *Sub
return nil
}
return &SubmitTransactionReply{
Signature: r.Signature[:],
IdempotencyKey: r.IdempotencyKey,
Status: TxStatus(r.Status),
}
Expand Down
13 changes: 2 additions & 11 deletions pkg/chains/solana/solana.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion pkg/chains/solana/solana.proto
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 0 additions & 2 deletions pkg/loop/internal/relayerset/relayerset_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
Expand All @@ -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)
},
},
Expand Down
1 change: 0 additions & 1 deletion pkg/types/chains/solana/txm_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ type ComputeConfig struct {
}

type SubmitTransactionReply struct {
Signature Signature
IdempotencyKey string
Status TransactionStatus
}
Loading