Skip to content

Commit

Permalink
fix: filter utxos in etna import tx builder (#930)
Browse files Browse the repository at this point in the history
* fix: filter utxos in etna import tx builder

* fix: correct unsigned tx utxos on etna import tx builder

* fix: use utxos that were imported
  • Loading branch information
erictaylor authored Nov 27, 2024
1 parent 2856c2f commit dd5cd7e
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 47 deletions.
7 changes: 7 additions & 0 deletions src/vms/pvm/etna-builder/builder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,13 @@ describe('./src/vms/pvm/etna-builder/builder.test.ts', () => {
);

expectTxs(unsignedTx.getTx(), expectedTx);

// Ensure that the unsigned tx utxos are the filtered utxos,
// and not the inputUtxos registered in the spend helper.
// This is only relevant for the ImportTx.
expect(unsignedTx.utxos).toHaveLength(1);
expect(unsignedTx.utxos).not.toContain(utxos[0]);
expect(unsignedTx.utxos).not.toContain(utxos[1]);
});

test('newExportTx', () => {
Expand Down
99 changes: 52 additions & 47 deletions src/vms/pvm/etna-builder/builder.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,50 +302,52 @@ export const newImportTx: TxBuilderFn<NewImportTxProps> = (
) => {
const fromAddresses = addressesFromBytes(fromAddressesBytes);

const { importedInputs, importedAmounts } = utxos
.filter(
(utxo): utxo is Utxo<TransferOutput> =>
isTransferOut(utxo.output) &&
// Currently - only AVAX is allowed to be imported to the P-Chain
utxo.assetId.toString() === context.avaxAssetID,
)
.reduce<{
importedInputs: TransferableInput[];
importedAmounts: Record<string, bigint>;
}>(
(acc, utxo) => {
const { sigIndicies: inputSigIndices } =
matchOwners(utxo.getOutputOwners(), fromAddresses, minIssuanceTime) ||
{};

if (inputSigIndices === undefined) {
// We couldn't spend this UTXO, so we skip to the next one.
return acc;
}

const assetId = utxo.getAssetId();

return {
importedInputs: [
...acc.importedInputs,
new TransferableInput(
utxo.utxoId,
utxo.assetId,
new TransferInput(
utxo.output.amt,
new Input(inputSigIndices.map((value) => new Int(value))),
),
const filteredUtxos = utxos.filter(
(utxo): utxo is Utxo<TransferOutput> =>
isTransferOut(utxo.output) &&
// Currently - only AVAX is allowed to be imported to the P-Chain
utxo.assetId.toString() === context.avaxAssetID,
);

const { importedInputs, importedAmounts, inputUtxos } = filteredUtxos.reduce<{
importedInputs: TransferableInput[];
importedAmounts: Record<string, bigint>;
inputUtxos: Utxo[];
}>(
(acc, utxo) => {
const { sigIndicies: inputSigIndices } =
matchOwners(utxo.getOutputOwners(), fromAddresses, minIssuanceTime) ||
{};

if (inputSigIndices === undefined) {
// We couldn't spend this UTXO, so we skip to the next one.
return acc;
}

const assetId = utxo.getAssetId();

return {
importedInputs: [
...acc.importedInputs,
new TransferableInput(
utxo.utxoId,
utxo.assetId,
new TransferInput(
utxo.output.amt,
new Input(inputSigIndices.map((value) => new Int(value))),
),
],
importedAmounts: {
...acc.importedAmounts,
[assetId]:
(acc.importedAmounts[assetId] ?? 0n) + utxo.output.amount(),
},
};
},
{ importedInputs: [], importedAmounts: {} },
);
),
],
importedAmounts: {
...acc.importedAmounts,
[assetId]:
(acc.importedAmounts[assetId] ?? 0n) + utxo.output.amount(),
},
inputUtxos: [...acc.inputUtxos, utxo],
};
},
{ importedInputs: [], importedAmounts: {}, inputUtxos: [] },
);

if (importedInputs.length === 0) {
throw new Error('no UTXOs available to import');
Expand All @@ -355,7 +357,7 @@ export const newImportTx: TxBuilderFn<NewImportTxProps> = (

const addressMaps = AddressMaps.fromTransferableInputs(
importedInputs,
utxos,
filteredUtxos,
minIssuanceTime,
fromAddressesBytes,
);
Expand Down Expand Up @@ -391,13 +393,16 @@ export const newImportTx: TxBuilderFn<NewImportTxProps> = (
fromAddresses,
initialComplexity: complexity,
minIssuanceTime,
utxos,
utxos: filteredUtxos,
},
[useUnlockedUTXOs],
context,
);

const { changeOutputs, inputs, inputUTXOs } = spendResults;
// Note: We don't use the `inputUTXOs` from `spendResults`
// for the `UnsignedTx` because we want to use the original
// UTXOs that were imported.
const { changeOutputs, inputs } = spendResults;

return new UnsignedTx(
new ImportTx(
Expand All @@ -411,7 +416,7 @@ export const newImportTx: TxBuilderFn<NewImportTxProps> = (
Id.fromString(sourceChainId),
importedInputs.sort(TransferableInput.compare),
),
inputUTXOs,
inputUtxos,
addressMaps,
);
};
Expand Down

0 comments on commit dd5cd7e

Please sign in to comment.