From f3a191e47745ee43bcbff31de2da8744988ace4b Mon Sep 17 00:00:00 2001 From: Zainen <72581075+zainen@users.noreply.github.com> Date: Tue, 7 Mar 2023 17:34:24 -0800 Subject: [PATCH] 485 remove babylon kathmandu (#2373) * perf: update some examples for ghostnet remove file change that will conflict * refactor: remove unused variables from integration tests * refactor: slight improvement, remove tx rollup contracts * refactor: remove past protocol check * refactor: remove tx from mondaynet github workflow --------- Co-authored-by: Zainen Suzuki --- .github/workflows/mondaynet.yml | 14 +------------- example/deploy-docs-live-code-contracts.ts | 5 +++-- .../example-streamer-log-time-between-blocks.ts | 4 ++-- example/example-streamer.ts | 6 +++--- example/scan-path-ledger.ts | 2 +- ...-global-constant-in-storage-part-script.spec.ts | 2 +- ...licit-account-into-new-implicit-account.spec.ts | 1 - .../contract-estimation-tests.spec.ts | 2 +- .../contract-manager-scenario.spec.ts | 8 +++----- .../contract-register-global-constant.spec.ts | 3 +-- .../contract-security-balance-instruction.spec.ts | 2 +- .../contract-security-duplicate-ticket.spec.ts | 2 +- .../contract-security-mutez-overflow.spec.ts | 3 +-- .../contract-security-zero-transfer.spec.ts | 1 - integration-tests/known-contracts-ProtoALph.ts | 1 - integration-tests/known-contracts-PtGhostnet.ts | 1 - integration-tests/known-contracts-PtLimaPtL.ts | 1 - integration-tests/known-contracts-PtMumbaii.ts | 1 - integration-tests/ledger-signer.spec.ts | 3 +-- .../polling-subscribe-provider.spec.ts | 2 +- integration-tests/wallet-api.spec.ts | 1 - integration-tests/wallet-manager-scenario.spec.ts | 12 +++++------- .../wallet-originate-invalid-string.spec.ts | 7 +------ packages/taquito-sapling/src/taquito-sapling.ts | 3 +-- 24 files changed, 28 insertions(+), 59 deletions(-) diff --git a/.github/workflows/mondaynet.yml b/.github/workflows/mondaynet.yml index e5db60db8b..2d70c7a7a0 100644 --- a/.github/workflows/mondaynet.yml +++ b/.github/workflows/mondaynet.yml @@ -36,15 +36,6 @@ jobs: SSH_KEY: ${{ secrets.MONDAYNET_TORU_SSH_KEY }} SSH_HOST: ecad-mondaynet-archive - - name: get required TORU contract addresses - id: toru-addresses - run: | - echo '::echo::on' - echo ::set-output name=tx-rollup-hash::$(ssh mondaynet "jq '.[] | select(.name==\"toru_node\") | .value' /srv/tezos/mondaynet_client/tx_rollups | tr -d \\\" ") - echo ::set-output name=tx-rollup-withdraw-contract::$(ssh mondaynet "jq '.[] | select(.name==\"tx_rollup_withdraw_contract\") | .value' /srv/tezos/mondaynet_client/contracts | tr -d \\\" ") - echo ::set-output name=tx-rollup-deposit-contract::$(ssh mondaynet "jq '.[] | select(.name==\"tx_rollup_deposit_contract\") | .value' /srv/tezos/mondaynet_client/contracts | tr -d \\\" ") - echo '::echo::off' - - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: @@ -67,11 +58,8 @@ jobs: TEZOS_MONDAYNET_TZIP1216CONTRACT_ADDRESS: ${{ steps.originate-contracts-mondaynet.outputs.knownTzip12BigMapOffChainContractAddress }} TEZOS_MONDAYNET_SAPLINGCONTRACT_ADDRESS: ${{ steps.originate-contracts-mondaynet.outputs.knownSaplingContractAddress }} TEZOS_MONDAYNET_ON_CHAIN_VIEW_CONTRACT: ${{ steps.originate-contracts-mondaynet.outputs.knownOnChainViewContractAddress }} - TX_ROLLUP_WITHDRAW_CONTRACT: ${{ steps.toru-addresses.outputs.tx-rollup-withdraw-contract }} - TX_ROLLUP_DEPOSIT_CONTRACT: ${{ steps.toru-addresses.outputs.tx-rollup-deposit-contract }} - TX_ROLLUP_TICKETS_OWNER_SECRET: ${{ secrets.TX_ROLLUP_TICKETS_OWNER_SECRET }} run: npm run test:mondaynet -- --maxWorkers=2 - - + - name: Slack Notification if: always() uses: ravsamhq/notify-slack-action@v1 diff --git a/example/deploy-docs-live-code-contracts.ts b/example/deploy-docs-live-code-contracts.ts index 0355b36fdf..7c342ce18f 100644 --- a/example/deploy-docs-live-code-contracts.ts +++ b/example/deploy-docs-live-code-contracts.ts @@ -29,6 +29,7 @@ import { saplingLiveCodeContract } from './data/sapling_live_code_contract'; import { contractMap8pairs } from './data/contractMap8pairs'; import { char2Bytes } from '@taquito/utils'; import { fa2Contract } from '../integration-tests/data/fa2_contract'; +import BigNumber from 'bignumber.js'; const provider = 'https://ghostnet.ecadinfra.com/'; @@ -102,8 +103,8 @@ async function checkBalances(users: string | any[]) { console.log('checking funds of users...'); try { for (let i = 0; i < users.length; i++) { - const user_balance: any = await tezos.tz.getBalance(users[i]); - if (user_balance < min_balance) { + const user_balance = await tezos.tz.getBalance(users[i]); + if (user_balance < BigNumber(min_balance)) { low_balance.push(users[i]); } console.log(users[i], user_balance); diff --git a/example/example-streamer-log-time-between-blocks.ts b/example/example-streamer-log-time-between-blocks.ts index 5520e2d644..e835a79952 100644 --- a/example/example-streamer-log-time-between-blocks.ts +++ b/example/example-streamer-log-time-between-blocks.ts @@ -3,14 +3,14 @@ import { PollingSubscribeProvider, TezosToolkit } from '@taquito/taquito'; // To run this script, run the following command in the example folder: `npm run example:streamer-block-time` // This script polls on the head block at an interval of `pollingIntervalMilliseconds`. // When a new block is seen, the time between the new block and the precedent is logged with the block level -// If a block is missed when polling, 'Missed block: `level`' is logged. +// If a block is missed when polling, 'Missed block: `level`' is logged. const provider = 'https://ghostnet.ecadinfra.com'; const pollingIntervalMilliseconds = 5000; let date: Date; let level: number; -function logLevelAndTime(data: any) { +function logLevelAndTime(data: number) { const newDate = new Date(); const timeBetweenBlocks = date ? (newDate.getTime() - date.getTime()) : 0; if (level && data - level > 1) { diff --git a/example/example-streamer.ts b/example/example-streamer.ts index 401ed5954c..9653adad81 100644 --- a/example/example-streamer.ts +++ b/example/example-streamer.ts @@ -1,17 +1,17 @@ import { PollingSubscribeProvider, TezosToolkit } from '@taquito/taquito'; async function example() { - const provider = 'https://mainnet.api.tez.ie/'; + const provider = 'https://ghostnet.ecadinfra.com/'; const tezos = new TezosToolkit(provider) tezos.setStreamProvider(tezos.getFactory(PollingSubscribeProvider)({ shouldObservableSubscriptionRetry: true, pollingIntervalMilliseconds: 15000 })); try { const bakerEndorsementFilter = { - and: [{ source: 'tz2TSvNTh2epDMhZHrw73nV9piBX7kLZ9K9m' }, { kind: 'endorsement' }] + and: [{ source: 'tz1bQMn5xYFbX6geRxqvuAiTywsCtNywawxH' }, { kind: 'endorsement' }] } const bakerDelegation = { - and: [{ destination: 'tz2TSvNTh2epDMhZHrw73nV9piBX7kLZ9K9m' }, { kind: 'delegation' }] + and: [{ destination: 'tz1bQMn5xYFbX6geRxqvuAiTywsCtNywawxH' }, { kind: 'delegation' }] } const sub = tezos.stream.subscribeOperation({ diff --git a/example/scan-path-ledger.ts b/example/scan-path-ledger.ts index 60868fd464..a3670eb1c5 100644 --- a/example/scan-path-ledger.ts +++ b/example/scan-path-ledger.ts @@ -28,4 +28,4 @@ async function example() { } } -example(); \ No newline at end of file +example(); diff --git a/integration-tests/contract-deploy-having-global-constant-in-storage-part-script.spec.ts b/integration-tests/contract-deploy-having-global-constant-in-storage-part-script.spec.ts index cfec12eeea..aef36a7424 100644 --- a/integration-tests/contract-deploy-having-global-constant-in-storage-part-script.spec.ts +++ b/integration-tests/contract-deploy-having-global-constant-in-storage-part-script.spec.ts @@ -1,4 +1,4 @@ -import { Protocols, DefaultGlobalConstantsProvider } from '@taquito/taquito'; +import { DefaultGlobalConstantsProvider } from '@taquito/taquito'; import { CONFIGS } from './config'; import { voteSampleGlobalConstants } from './data/vote_contract_global_constant_storage'; diff --git a/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts b/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts index 4e44baa51c..204dcadc17 100644 --- a/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts +++ b/integration-tests/contract-empty-implicit-account-into-new-implicit-account.spec.ts @@ -1,4 +1,3 @@ -import { Protocols } from "@taquito/taquito"; import { CONFIGS } from "./config"; CONFIGS().forEach(({ lib, rpc, setup, createAddress }) => { diff --git a/integration-tests/contract-estimation-tests.spec.ts b/integration-tests/contract-estimation-tests.spec.ts index 5f4fae1559..c5a6fd1e63 100644 --- a/integration-tests/contract-estimation-tests.spec.ts +++ b/integration-tests/contract-estimation-tests.spec.ts @@ -1,4 +1,4 @@ -import { DEFAULT_FEE, MANAGER_LAMBDA, TezosToolkit, Protocols, ChainIds } from "@taquito/taquito"; +import { DEFAULT_FEE, MANAGER_LAMBDA, TezosToolkit, Protocols } from "@taquito/taquito"; import { Contract } from "@taquito/taquito"; import { CONFIGS } from "./config"; import { originate, originate2, transferImplicit2 } from "./data/lambda"; diff --git a/integration-tests/contract-manager-scenario.spec.ts b/integration-tests/contract-manager-scenario.spec.ts index a58f7b7f12..1d9f2ff9b0 100644 --- a/integration-tests/contract-manager-scenario.spec.ts +++ b/integration-tests/contract-manager-scenario.spec.ts @@ -1,8 +1,8 @@ import { CONFIGS } from "./config"; import { managerCode } from "./data/manager_code"; -import { MANAGER_LAMBDA, Protocols, protocols } from "@taquito/taquito"; +import { MANAGER_LAMBDA } from "@taquito/taquito"; -CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract, protocol }) => { +CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract }) => { const Tezos = lib; describe(`Test TZ Manager through contract api: ${rpc}`, () => { @@ -50,9 +50,7 @@ CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract, protocol }) => await contract.methods.do(MANAGER_LAMBDA.transferImplicit("tz1eY5Aqa1kXDFoiebL28emyXFoneAoVg1zh", 50 * 1000000)).send({ amount: 0 }) fail('Should throw during transfer with amount higher than balance') } catch (ex: any) { - (protocol === Protocols.PtJakart2) ? - expect(ex.message).toContain('contract.balance_too_low') : - expect(ex.message).toContain('tez.subtraction_underflow') + expect(ex.message).toContain('tez.subtraction_underflow') } done(); }) diff --git a/integration-tests/contract-register-global-constant.spec.ts b/integration-tests/contract-register-global-constant.spec.ts index 07c33cdbac..aa711ff914 100644 --- a/integration-tests/contract-register-global-constant.spec.ts +++ b/integration-tests/contract-register-global-constant.spec.ts @@ -1,10 +1,9 @@ -import { Protocols } from '@taquito/taquito'; import { CONFIGS } from './config'; const crypto = require('crypto'); CONFIGS().forEach(({ lib, rpc, setup }) => { const Tezos = lib; - + describe(`Register global constants using: ${rpc}`, () => { const randomAnnots = () => crypto.randomBytes(3).toString('hex'); let annots = randomAnnots(); diff --git a/integration-tests/contract-security-balance-instruction.spec.ts b/integration-tests/contract-security-balance-instruction.spec.ts index 7a1266bc24..f2bcc09be9 100644 --- a/integration-tests/contract-security-balance-instruction.spec.ts +++ b/integration-tests/contract-security-balance-instruction.spec.ts @@ -1,4 +1,4 @@ -import { BigMapAbstraction, Protocols } from '@taquito/taquito'; +import { Protocols } from '@taquito/taquito'; import { CONFIGS } from './config'; // TC-008: Obtained balance of a smart contract using the BALANCE instruction does not change during the execution of the entrypoint's own code. diff --git a/integration-tests/contract-security-duplicate-ticket.spec.ts b/integration-tests/contract-security-duplicate-ticket.spec.ts index ab2e54bf0b..96bcdff419 100644 --- a/integration-tests/contract-security-duplicate-ticket.spec.ts +++ b/integration-tests/contract-security-duplicate-ticket.spec.ts @@ -1,4 +1,4 @@ -import { Protocols, TezosOperationError } from '@taquito/taquito'; +import { Protocols } from '@taquito/taquito'; import { CONFIGS } from './config'; // TC-T-001: Testcase to duplicate a ticket using "dup" instruction. diff --git a/integration-tests/contract-security-mutez-overflow.spec.ts b/integration-tests/contract-security-mutez-overflow.spec.ts index 8264c9b822..010efef38f 100644 --- a/integration-tests/contract-security-mutez-overflow.spec.ts +++ b/integration-tests/contract-security-mutez-overflow.spec.ts @@ -1,5 +1,4 @@ import { Protocols } from '@taquito/taquito'; -import { doesNotMatch } from 'assert'; import { CONFIGS } from './config'; /** @@ -42,7 +41,7 @@ CONFIGS().forEach(({ lib, rpc, setup, protocol }) => { const opContract = await op.contract(); const opSend = await opContract.methods.default(0).send(); await opSend.confirmation(); - + } catch (error: any) { expect(error.message).toContain('tez.multiplication_overflow'); } diff --git a/integration-tests/contract-security-zero-transfer.spec.ts b/integration-tests/contract-security-zero-transfer.spec.ts index a4893f6451..d334c370a9 100644 --- a/integration-tests/contract-security-zero-transfer.spec.ts +++ b/integration-tests/contract-security-zero-transfer.spec.ts @@ -1,5 +1,4 @@ import { CONFIGS } from './config'; -import { RpcClient } from '@taquito/rpc'; import { Protocols } from '@taquito/taquito'; // TC-007 - A 0tez transaction to an implicit account should fail. diff --git a/integration-tests/known-contracts-ProtoALph.ts b/integration-tests/known-contracts-ProtoALph.ts index 31c8eff2b2..6936981f64 100644 --- a/integration-tests/known-contracts-ProtoALph.ts +++ b/integration-tests/known-contracts-ProtoALph.ts @@ -3,4 +3,3 @@ export const knownBigMapContractProtoALph = "KT1PEif4yNPaeDnmroV2zK9hshJqE6XHVUq export const knownTzip12BigMapOffChainContractProtoALph = "KT1R6oieCZSFLf1w15yvjx3X38ZjhkdnyyHP"; export const knownSaplingContractProtoALph = "KT1TGQqMpzhsAMzAaCeDmL3oJRbqphjhFh9S"; export const knownOnChainViewContractAddressProtoALph = "KT1KmbQjCdEAX3NM5YoSZH6QPYK5foghn2Md"; -export const txRollupAddressProtoALph = ""; diff --git a/integration-tests/known-contracts-PtGhostnet.ts b/integration-tests/known-contracts-PtGhostnet.ts index 25134aec5e..e34f0306f6 100644 --- a/integration-tests/known-contracts-PtGhostnet.ts +++ b/integration-tests/known-contracts-PtGhostnet.ts @@ -3,4 +3,3 @@ export const knownBigMapContractPtGhostnet = "KT1Dig4sQxbZaZjo9X18etvpEWN1eGKxTV export const knownTzip12BigMapOffChainContractPtGhostnet = "KT1NMtSQq484bDYSFvNrBjfkGtpug2Fm1rrr"; export const knownSaplingContractPtGhostnet = "KT1ToBD7bovonshNrxs3i4KMFuZ8PE2LUmQf"; export const knownOnChainViewContractAddressPtGhostnet = "KT1R5spjSabhD9q8cwZfCvssuvUoHmEd6KNv"; -export const txRollupAddressPtGhostnet = "txr1Xz6LiZSspZ9bJu2SC5r97B1ikCBAAYKdQ"; \ No newline at end of file diff --git a/integration-tests/known-contracts-PtLimaPtL.ts b/integration-tests/known-contracts-PtLimaPtL.ts index 227e57a1e2..29796b23cb 100644 --- a/integration-tests/known-contracts-PtLimaPtL.ts +++ b/integration-tests/known-contracts-PtLimaPtL.ts @@ -3,4 +3,3 @@ export const knownBigMapContractPtLimaPtL = "KT19WjpKFLhkpnPfvzJCShyVxfiRfKuXx4j export const knownTzip12BigMapOffChainContractPtLimaPtL = "KT1GnRJVaqvzjeeuhcsCUZmn96ZrN8pJ2GxV"; export const knownSaplingContractPtLimaPtL = "KT1S321F21ZTqjxwC3MgJDE8M8aTX3234ZCY"; export const knownOnChainViewContractAddressPtLimaPtL = "KT1CH64MzwB9E5XkgdR1s7ZamHYsJuTPkDnt"; -export const txRollupAddressPtLimaPtL = "txr1WtzBSTQMfLcGNPmMeDBUhNPjX7Vo3E5p3"; \ No newline at end of file diff --git a/integration-tests/known-contracts-PtMumbaii.ts b/integration-tests/known-contracts-PtMumbaii.ts index 42504430a1..50332dbfa8 100644 --- a/integration-tests/known-contracts-PtMumbaii.ts +++ b/integration-tests/known-contracts-PtMumbaii.ts @@ -3,4 +3,3 @@ export const knownBigMapContractPtMumbaii = "KT1ToCtqCSAqK85sYmD3f1AUC1h17Ho9J8J export const knownTzip12BigMapOffChainContractPtMumbaii = "KT1AJwEfLhur9snYyv86GAXdoQZqygED3X3b"; export const knownSaplingContractPtMumbaii = "KT1MU6HasZvDrnDk7TdNVGj9zFVfDDGGrkFD"; export const knownOnChainViewContractAddressPtMumbaii = "KT1Mon6pBMP2M48tRSCAuSTgccsnwwG7PnHw"; -export const txRollupAddressPtMumbaii = "txr1YzCiyQKjiNykr3cHoD9AVJqn9wtq81Cuc"; \ No newline at end of file diff --git a/integration-tests/ledger-signer.spec.ts b/integration-tests/ledger-signer.spec.ts index 4bb43f71f1..dd2f751a2f 100644 --- a/integration-tests/ledger-signer.spec.ts +++ b/integration-tests/ledger-signer.spec.ts @@ -2,10 +2,9 @@ import { CONFIGS } from './config'; import { LedgerSigner, LedgerTransport, DerivationType } from '@taquito/ledger-signer'; import TransportNodeHid from "@ledgerhq/hw-transport-node-hid"; import { ligoSample } from "./data/ligo-simple-contract"; -import { OriginateParams, TezosToolkit } from '@taquito/taquito'; +import { TezosToolkit } from '@taquito/taquito'; import { localForger } from '@taquito/local-forging'; import { rpcToForge } from './data/contract_origination'; -import { MichelsonV1Expression } from '@taquito/rpc'; // PLEASE NOTE MAY NEED TO TEST ONE TEST AT A TIME // as the ledger will fail if requested multiple times at once diff --git a/integration-tests/polling-subscribe-provider.spec.ts b/integration-tests/polling-subscribe-provider.spec.ts index 70f767ee4a..82a32a7569 100644 --- a/integration-tests/polling-subscribe-provider.spec.ts +++ b/integration-tests/polling-subscribe-provider.spec.ts @@ -1,5 +1,5 @@ import { CONFIGS, sleep } from "./config"; -import { Protocols, PollingSubscribeProvider } from "@taquito/taquito"; +import { PollingSubscribeProvider } from "@taquito/taquito"; CONFIGS().forEach(({ lib, rpc, setup }) => { const Tezos = lib; diff --git a/integration-tests/wallet-api.spec.ts b/integration-tests/wallet-api.spec.ts index 21e621d8a2..f0e6bbe288 100644 --- a/integration-tests/wallet-api.spec.ts +++ b/integration-tests/wallet-api.spec.ts @@ -1,4 +1,3 @@ -import { PollingSubscribeProvider } from "@taquito/taquito"; import { CONFIGS } from "./config"; CONFIGS().forEach(({ lib, rpc, setup }) => { diff --git a/integration-tests/wallet-manager-scenario.spec.ts b/integration-tests/wallet-manager-scenario.spec.ts index 3b03593db7..d3d3a5d9da 100644 --- a/integration-tests/wallet-manager-scenario.spec.ts +++ b/integration-tests/wallet-manager-scenario.spec.ts @@ -1,8 +1,8 @@ import { CONFIGS } from "./config"; import { managerCode } from "./data/manager_code"; -import { MANAGER_LAMBDA, Protocols } from "@taquito/taquito"; +import { MANAGER_LAMBDA } from "@taquito/taquito"; -CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract, protocol }) => { +CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract }) => { const Tezos = lib; describe(`Test TZ Manager through wallet api: ${rpc}`, () => { @@ -37,9 +37,9 @@ CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract, protocol }) => const removeDelegateOp = await contract.methods.do(MANAGER_LAMBDA.removeDelegate()).send({ amount: 0 }) await removeDelegateOp.confirmation(); expect(removeDelegateOp.status).toBeTruthy - + const account = await Tezos.rpc.getDelegate(knownBaker) - expect(account).toEqual(knownBaker) + expect(account).toEqual(knownBaker) // Transfer from contract (kt1_alice) to contract (kt1 bob) // Notice that we are instructing the kt1_alice contract to send 1 token to kt1_bob. The transfer value is passed to the // lambda helper function. The transfer amount in the actual transfer operation is 0. We are not transferring the token @@ -53,9 +53,7 @@ CONFIGS().forEach(({ lib, rpc, setup, knownBaker, knownContract, protocol }) => await contract.methods.do(MANAGER_LAMBDA.transferImplicit("tz1eY5Aqa1kXDFoiebL28emyXFoneAoVg1zh", 50 * 1000000)).send({ amount: 0 }) fail('Should throw during transfer with amount higher than balance') } catch (ex: any) { - (protocol === Protocols.PtJakart2) ? - expect(ex.message).toContain('contract.balance_too_low') : - expect(ex.message).toContain('tez.subtraction_underflow') + expect(ex.message).toContain('tez.subtraction_underflow') } done(); }) diff --git a/integration-tests/wallet-originate-invalid-string.spec.ts b/integration-tests/wallet-originate-invalid-string.spec.ts index 51cb939a73..b702a5ae41 100644 --- a/integration-tests/wallet-originate-invalid-string.spec.ts +++ b/integration-tests/wallet-originate-invalid-string.spec.ts @@ -1,7 +1,6 @@ -import { Protocols } from "@taquito/taquito"; import { CONFIGS } from "./config"; -CONFIGS().forEach(({ lib, rpc, setup, protocol }) => { +CONFIGS().forEach(({ lib, rpc, setup }) => { const Tezos = lib; describe(`Test contract origination with invalid data through wallet api using: ${rpc}`, () => { @@ -24,11 +23,7 @@ CONFIGS().forEach(({ lib, rpc, setup, protocol }) => { init: `"Copyright ©"` }).send() } catch (ex) { - if (protocol === Protocols.PsFLorena || protocol === Protocols.PtGRANADs) { - expect(ex).toEqual(expect.objectContaining({ message: expect.stringContaining('invalid_syntactic_constant') })) - } else { expect(ex).toEqual(expect.objectContaining({ message: expect.stringContaining('non_printable_character') })) - } } done(); }); diff --git a/packages/taquito-sapling/src/taquito-sapling.ts b/packages/taquito-sapling/src/taquito-sapling.ts index 03ca35f268..d1b5b421ec 100644 --- a/packages/taquito-sapling/src/taquito-sapling.ts +++ b/packages/taquito-sapling/src/taquito-sapling.ts @@ -328,8 +328,7 @@ export class SaplingToolkit { if (!input.isSpent && sumSelectedInputs.isLessThan(amountMutez)) { const txAmount = convertValueToBigNumber(input.value); sumSelectedInputs = sumSelectedInputs.plus(txAmount); - // eslint-disable-next-line @typescript-eslint/no-unused-vars - const { isSpent, ...rest } = input; + const { isSpent: _isSpent, ...rest } = input; inputsToSpend.push(rest); } });