Skip to content

Commit

Permalink
Fix: multisig proxy xcm transfer (#3101)
Browse files Browse the repository at this point in the history 
* fix: selecting correct asset to xcm transfer title

* fix: use inner transaction for multisig title

* fix: transaction confirm on multisig

* fix: details for mst confirm

---------

Co-authored-by: Sergey Zhuravlev <[email protected]>
  • Loading branch information
@Asmadek @johnthecat
Asmadek and johnthecat authored Feb 4, 2025
1 parent 7333f97 commit d4f056f
Show file tree
Hide file tree
Showing 12 changed files with 139 additions and 46 deletions.
1 change: 1 addition & 0 deletions src/renderer/entities/transaction/ui/TransactionTitle/TransactionTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ type Props = {
className?: string;
};

// TODO decompose
export const TransactionTitle = ({ tx, className, children }: PropsWithChildren<Props>) => {
const { t } = useI18n();

Expand Down
10 changes: 6 additions & 4 deletions src/renderer/features/governance-operation-details/components/GovernanceOperationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ import { getAssetById } from '@/shared/lib/utils';
import { Box } from '@/shared/ui-kit';
import { AssetBalance } from '@/entities/asset';
import { ChainTitle } from '@/entities/chain';
import { getTransactionFromMultisigTx } from '@/entities/multisig';
import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';

type Props = {
operation: MultisigTransaction;
};

export const GovernanceOperationTitle = ({ operation }: Props) => {
const transaction = getTransactionFromMultisigTx(operation);

const asset =
operation.transaction &&
getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = operation.transaction && getTransactionAmount(operation.transaction);
transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = transaction && getTransactionAmount(transaction);

return (
<>
<TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
<TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />

{asset && amount && (
<Box width="160px">
Expand Down
10 changes: 6 additions & 4 deletions src/renderer/features/proxy-operation-details/components/ProxyOperationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
import { getAssetById } from '@/shared/lib/utils';
import { AssetBalance } from '@/entities/asset';
import { ChainTitle } from '@/entities/chain';
import { getTransactionFromMultisigTx } from '@/entities/multisig';
import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';

type Props = {
operation: MultisigTransaction;
};

export const ProxyOperationTitle = ({ operation }: Props) => {
const transaction = getTransactionFromMultisigTx(operation);

const asset =
operation.transaction &&
getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = operation.transaction && getTransactionAmount(operation.transaction);
transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = transaction && getTransactionAmount(transaction);

return (
<>
<TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
<TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />

{asset && amount && (
<div className="w-[160px]">
Expand Down
10 changes: 6 additions & 4 deletions src/renderer/features/staking-operation-details/components/StakingOperationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
import { getAssetById } from '@/shared/lib/utils';
import { AssetBalance } from '@/entities/asset';
import { ChainTitle } from '@/entities/chain';
import { getTransactionFromMultisigTx } from '@/entities/multisig';
import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';

type Props = {
operation: MultisigTransaction;
};

export const StakingOperationTitle = ({ operation }: Props) => {
const transaction = getTransactionFromMultisigTx(operation);

const asset =
operation.transaction &&
getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = operation.transaction && getTransactionAmount(operation.transaction);
transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = transaction && getTransactionAmount(transaction);

return (
<>
<TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
<TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />

{asset && amount && (
<div className="w-[160px]">
Expand Down
10 changes: 6 additions & 4 deletions src/renderer/features/transfer-operation-details/components/TransferOperationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ import { type MultisigTransaction } from '@/shared/core';
import { getAssetById } from '@/shared/lib/utils';
import { AssetBalance } from '@/entities/asset';
import { ChainTitle } from '@/entities/chain';
import { getTransactionFromMultisigTx } from '@/entities/multisig';
import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';

type Props = {
operation: MultisigTransaction;
};

export const TransferOperationTitle = ({ operation }: Props) => {
const transaction = getTransactionFromMultisigTx(operation);

const asset =
operation.transaction &&
getAssetById(operation.transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = operation.transaction && getTransactionAmount(operation.transaction);
transaction && getAssetById(transaction.args.asset, chainsService.getChainById(operation.chainId)?.assets);
const amount = transaction && getTransactionAmount(transaction);

return (
<>
<TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
<TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />

{asset && amount && (
<div className="w-[160px]">
Expand Down
15 changes: 7 additions & 8 deletions src/renderer/features/transfer-operation-details/components/XcmTransferOperationTitle.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,32 @@ import { type FlexibleMultisigTransactionDS, type MultisigTransactionDS } from '
import { getAssetById } from '@/shared/lib/utils';
import { AssetBalance } from '@/entities/asset';
import { XcmChains } from '@/entities/chain';
import { getTransactionFromMultisigTx } from '@/entities/multisig';
import { TransactionTitle, getTransactionAmount } from '@/entities/transaction';

type Props = {
operation: MultisigTransactionDS | FlexibleMultisigTransactionDS;
};

export const XcmTransferOperationTitle = ({ operation }: Props) => {
const assetId = operation.transaction?.args.assetId || operation.transaction?.args.asset;
const transaction = getTransactionFromMultisigTx(operation);

const assetId = transaction?.args.assetId || transaction?.args.asset;
const asset = getAssetById(assetId, chainsService.getChainById(operation.chainId)?.assets);

const amount = operation.transaction && getTransactionAmount(operation.transaction);
const amount = transaction && getTransactionAmount(transaction);

return (
<>
<TransactionTitle className="flex-1 overflow-hidden" tx={operation.transaction} />
<TransactionTitle className="flex-1 overflow-hidden" tx={transaction} />

{asset && amount && (
<div className="w-[160px]">
<AssetBalance value={amount} asset={asset} showIcon />
</div>
)}

<XcmChains
chainIdFrom={operation.chainId}
chainIdTo={operation.transaction?.args.destinationChain}
className="w-[114px]"
/>
<XcmChains chainIdFrom={operation.chainId} chainIdTo={transaction?.args.destinationChain} className="w-[114px]" />
</>
);
};
7 changes: 3 additions & 4 deletions src/renderer/pages/Operations/components/ActionSteps/Confirmation.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,8 @@ export const Confirmation = ({ api, tx, account, chain, signAccount, feeTx, onSi
});

const xcmConfig = useUnit(xcmTransferModel.$config);
const asset = getAssetById(tx.transaction?.args.assetId, chain.assets) || chain.assets[0];

const transaction = getTransactionFromMultisigTx(tx);
const asset = getAssetById(transaction?.args.assetId, chain.assets) || chain.assets[0];

const xcmApi = useStoreMap({
store: networkModel.$apis,
Expand All @@ -75,9 +74,9 @@ export const Confirmation = ({ api, tx, account, chain, signAccount, feeTx, onSi
return (
<div className="flex flex-col items-center gap-y-3 px-5 pb-4">
<div className="mb-6 flex flex-col items-center gap-y-3">
<Icon className="text-icon-default" name={getIconName(tx.transaction)} size={60} />
<Icon className="text-icon-default" name={getIconName(transaction)} size={60} />

{tx.transaction && <TransactionAmount tx={tx.transaction} />}
{transaction && <TransactionAmount tx={transaction} />}
</div>

<Details api={api} tx={tx} account={account} chain={chain} signatory={signAccount} />
Expand Down
16 changes: 8 additions & 8 deletions src/renderer/pages/Operations/components/Details.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,19 +123,19 @@ export const Details = ({ api, tx, account, chain, signatory }: Props) => {
}, [validatorsMap]);

const startStakingValidators: Address[] =
(tx.transaction?.type === 'batchAll' &&
tx.transaction.args.transactions.find((tx: Transaction) => tx.type === 'nominate')?.args?.targets) ||
(transaction?.type === 'batchAll' &&
transaction.args.transactions.find((tx: Transaction) => tx.type === 'nominate')?.args?.targets) ||
[];

const selectedValidators: Validator[] =
allValidators.filter((v) => (transaction?.args.targets || startStakingValidators).includes(v.address)) || [];

const proxied = useMemo((): { wallet: Wallet; account: AccountType } | undefined => {
if (!tx.transaction || !isProxyTransaction(tx.transaction)) {
if (!transaction || !isProxyTransaction(transaction)) {
return undefined;
}

const proxiedAccountId = toAccountId(tx.transaction.args.real);
const proxiedAccountId = toAccountId(transaction.args.real);
const { wallet, account } = wallets.reduce<{ wallet?: Wallet; account?: AccountType }>(
(acc, wallet) => {
if (acc.wallet) {
Expand All @@ -156,11 +156,11 @@ export const Details = ({ api, tx, account, chain, signatory }: Props) => {
return { wallet, account };
}, [tx, wallets]);

const hasSender = isXcmTransaction(tx.transaction) || isTransferTransaction(tx.transaction);
const hasSender = isXcmTransaction(transaction) || isTransferTransaction(transaction);

const isDividerVisible =
(isXcmTransaction(tx.transaction) && transaction?.args.destinationChain) ||
isManageProxyTransaction(tx.transaction) ||
(isXcmTransaction(transaction) && transaction?.args.destinationChain) ||
isManageProxyTransaction(transaction) ||
destination ||
selectedValidators.length !== 0;

Expand Down Expand Up @@ -267,7 +267,7 @@ export const Details = ({ api, tx, account, chain, signatory }: Props) => {
</DetailRow>
)}

{isXcmTransaction(tx.transaction) && destinationChain && (
{isXcmTransaction(transaction) && destinationChain && (
<DetailRow label={t('operation.details.toNetwork')}>
<ChainTitle chainId={destinationChain} />
</DetailRow>
Expand Down
63 changes: 63 additions & 0 deletions src/renderer/shared/api/xcm/__tests__/mock/xcmData.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,69 @@ export const XCMPALLET_TRANSFER_PAH_MYTH = {
},
};

export const XCMPALLET_TRANSFER_PAH_MOONBEAM = {
dest: {
V4: {
interior: {
X1: [
{
Parachain: '2,004',
},
],
},
parents: 1,
},
},
beneficiary: {
V4: {
interior: {
X1: [
{
AccountKey20: {
key: '0xb32b41625e14e55757a5d0cfcdd9768a1695c5f3',
network: null,
},
},
],
},
parents: 0,
},
},
assets: {
V4: [
{
fun: {
Fungible: '5340000000000000',
},
id: {
interior: {
X2: [
{
PalletInstance: 50,
},
{
GeneralIndex: '23',
},
],
},
parents: 0,
},
},
{
fun: {
Fungible: '156796325',
},
id: {
interior: {
Here: 'NULL',
},
parents: 1,
},
},
],
},
};

export const XTOKENS_ACA_DOT = {
asset: {
V2: {
Expand Down
16 changes: 16 additions & 0 deletions src/renderer/shared/api/xcm/__tests__/xcm-service.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {
CONFIG,
XCMPALLET_TRANSFER_HUB_ASTAR,
XCMPALLET_TRANSFER_KSM_BIFROST,
XCMPALLET_TRANSFER_PAH_MOONBEAM,
XCMPALLET_TRANSFER_PAH_MYTH,
XTOKENS_ACA_DOT,
XTOKENS_ACA_PARALLEL,
Expand Down Expand Up @@ -40,6 +41,21 @@ describe('shared/api/xcm/service/xcm-service', () => {
});
});

test('should parse xcmPallet parachain > eth parachain 2', () => {
const result = xcmService.parseXcmPalletExtrinsic(XCMPALLET_TRANSFER_PAH_MOONBEAM);

expect(result).toEqual({
isRelayToken: false,
amount: '5340000000000000',
assetGeneralIndex: '23',
assetParachain: 0,
destAccountId: '0xb32b41625e14e55757a5d0cfcdd9768a1695c5f3',
destParachain: 2004,
toRelayChain: false,
type: 'xcmPallet',
});
});

test('should parse xcmPallet parachain > parachain', () => {
const result = xcmService.parseXcmPalletExtrinsic(XCMPALLET_TRANSFER_HUB_ASTAR);

Expand Down
4 changes: 3 additions & 1 deletion src/renderer/shared/api/xcm/lib/xcm-utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,9 @@ function getSiblingLocation(version: string, parachainId: number, accountId?: Ac

function getJunctionCols<T>(interior: Record<string, object>, path: string): T {
if (path === 'X1') {
return get(interior, path) as T;
const result = get(interior, path) as T;

return Array.isArray(result) ? result[0] : result;
}

return Object.values(get(interior, path)).reduce((acc, item) => {
Expand Down
23 changes: 14 additions & 9 deletions src/renderer/shared/api/xcm/service/xcmService.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,8 @@ type XTokensPayload = ParsedPayload & {
function parseXcmPalletExtrinsic(args: Omit<XcmPalletTransferArgs, 'feeAssetItem' | 'weightLimit'>): XcmPalletPayload {
const xcmVersion = Object.keys(args.dest as NonNullable<unknown>)[0];

const assetInterior = get(args.assets, `${xcmVersion}[0].id.Concrete.interior`) as unknown as NonNullable<unknown>;
const assetInterior = (get(args.assets, `${xcmVersion}[0].id.Concrete.interior`) ||
get(args.assets, `${xcmVersion}[0].id.interior`)) as unknown as NonNullable<unknown>;
const destInterior = get(args.dest, `${xcmVersion}.interior`) as unknown as NonNullable<unknown>;
const beneficiaryInterior = get(args.beneficiary, `${xcmVersion}.interior`) as unknown as NonNullable<unknown>;

Expand All @@ -234,12 +235,18 @@ function parseXcmPalletExtrinsic(args: Omit<XcmPalletTransferArgs, 'feeAssetItem
};

const beneficiaryJunction = Object.keys(beneficiaryInterior)[0];
const substrateAccountId = get(beneficiaryInterior, `${beneficiaryJunction}.AccountId32.id`) as unknown as string;
const ethAccountId = get(beneficiaryInterior, `${beneficiaryJunction}.AccountKey20.key`) as unknown as string;
parsedPayload.destAccountId = substrateAccountId || ethAccountId;

const beneficiaryCols = xcmUtils.getJunctionCols<{ AccountId32: any; AccountKey20: any }>(
beneficiaryInterior,
beneficiaryJunction,
);

parsedPayload.destAccountId = (get(beneficiaryCols, 'AccountId32.id') ||
get(beneficiaryCols, 'AccountKey20.key')) as unknown as string;

const destJunction = Object.keys(destInterior)[0];
parsedPayload.destParachain = Number(xcmUtils.toRawString(get(destInterior, `${destJunction}.Parachain`)));
const destParachain = xcmUtils.getJunctionCols<{ Parachain: string }>(destInterior, destJunction);
parsedPayload.destParachain = Number(xcmUtils.toRawString(get(destParachain, 'Parachain')));

if (!parsedPayload.isRelayToken && assetInterior) {
const assetJunction = Object.keys(assetInterior)[0];
Expand Down Expand Up @@ -280,10 +287,8 @@ function parseXTokensExtrinsic(args: Omit<XTokenPalletTransferArgs, 'destWeight'
parsedPayload.toRelayChain = destJunction === 'X1';

if (parsedPayload.toRelayChain) {
const substrateAccountId = get(destInterior, `X1.AccountId32.id`) as unknown as string;
const ethAccountId = get(destInterior, `X1.AccountKey20.key`) as unknown as string;

parsedPayload.destAccountId = substrateAccountId || ethAccountId;
const cols = xcmUtils.getJunctionCols<{ AccountId32?: any; AccountKey20?: any }>(destInterior, destJunction);
parsedPayload.destAccountId = (get(cols, 'AccountId32.id') || get(cols, 'AccountKey20.key')) as unknown as string;
} else {
const cols = xcmUtils.getJunctionCols<{ Parachain?: number }>(destInterior, destJunction);
if (cols.Parachain) {
Expand Down

0 comments on commit d4f056f

Please sign in to comment.