Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

XRP: fix status in failed transactions with missing destination tag #16550

Merged
merged 1 commit into from
Jan 30, 2025
Merged
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
34 changes: 27 additions & 7 deletions packages/blockchain-link-utils/src/ripple.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import type { Transaction } from '@trezor/blockchain-link-types';

type RippleTransactionMetadata = {
AffectedNodes: any[];
DeliveredAmount?: any[];
TransactionIndex: number;
TransactionResult: string;
delivered_amount?: string;
};

// export const transformServerInfo = (payload: GetServerInfoResponse) => {
export const transformServerInfo = (payload: any) => ({
name: 'Ripple',
Expand All @@ -15,28 +23,40 @@ export const transformServerInfo = (payload: any) => ({
// https://bitcoin.stackexchange.com/questions/23061/ripple-ledger-time-format/23065#23065
const BLOCKTIME_OFFSET = 946684800;

export const transformTransaction = (tx: any, descriptor?: string): Transaction => {
export const transformTransaction = (
tx: any,
meta: RippleTransactionMetadata | null,
descriptor?: string,
): Transaction => {
const blockTime =
typeof tx.date === 'number' && tx.date > 0 ? tx.date + BLOCKTIME_OFFSET : tx.date;
const type =
tx.TransactionType !== 'Payment' || !descriptor
? 'unknown'
: (tx.Account === descriptor && 'sent') || 'recv';

let txType: Transaction['type'];

// https://xrpl.org/docs/references/protocol/transactions/transaction-results
if (meta != null && !meta.TransactionResult?.startsWith('tes')) {
txType = 'failed';
} else if (tx.TransactionType !== 'Payment' || !descriptor) {
txType = 'unknown';
} else {
txType = tx.Account === descriptor ? 'sent' : 'recv';
}

const addresses = [tx.Destination];
const amount = tx.Amount;
const fee = tx.Fee;

// TODO: https://github.com/ripple/ripple-lib/blob/develop/docs/index.md#transaction-types
return {
type,
type: txType,
txid: tx.hash,
amount,
fee,
blockTime,
blockHeight: tx.ledger_index,
blockHash: tx.hash,
targets:
type === 'unknown'
txType === 'unknown'
? []
: [
{
Expand Down
8 changes: 4 additions & 4 deletions packages/blockchain-link/src/workers/ripple/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) =>
const api = await request.connect();
const transactionsData: RawTxData = await api.request('account_tx', requestOptions);
account.history.transactions = transactionsData.transactions.map(raw =>
utils.transformTransaction(raw.tx, payload.descriptor),
utils.transformTransaction(raw.tx, raw.meta, payload.descriptor),
);

return {
Expand All @@ -180,8 +180,8 @@ const getAccountInfo = async (request: Request<MessageTypes.GetAccountInfo>) =>

const getTransaction = async ({ connect, payload }: Request<MessageTypes.GetTransaction>) => {
const api = await connect();
const rawtx = await api.request('tx', { transaction: payload, binary: false });
const tx = utils.transformTransaction(rawtx);
const rawTx = await api.request('tx', { transaction: payload, binary: false });
const tx = utils.transformTransaction(rawTx, null);

return {
type: RESPONSES.GET_TRANSACTION,
Expand Down Expand Up @@ -253,7 +253,7 @@ const onTransaction = ({ state, post }: Context, event: any) => {
type: 'notification',
payload: {
descriptor,
tx: utils.transformTransaction({ ...event, ...tx }, descriptor),
tx: utils.transformTransaction({ ...event, ...tx }, null, descriptor),
},
},
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,4 +236,98 @@ export default [
},
},
},
{
description: 'With missing destination',
params: {
descriptor: 'rfkV3EoXimH6JrG1QAyofgbVhnyZZDjWSj',
details: 'txs',
},
serverFixtures: [
{
method: 'account_info',
response: xrpAccount.account_info.validated,
},
{
method: 'account_info',
response: xrpAccount.account_info.current,
},
{
method: 'account_tx',
response: {
status: 'success',
type: 'response',
result: {
account: 'rfkV3EoXimH6JrG1QAyofgbVhnyZZDjWSj',
transactions: [
{
meta: {
TransactionResult: 'tecDST_TAG_NEEDED',
},
tx: {
Account: 'r4eEbLKZGbVSBHnSUBZW8i5XaMjGLdqT4a',
Amount: '25718124',
Destination: 'rfkV3EoXimH6JrG1QAyofgbVhnyZZDjWSj',
Fee: '6000',
Flags: 2147483648,
LastLedgerSequence: 47457602,
Sequence: 157331,
SigningPubKey:
'038CF47114672A12B269AEE015BF7A8438609B994B0640E4B28B2F56E93D948B15',
TransactionType: 'Payment',
TxnSignature:
'30440220665BEB140619A36C737929487519B862D1592225568CBEBC248972AD8453D8EE0220020852427CE83EC4BD8A5BFB48B7DA573FFC042A1E3BE9A513FC04F3C3D45B12',
date: 611932692,
hash: '533A8A2EDBCE914159C5491429763FD39A1F0F19E0F82800C3B7909B67B166A7',
inLedger: 47455208,
ledger_index: 47455208,
},
},
],
},
},
},
],
response: {
descriptor: 'rfkV3EoXimH6JrG1QAyofgbVhnyZZDjWSj',
balance: '20000000',
availableBalance: '10000000',
empty: false,
history: {
total: -1,
unconfirmed: 0,
transactions: [
{
type: 'failed',
txid: '533A8A2EDBCE914159C5491429763FD39A1F0F19E0F82800C3B7909B67B166A7',
amount: '25718124',
fee: '6000',
blockTime: 1558617492,
blockHeight: 47455208,
blockHash:
'533A8A2EDBCE914159C5491429763FD39A1F0F19E0F82800C3B7909B67B166A7',
targets: [
{
addresses: ['rfkV3EoXimH6JrG1QAyofgbVhnyZZDjWSj'],
isAddress: true,
amount: '25718124',
n: 0,
},
],
tokens: [],
internalTransfers: [],
feeRate: undefined,
details: {
vin: [],
vout: [],
size: 0,
totalInput: '0',
totalOutput: '0',
},
},
],
},
misc: { sequence: 2, reserve: '10000000' },
marker: undefined,
},
},
];
Loading