Skip to content
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
33 changes: 32 additions & 1 deletion modules/sdk-coin-canton/src/lib/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
import crypto from 'crypto';

import { BaseUtils, isValidEd25519PublicKey, TransactionType } from '@bitgo/sdk-core';
import { coins, CantonToken } from '@bitgo/statics';
import { CantonToken, coins } from '@bitgo/statics';

import { computePreparedTransaction } from '../../resources/hash/hash.js';
import { PreparedTransaction } from '../../resources/proto/preparedTransaction.js';
Expand Down Expand Up @@ -100,6 +100,7 @@ export class Utils implements BaseUtils {
let preApprovalNode: RecordField[] = [];
let transferNode: RecordField[] = [];
let transferAcceptRejectNode: RecordField[] = [];
let tokenTransferAcceptRejectNode: RecordField[] = [];
const nodes = decodedData.transaction?.nodes;

nodes?.forEach((node) => {
Expand Down Expand Up @@ -128,6 +129,17 @@ export class Utils implements BaseUtils {
) {
transferAcceptRejectNode = fields;
}
if (
(template?.entityName === 'ExecutedTransfer' || template?.entityName === 'RejectedTransfer') &&
!tokenTransferAcceptRejectNode.length &&
(txType === TransactionType.TransferAccept || txType === TransactionType.TransferReject)
) {
const transferField = fields.find((f) => f.label === 'transfer');
const transferSum = transferField?.value?.sum;
if (transferSum?.oneofKind === 'record') {
tokenTransferAcceptRejectNode = transferSum.record?.fields ?? [];
}
}
});

nodes?.forEach((node) => {
Expand Down Expand Up @@ -216,6 +228,25 @@ export class Utils implements BaseUtils {
if (initialAmountData?.oneofKind === 'numeric') amount = initialAmountData.numeric ?? '';
}
}
} else if (tokenTransferAcceptRejectNode.length) {
const senderData = getField(tokenTransferAcceptRejectNode, 'sender');
if (senderData?.oneofKind === 'party') sender = senderData.party ?? '';
const receiverData = getField(tokenTransferAcceptRejectNode, 'receiver');
if (receiverData?.oneofKind === 'party') receiver = receiverData.party ?? '';
const amountData = getField(tokenTransferAcceptRejectNode, 'amount');
if (amountData?.oneofKind === 'numeric') amount = amountData.numeric ?? '';
const instrumentSum = getField(tokenTransferAcceptRejectNode, 'instrumentIdentifier');
if (instrumentSum?.oneofKind === 'record') {
const instrumentFields = instrumentSum.record?.fields ?? [];
const adminData = getField(instrumentFields, 'source');
if (adminData?.oneofKind === 'party') {
instrumentAdmin = adminData.party ?? '';
}
const idData = getField(instrumentFields, 'id');
if (idData?.oneofKind === 'text') {
instrumentId = idData.text ?? '';
}
}
}
if (!sender || !receiver || !amount) {
const missingFields: string[] = [];
Expand Down
Loading