diff --git a/src/parsing/transaction.ts b/src/parsing/transaction.ts index b0ef13d9..f58462b7 100644 --- a/src/parsing/transaction.ts +++ b/src/parsing/transaction.ts @@ -3,7 +3,7 @@ import { assert } from "console" import { InvalidData } from "../errors" import { InvalidDataReason } from "../errors/invalidDataReason" import type { OutputDestination, ParsedAssetGroup, ParsedCertificate, ParsedInput, ParsedOutput, ParsedRequiredSigner, ParsedSigningRequest, ParsedToken, ParsedTransaction, ParsedWithdrawal} from "../types/internal" -import { RequiredSignerType, KEY_HASH_LENGTH } from "../types/internal" +import { KEY_HASH_LENGTH,RequiredSignerType } from "../types/internal" import { StakeCredentialType } from "../types/internal" import { ASSET_NAME_LENGTH_MAX, CertificateType, SCRIPT_DATA_HASH_LENGTH,SpendingDataSourceType, TOKEN_POLICY_LENGTH, TX_HASH_LENGTH } from "../types/internal" import type { @@ -219,10 +219,11 @@ function parseTxDestination( function addressContainsScripthash(destination: OutputDestination): boolean { let type: AddressType switch (destination.type) { - case TxOutputDestinationType.THIRD_PARTY: + case TxOutputDestinationType.THIRD_PARTY: { const addressBytes: Buffer = hex_to_buf(destination.addressHex) type = (addressBytes[0] & 0b11110000) >> 4 break + } case TxOutputDestinationType.DEVICE_OWNED: type = destination.addressParams.type break diff --git a/test/integration/__fixtures__/signTxPoolRegistrationRejects.ts b/test/integration/__fixtures__/signTxPoolRegistrationRejects.ts index 42d78669..555e20fd 100644 --- a/test/integration/__fixtures__/signTxPoolRegistrationRejects.ts +++ b/test/integration/__fixtures__/signTxPoolRegistrationRejects.ts @@ -1,10 +1,10 @@ import type { MultiHostRelayParams, PoolMetadataParams, SingleHostHostnameRelayParams, Transaction } from "../../../src/Ada" +import { CertificateType, DeviceStatusCodes, DeviceStatusError, DeviceStatusMessages, InvalidDataReason, Networks, RelayType } from "../../../src/Ada" +import { PoolKeyType, PoolOwnerType,TransactionSigningMode } from '../../../src/types/public' import { str_to_path } from "../../../src/utils/address" -import { DeviceStatusError, DeviceStatusCodes, DeviceStatusMessages, CertificateType, InvalidDataReason, Networks, RelayType } from "../../../src/Ada" -import { TransactionSigningMode, PoolKeyType, PoolOwnerType } from '../../../src/types/public' -import type { TestcaseRejectShelley } from "./signTxRejects" -import { inputs, outputs, certificates, defaultPoolRegistration, poolOwnerVariationSet, relayVariationSet } from './signTxPoolRegistration' import { DontRunOnLedger } from '../../test_utils' +import { certificates, defaultPoolRegistration, inputs, outputs, poolOwnerVariationSet, relayVariationSet } from './signTxPoolRegistration' +import type { TestcaseRejectShelley } from "./signTxRejects" const txBase: Transaction = { network: Networks.Mainnet, @@ -155,7 +155,7 @@ export const invalidPoolMetadataTestcases: TestcaseRejectShelley[] = [ metadataHashHex: "6bf124f217d0e5a0a8adb1dbd8540e1334280d49ab861127868339f43b3948", }, }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, @@ -176,7 +176,7 @@ export const invalidPoolMetadataTestcases: TestcaseRejectShelley[] = [ metadataHashHex: "cdb714fd722c24aeb10c93dbb0ff03bd4783441cd5ba2a8b6f373390520535bb", } as PoolMetadataParams, }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, @@ -199,7 +199,7 @@ export const invalidPoolMetadataTestcases: TestcaseRejectShelley[] = [ metadataHashHex: "6bf124f217d0e5a0a8adb1dbd8540e1334280d49ab861127868339f43b3948", }, }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, @@ -220,7 +220,7 @@ export const invalidPoolMetadataTestcases: TestcaseRejectShelley[] = [ metadataUrl: "https://www.vacuumlabs.com/sampleUrl.json", } as PoolMetadataParams, }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, @@ -250,7 +250,7 @@ export const invalidRelayTestcases: TestcaseRejectShelley[] = [ }, ], }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, @@ -276,7 +276,7 @@ export const invalidRelayTestcases: TestcaseRejectShelley[] = [ }, ], }, - } + }, ], }, signingMode: TransactionSigningMode.POOL_REGISTRATION_AS_OWNER, diff --git a/test/integration/signTx.test.ts b/test/integration/signTx.test.ts index f092d5da..a6a1bce8 100644 --- a/test/integration/signTx.test.ts +++ b/test/integration/signTx.test.ts @@ -1,4 +1,4 @@ -import { describeRejects, describePositiveTest, } from "../test_utils" +import { describePositiveTest,describeRejects } from "../test_utils" import { testsAllegra, testsByron, diff --git a/test/integration/signTxPoolRegistration.test.ts b/test/integration/signTxPoolRegistration.test.ts index 13cfba0d..c06cb379 100644 --- a/test/integration/signTxPoolRegistration.test.ts +++ b/test/integration/signTxPoolRegistration.test.ts @@ -1,18 +1,18 @@ import chai from "chai" import chaiAsPromised from "chai-as-promised" -import { describeRejects, describePositiveTest } from "../test_utils" +import { describePositiveTest,describeRejects } from "../test_utils" import { poolRegistrationOperatorTestcases, poolRegistrationOwnerTestcases, } from "./__fixtures__/signTxPoolRegistration" import { - poolRegistrationOwnerRejectTestcases, invalidCertificates, invalidPoolMetadataTestcases, invalidRelayTestcases, - stakePoolRegistrationPoolIdRejectTestcases, + poolRegistrationOwnerRejectTestcases, stakePoolRegistrationOwnerRejectTestcases, + stakePoolRegistrationPoolIdRejectTestcases, } from "./__fixtures__/signTxPoolRegistrationRejects" chai.use(chaiAsPromised) diff --git a/test/test_utils.ts b/test/test_utils.ts index cbeebb4e..6f58f1fd 100644 --- a/test/test_utils.ts +++ b/test/test_utils.ts @@ -7,8 +7,8 @@ import type { FixlenHexString} from "types/internal" import { Ada, utils } from "../src/Ada" import { InvalidDataReason } from "../src/errors/index" +import type { TxAuxiliaryDataSupplement,Witness } from "../src/types/public" import * as parseModule from "../src/utils/parse" -import type { Witness, TxAuxiliaryDataSupplement } from "../src/types/public" export async function getTransport() { return await TransportNodeHid.create(1000)