From 85d50a9d40e5a3f82efeb4cdb27b72096b776bbe Mon Sep 17 00:00:00 2001 From: friedger Date: Tue, 13 Feb 2024 16:28:40 +0100 Subject: [PATCH] chore: fmt --- .../clarity/natives/buff-to-int-be.spec.ts | 24 ++--- .../clarity/natives/buff-to-int-le.spec.ts | 24 ++--- .../clarity/natives/buff-to-uint-be.spec.ts | 24 ++--- .../clarity/natives/buff-to-uint-le.spec.ts | 24 ++--- .../clarity/natives/chain-id.spec.ts | 16 +-- .../clarity/natives/element-at.spec.ts | 24 ++--- .../natives/from-consensus-buff.spec.ts | 24 ++--- .../natives/get-burn-block-info.spec.ts | 26 ++--- .../clarity/natives/index-of.spec.ts | 24 ++--- .../clarity/natives/int-to-ascii.spec.ts | 24 ++--- .../clarity/natives/int-to-utf8.spec.ts | 24 ++--- .../clarity/natives/is-standard.spec.ts | 24 ++--- .../natives/principal-construct.spec.ts | 100 +++++++++--------- .../natives/principal-destruct.spec.ts | 48 ++++----- .../clarity/natives/replace-at.spec.ts | 24 ++--- .../integration/clarity/natives/slice.spec.ts | 24 ++--- .../clarity/natives/string-to-int.spec.ts | 24 ++--- .../clarity/natives/string-to-uint.spec.ts | 24 ++--- .../clarity/natives/stx-account.spec.ts | 52 ++++----- .../clarity/natives/stx-transfer-memo.spec.ts | 20 ++-- .../clarity/natives/to-consensus-buff.spec.ts | 30 +++--- .../clarity/natives/tx-sponsor.spec.ts | 20 ++-- .../clarity/traits/call-nested-1.spec.ts | 30 +++--- .../clarity/traits/call-nested-2.spec.ts | 30 +++--- .../clarity/traits/call-nested-3-err.spec.ts | 34 +++--- .../clarity/traits/call-nested-3-ok.spec.ts | 36 +++---- .../clarity/traits/call-nested-4.spec.ts | 30 +++--- .../clarity/traits/circular.spec.ts | 18 ++-- .../integration/clarity/traits/double.spec.ts | 14 +-- .../integration/clarity/traits/empty.spec.ts | 18 ++-- tests/integration/clarity/traits/helper.ts | 10 +- .../clarity/traits/identical-double.spec.ts | 16 +-- .../clarity/traits/impl-double-1.spec.ts | 26 ++--- .../clarity/traits/impl-double-both.spec.ts | 10 +- .../traits/impl-identical-double.spec.ts | 14 +-- tests/integration/clarity/traits/impl.spec.ts | 14 +-- .../clarity/traits/nested-traits.spec.ts | 32 +++--- .../clarity/traits/no-response.spec.ts | 10 +- .../clarity/traits/out-of-order.spec.ts | 10 +- .../clarity/traits/selfret.spec.ts | 16 +-- .../clarity/traits/undefined.spec.ts | 10 +- .../clarity/traits/use-and-define.spec.ts | 12 +-- .../clarity/traits/use-double.spec.ts | 14 +-- .../traits/use-partial-double-1.spec.ts | 14 +-- .../traits/use-partial-double-2.spec.ts | 14 +-- .../traits/use-redefined-trait.spec.ts | 20 ++-- .../traits/use-transitive-alias.spec.ts | 20 ++-- .../traits/use-transitive-name.spec.ts | 20 ++-- .../traits/use-transitive-original.spec.ts | 20 ++-- tests/integration/clarity/traits/use.spec.ts | 20 ++-- .../consensus/transaction-fee.spec.ts | 26 ++--- .../epoch-2-2/wrap-trait-workaround.spec.ts | 16 +-- .../epoch-2-2/wrap-trait-workaround2.spec.ts | 14 +-- .../epoch-2-2/wrap-trait-workaround3.spec.ts | 24 ++--- tests/integration/helpers.ts | 20 ++-- .../pox/helpers-direct-stacking.ts | 6 +- .../pox/helpers-pooled-stacking.ts | 12 +-- tests/integration/pox/helpers.ts | 62 +++++------ .../pox/pox-3/direct-and-pooled.spec.ts | 40 +++---- .../pox-3/direct-stacking-auto-unlock.spec.ts | 22 ++-- .../pox-3/direct-stacking-bad-order.spec.ts | 16 +-- .../pox/pox-3/direct-stacking-extend.spec.ts | 12 +-- .../pox-3/direct-stacking-good-order.spec.ts | 16 +-- .../direct-stacking-increase-twice.spec.ts | 14 +-- .../direct-stacking-many-increase.spec.ts | 20 ++-- .../pox/pox-3/pooled-stacking-adjust.spec.ts | 28 ++--- .../pox-3/pooled-stacking-auto-unlock.spec.ts | 34 +++--- .../pooled-stacking-switch-pools.spec.ts | 40 +++---- .../pooled-stacking-switch-pox-addr.spec.ts | 46 ++++---- .../pox/pox-3/pooled-stacking.spec.ts | 56 +++++----- .../integration/pox/pox-3/reject-pox.spec.ts | 26 ++--- .../direct-and-pooled-extend-bug.spec.ts | 48 ++++----- ...d-pooled-increase-as-pool-operator.spec.ts | 32 +++--- ...-pooled-increase-bad-pool-operator.spec.ts | 20 ++-- .../direct-and-pooled-increase-bug.spec.ts | 34 +++--- .../direct-stacking-auto-unlock.spec.ts | 32 +++--- .../stacking/direct-stacking-extend.spec.ts | 18 ++-- .../direct-stacking-good-order.spec.ts | 22 ++-- .../direct-stacking-increase-twice.spec.ts | 16 +-- .../direct-stacking-many-increase.spec.ts | 28 ++--- .../stacking/direct-stacking-with-bug.spec.ts | 18 ++-- .../pox/stacking/epoch-gating-bug.spec.ts | 22 ++-- .../pox/stacking/epoch_2_0.spec.ts | 16 +-- .../pox/stacking/epoch_2_1.spec.ts | 10 +- .../pooled-stacking-switch-pools.spec.ts | 30 +++--- .../pox/stacking/pooled-stacking.spec.ts | 58 +++++----- .../traits/trait-parameter-20-20.spec.ts | 34 +++--- .../traits/trait-parameter-20-21.spec.ts | 36 +++---- .../traits/trait-parameter-20-22.spec.ts | 28 ++--- .../traits/trait-parameter-20-23.spec.ts | 18 ++-- .../traits/trait-parameter-21-20.spec.ts | 32 +++--- .../traits/trait-parameter-21-21.spec.ts | 32 +++--- .../traits/trait-parameter-21-22.spec.ts | 24 ++--- .../traits/trait-parameter-21-23.spec.ts | 20 ++-- .../traits/trait-parameter-22-20.spec.ts | 24 ++--- .../traits/trait-parameter-22-21.spec.ts | 24 ++--- .../traits/trait-parameter-22-22.spec.ts | 22 ++-- .../traits/trait-parameter-22-23.spec.ts | 20 ++-- .../traits/trait-parameter-23-20.spec.ts | 18 ++-- .../traits/trait-parameter-23-21.spec.ts | 20 ++-- .../traits/trait-parameter-23-22.spec.ts | 20 ++-- .../traits/trait-parameter-23-23.spec.ts | 18 ++-- .../traits/traits-across-contracts.spec.ts | 20 ++-- tests/testnet/checks.spec.ts | 34 +++--- tests/testnet/next-cycle-2.spec.ts | 4 +- tests/testnet/next-cycle.spec.ts | 12 +-- tests/testnet/setup.spec.ts | 22 ++-- 107 files changed, 1308 insertions(+), 1308 deletions(-) diff --git a/tests/integration/clarity/natives/buff-to-int-be.spec.ts b/tests/integration/clarity/natives/buff-to-int-be.spec.ts index 887616a..d1d9d0c 100644 --- a/tests/integration/clarity/natives/buff-to-int-be.spec.ts +++ b/tests/integration/clarity/natives/buff-to-int-be.spec.ts @@ -66,13 +66,13 @@ describe("buff-to-int-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -81,7 +81,7 @@ describe("buff-to-int-be", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -111,10 +111,10 @@ describe("buff-to-int-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -145,10 +145,10 @@ describe("buff-to-int-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok 1)"); expect(tx.success).toBeTruthy(); @@ -180,10 +180,10 @@ describe("buff-to-int-be", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok -1)"); expect(tx.success).toBeTruthy(); @@ -215,10 +215,10 @@ describe("buff-to-int-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok 0)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/buff-to-int-le.spec.ts b/tests/integration/clarity/natives/buff-to-int-le.spec.ts index 598cbed..d204b66 100644 --- a/tests/integration/clarity/natives/buff-to-int-le.spec.ts +++ b/tests/integration/clarity/natives/buff-to-int-le.spec.ts @@ -69,13 +69,13 @@ describe("buff-to-int-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -84,7 +84,7 @@ describe("buff-to-int-le", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -114,10 +114,10 @@ describe("buff-to-int-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -148,10 +148,10 @@ describe("buff-to-int-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok 1)"); expect(tx.success).toBeTruthy(); @@ -184,10 +184,10 @@ describe("buff-to-int-le", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok -1)"); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("buff-to-int-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok 0)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/buff-to-uint-be.spec.ts b/tests/integration/clarity/natives/buff-to-uint-be.spec.ts index 1fcc87d..a0a79fc 100644 --- a/tests/integration/clarity/natives/buff-to-uint-be.spec.ts +++ b/tests/integration/clarity/natives/buff-to-uint-be.spec.ts @@ -67,13 +67,13 @@ describe("buff-to-uint-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -82,7 +82,7 @@ describe("buff-to-uint-be", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -112,10 +112,10 @@ describe("buff-to-uint-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -146,10 +146,10 @@ describe("buff-to-uint-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok u1)"); expect(tx.success).toBeTruthy(); @@ -181,10 +181,10 @@ describe("buff-to-uint-be", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok u340282366920938463463374607431768211455)"); expect(tx.success).toBeTruthy(); @@ -216,10 +216,10 @@ describe("buff-to-uint-be", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok u0)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/buff-to-uint-le.spec.ts b/tests/integration/clarity/natives/buff-to-uint-le.spec.ts index 9d504fe..dcb6bf7 100644 --- a/tests/integration/clarity/natives/buff-to-uint-le.spec.ts +++ b/tests/integration/clarity/natives/buff-to-uint-le.spec.ts @@ -67,13 +67,13 @@ describe("buff-to-uint-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -82,7 +82,7 @@ describe("buff-to-uint-le", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -112,10 +112,10 @@ describe("buff-to-uint-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -146,10 +146,10 @@ describe("buff-to-uint-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok u1)"); expect(tx.success).toBeTruthy(); @@ -181,10 +181,10 @@ describe("buff-to-uint-le", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok u340282366920938463463374607431768211455)"); expect(tx.success).toBeTruthy(); @@ -216,10 +216,10 @@ describe("buff-to-uint-le", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok u0)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/chain-id.spec.ts b/tests/integration/clarity/natives/chain-id.spec.ts index f2fb30f..196c39a 100644 --- a/tests/integration/clarity/natives/chain-id.spec.ts +++ b/tests/integration/clarity/natives/chain-id.spec.ts @@ -65,13 +65,13 @@ describe("chain-id", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -80,7 +80,7 @@ describe("chain-id", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -110,10 +110,10 @@ describe("chain-id", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -144,10 +144,10 @@ describe("chain-id", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok u2147483648)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/element-at.spec.ts b/tests/integration/clarity/natives/element-at.spec.ts index 79f0b4d..ef07200 100644 --- a/tests/integration/clarity/natives/element-at.spec.ts +++ b/tests/integration/clarity/natives/element-at.spec.ts @@ -73,13 +73,13 @@ describe("element-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -88,7 +88,7 @@ describe("element-at?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -118,10 +118,10 @@ describe("element-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -152,10 +152,10 @@ describe("element-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe('(ok (some u"b"))'); expect(tx.success).toBeTruthy(); @@ -188,10 +188,10 @@ describe("element-at?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok (some 0x22))"); expect(tx.success).toBeTruthy(); @@ -224,10 +224,10 @@ describe("element-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/from-consensus-buff.spec.ts b/tests/integration/clarity/natives/from-consensus-buff.spec.ts index e4d0532..b19d7d8 100644 --- a/tests/integration/clarity/natives/from-consensus-buff.spec.ts +++ b/tests/integration/clarity/natives/from-consensus-buff.spec.ts @@ -73,13 +73,13 @@ describe("from-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -88,7 +88,7 @@ describe("from-consensus-buff?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -118,10 +118,10 @@ describe("from-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -152,10 +152,10 @@ describe("from-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok (some 1))"); expect(tx.success).toBeTruthy(); @@ -188,10 +188,10 @@ describe("from-consensus-buff?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); @@ -224,10 +224,10 @@ describe("from-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok (some (tuple (abc 3) (def 4))))"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/get-burn-block-info.spec.ts b/tests/integration/clarity/natives/get-burn-block-info.spec.ts index 6595d5e..adf6c39 100644 --- a/tests/integration/clarity/natives/get-burn-block-info.spec.ts +++ b/tests/integration/clarity/natives/get-burn-block-info.spec.ts @@ -70,13 +70,13 @@ describe("get-burn-block-info?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -85,7 +85,7 @@ describe("get-burn-block-info?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -120,10 +120,10 @@ describe("get-burn-block-info?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -154,10 +154,10 @@ describe("get-burn-block-info?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toContain("(ok (some 0x"); expect(tx.success).toBeTruthy(); @@ -167,7 +167,7 @@ describe("get-burn-block-info?", () => { it("returns valid pox addrs", async () => { let chainUpdate = await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 1 + Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 1, ); // Wait for block N-2 where N is the height of the next prepare phase let blockHeight = getBitcoinBlockHeight(chainUpdate); @@ -181,7 +181,7 @@ describe("get-burn-block-info?", () => { fee: 1000, nonce: 1, }, - { amount: 90_000_000_000_000, blockHeight, cycles: 12 } + { amount: 90_000_000_000_000, blockHeight, cycles: 12 }, ); expect(response.error).toBeUndefined(); @@ -214,15 +214,15 @@ describe("get-burn-block-info?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(u${height})` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(u${height})`, ); // FIXME: verify this output once everything is working expect(tx.result).toBe( - "(ok (some (tuple (addrs ((tuple (hashbytes 0x7321b74e2b6a7e949e6c4ad313035b1665095017) (version 0x00)) (tuple (hashbytes 0x7321b74e2b6a7e949e6c4ad313035b1665095017) (version 0x00)))) (payout u10000))))" + "(ok (some (tuple (addrs ((tuple (hashbytes 0x7321b74e2b6a7e949e6c4ad313035b1665095017) (version 0x00)) (tuple (hashbytes 0x7321b74e2b6a7e949e6c4ad313035b1665095017) (version 0x00)))) (payout u10000))))", ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/natives/index-of.spec.ts b/tests/integration/clarity/natives/index-of.spec.ts index 1c47f60..2a6b0fb 100644 --- a/tests/integration/clarity/natives/index-of.spec.ts +++ b/tests/integration/clarity/natives/index-of.spec.ts @@ -73,13 +73,13 @@ describe("index-of?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -88,7 +88,7 @@ describe("index-of?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -118,10 +118,10 @@ describe("index-of?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -152,10 +152,10 @@ describe("index-of?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok (some u1))"); expect(tx.success).toBeTruthy(); @@ -188,10 +188,10 @@ describe("index-of?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok (some u2))"); expect(tx.success).toBeTruthy(); @@ -224,10 +224,10 @@ describe("index-of?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/int-to-ascii.spec.ts b/tests/integration/clarity/natives/int-to-ascii.spec.ts index 2966706..ebe0cce 100644 --- a/tests/integration/clarity/natives/int-to-ascii.spec.ts +++ b/tests/integration/clarity/natives/int-to-ascii.spec.ts @@ -71,13 +71,13 @@ describe("int-to-ascii", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("int-to-ascii", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("int-to-ascii", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("int-to-ascii", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe('(ok "1")'); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("int-to-ascii", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe('(ok "1")'); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("int-to-ascii", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe('(ok "-1")'); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/int-to-utf8.spec.ts b/tests/integration/clarity/natives/int-to-utf8.spec.ts index 355525c..9c5b879 100644 --- a/tests/integration/clarity/natives/int-to-utf8.spec.ts +++ b/tests/integration/clarity/natives/int-to-utf8.spec.ts @@ -71,13 +71,13 @@ describe("int-to-utf8", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("int-to-utf8", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("int-to-utf8", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("int-to-utf8", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe('(ok u"1")'); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("int-to-utf8", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe('(ok u"1")'); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("int-to-utf8", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe('(ok u"-1")'); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/is-standard.spec.ts b/tests/integration/clarity/natives/is-standard.spec.ts index 9de0ce9..bfeab1c 100644 --- a/tests/integration/clarity/natives/is-standard.spec.ts +++ b/tests/integration/clarity/natives/is-standard.spec.ts @@ -71,13 +71,13 @@ describe("is-standard", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("is-standard", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("is-standard", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("is-standard", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok true)"); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("is-standard", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok true)"); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("is-standard", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok false)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/principal-construct.spec.ts b/tests/integration/clarity/natives/principal-construct.spec.ts index d83efb0..960f0f2 100644 --- a/tests/integration/clarity/natives/principal-construct.spec.ts +++ b/tests/integration/clarity/natives/principal-construct.spec.ts @@ -73,13 +73,13 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -88,7 +88,7 @@ describe("principal-construct?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -129,10 +129,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -163,10 +163,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()`, ); expect(tx.result).toBe("(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK)"); expect(tx.success).toBeTruthy(); @@ -198,13 +198,13 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()`, ); expect(tx.result).toBe( - "(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK.foo)" + "(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK.foo)", ); expect(tx.success).toBeTruthy(); }); @@ -214,8 +214,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("1a", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -241,10 +241,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320)`, ); expect(tx.result).toBe("(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK)"); expect(tx.success).toBeTruthy(); @@ -255,8 +255,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("1a", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -282,13 +282,13 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo")` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo")`, ); expect(tx.result).toBe( - "(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK.foo)" + "(ok ST3X6QWWETNBZWGBK6DRGTR1KX50S74D3425Q1TPK.foo)", ); expect(tx.success).toBeTruthy(); }); @@ -298,8 +298,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("16", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -325,13 +325,13 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x16, 0xfa6bf38ed557fe417333710d6033e9419391a320)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x16, 0xfa6bf38ed557fe417333710d6033e9419391a320)`, ); expect(tx.result).toBe( - "(err (tuple (error_code u0) (value (some SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY))))" + "(err (tuple (error_code u0) (value (some SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY))))", ); expect(tx.success).toBeFalsy(); }); @@ -341,8 +341,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("16", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -368,13 +368,13 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x16, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo")` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x16, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo")`, ); expect(tx.result).toBe( - "(err (tuple (error_code u0) (value (some SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY.foo))))" + "(err (tuple (error_code u0) (value (some SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY.foo))))", ); expect(tx.success).toBeFalsy(); }); @@ -384,8 +384,8 @@ describe("principal-construct?", () => { let version = bufferCV(new Uint8Array()); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -411,10 +411,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x, 0xfa6bf38ed557fe417333710d6033e9419391a320)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x, 0xfa6bf38ed557fe417333710d6033e9419391a320)`, ); expect(tx.result).toBe("(err (tuple (error_code u1) (value none)))"); expect(tx.success).toBeFalsy(); @@ -425,8 +425,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("1a", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a3", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a3", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -452,10 +452,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a3)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a3)`, ); expect(tx.result).toBe("(err (tuple (error_code u1) (value none)))"); expect(tx.success).toBeFalsy(); @@ -466,8 +466,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("20", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -493,10 +493,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x20, 0xfa6bf38ed557fe417333710d6033e9419391a320)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1(0x20, 0xfa6bf38ed557fe417333710d6033e9419391a320)`, ); expect(tx.result).toBe("(err (tuple (error_code u1) (value none)))"); expect(tx.success).toBeFalsy(); @@ -507,8 +507,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("1a", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -534,10 +534,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "")` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "")`, ); expect(tx.result).toBe("(err (tuple (error_code u2) (value none)))"); expect(tx.success).toBeFalsy(); @@ -548,8 +548,8 @@ describe("principal-construct?", () => { let version = bufferCV(Uint8Array.from(Buffer.from("1a", "hex"))); let pkh = bufferCV( Uint8Array.from( - Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex") - ) + Buffer.from("fa6bf38ed557fe417333710d6033e9419391a320", "hex"), + ), ); let callTxOptions: SignedContractCallOptions = { senderKey: Accounts.WALLET_1.secretKey, @@ -575,10 +575,10 @@ describe("principal-construct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo[")` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2(0x1a, 0xfa6bf38ed557fe417333710d6033e9419391a320, "foo[")`, ); expect(tx.result).toBe("(err (tuple (error_code u2) (value none)))"); expect(tx.success).toBeFalsy(); diff --git a/tests/integration/clarity/natives/principal-destruct.spec.ts b/tests/integration/clarity/natives/principal-destruct.spec.ts index c99b468..5701ba5 100644 --- a/tests/integration/clarity/natives/principal-destruct.spec.ts +++ b/tests/integration/clarity/natives/principal-destruct.spec.ts @@ -70,13 +70,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -85,7 +85,7 @@ describe("principal-destruct?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -123,10 +123,10 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -157,13 +157,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()`, ); expect(tx.result).toBe( - "(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name none) (version 0x1a)))" + "(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name none) (version 0x1a)))", ); expect(tx.success).toBeTruthy(); }); @@ -194,13 +194,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()`, ); expect(tx.result).toBe( - '(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name (some "foo")) (version 0x1a)))' + '(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name (some "foo")) (version 0x1a)))', ); expect(tx.success).toBeTruthy(); }); @@ -231,13 +231,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6)`, ); expect(tx.result).toBe( - "(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name none) (version 0x1a)))" + "(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name none) (version 0x1a)))", ); expect(tx.success).toBeTruthy(); }); @@ -270,13 +270,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6.foo)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(STB44HYPYAT2BB2QE513NSP81HTMYWBJP02HPGK6.foo)`, ); expect(tx.result).toBe( - '(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name (some "foo")) (version 0x1a)))' + '(ok (tuple (hash-bytes 0x164247d6f2b425ac5771423ae6c80c754f7172b0) (name (some "foo")) (version 0x1a)))', ); expect(tx.success).toBeTruthy(); }); @@ -309,13 +309,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY)`, ); expect(tx.result).toBe( - "(err (tuple (hash-bytes 0xfa6bf38ed557fe417333710d6033e9419391a320) (name none) (version 0x16)))" + "(err (tuple (hash-bytes 0xfa6bf38ed557fe417333710d6033e9419391a320) (name none) (version 0x16)))", ); expect(tx.success).toBeFalsy(); }); @@ -348,13 +348,13 @@ describe("principal-destruct?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY.foo)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY.foo)`, ); expect(tx.result).toBe( - '(err (tuple (hash-bytes 0xfa6bf38ed557fe417333710d6033e9419391a320) (name (some "foo")) (version 0x16)))' + '(err (tuple (hash-bytes 0xfa6bf38ed557fe417333710d6033e9419391a320) (name (some "foo")) (version 0x16)))', ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/natives/replace-at.spec.ts b/tests/integration/clarity/natives/replace-at.spec.ts index 5367e6f..bf5b191 100644 --- a/tests/integration/clarity/natives/replace-at.spec.ts +++ b/tests/integration/clarity/natives/replace-at.spec.ts @@ -71,13 +71,13 @@ describe("replace-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("replace-at?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("replace-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("replace-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe('(ok (some u"ac"))'); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("replace-at?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok (some 0x00114433))"); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("replace-at?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/slice.spec.ts b/tests/integration/clarity/natives/slice.spec.ts index 40001b3..1c75f8f 100644 --- a/tests/integration/clarity/natives/slice.spec.ts +++ b/tests/integration/clarity/natives/slice.spec.ts @@ -71,13 +71,13 @@ describe("slice?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("slice?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("slice?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("slice?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe('(ok (some "chain"))'); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("slice?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("slice?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok (some (4)))"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/string-to-int.spec.ts b/tests/integration/clarity/natives/string-to-int.spec.ts index 1de26e2..a73290a 100644 --- a/tests/integration/clarity/natives/string-to-int.spec.ts +++ b/tests/integration/clarity/natives/string-to-int.spec.ts @@ -71,13 +71,13 @@ describe("string-to-int?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("string-to-int?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("string-to-int?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("string-to-int?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok (some 1))"); expect(tx.success).toBeTruthy(); @@ -185,10 +185,10 @@ describe("string-to-int?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok (some -1))"); expect(tx.success).toBeTruthy(); @@ -220,10 +220,10 @@ describe("string-to-int?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/string-to-uint.spec.ts b/tests/integration/clarity/natives/string-to-uint.spec.ts index 361d13c..09f9f05 100644 --- a/tests/integration/clarity/natives/string-to-uint.spec.ts +++ b/tests/integration/clarity/natives/string-to-uint.spec.ts @@ -73,13 +73,13 @@ describe("string-to-uint?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -88,7 +88,7 @@ describe("string-to-uint?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -118,10 +118,10 @@ describe("string-to-uint?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -152,10 +152,10 @@ describe("string-to-uint?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok (some u1))"); expect(tx.success).toBeTruthy(); @@ -188,10 +188,10 @@ describe("string-to-uint?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(ok (some u1))"); expect(tx.success).toBeTruthy(); @@ -224,10 +224,10 @@ describe("string-to-uint?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/natives/stx-account.spec.ts b/tests/integration/clarity/natives/stx-account.spec.ts index 2331b1d..01a2b5b 100644 --- a/tests/integration/clarity/natives/stx-account.spec.ts +++ b/tests/integration/clarity/natives/stx-account.spec.ts @@ -79,13 +79,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -94,7 +94,7 @@ describe("stx-account", () => { beforeAll(async () => { // Wait for pox-2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + Constants.DEVNET_DEFAULT_POX_2_ACTIVATION, ); await orchestrator.waitForNextStacksBlock(); }); @@ -132,10 +132,10 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -166,13 +166,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-1()`, ); expect(tx.result).toBe( - "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))" + "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))", ); expect(tx.success).toBeTruthy(); }); @@ -203,13 +203,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-literal-2()`, ); expect(tx.result).toBe( - "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))" + "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))", ); expect(tx.success).toBeTruthy(); }); @@ -242,13 +242,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SZ2J6ZY48GV1EZ5V2V5RB9MP66SW86PYKKQ9H6DPR)`, ); expect(tx.result).toBe( - "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))" + "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))", ); expect(tx.success).toBeTruthy(); }); @@ -279,13 +279,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(${Accounts.WALLET_1.stxAddress})` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(${Accounts.WALLET_1.stxAddress})`, ); expect(tx.result).toBe( - "(ok (tuple (locked u0) (unlock-height u0) (unlocked u99999999992000)))" + "(ok (tuple (locked u0) (unlock-height u0) (unlocked u99999999992000)))", ); expect(tx.success).toBeTruthy(); }); @@ -318,13 +318,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY)` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(SP3X6QWWETNBZWGBK6DRGTR1KX50S74D3433WDGJY)`, ); expect(tx.result).toBe( - "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))" + "(ok (tuple (locked u0) (unlock-height u0) (unlocked u0)))", ); expect(tx.success).toBeTruthy(); }); @@ -334,7 +334,7 @@ describe("stx-account", () => { let chainUpdate = await waitForNextPreparePhase( network, orchestrator, - -2 + -2, ); let blockHeight = getBitcoinBlockHeight(chainUpdate); @@ -348,7 +348,7 @@ describe("stx-account", () => { fee: 1000, nonce: 5, }, - { amount: 25_000_000_000_000, blockHeight, cycles } + { amount: 25_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -386,13 +386,13 @@ describe("stx-account", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(${Accounts.WALLET_1.stxAddress})` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test(${Accounts.WALLET_1.stxAddress})`, ); expect(tx.result).toBe( - `(ok (tuple (locked u25000000000000) (unlock-height u${unlockHeight}) (unlocked u74999999987000)))` + `(ok (tuple (locked u25000000000000) (unlock-height u${unlockHeight}) (unlocked u74999999987000)))`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/natives/stx-transfer-memo.spec.ts b/tests/integration/clarity/natives/stx-transfer-memo.spec.ts index 6029da4..73336d0 100644 --- a/tests/integration/clarity/natives/stx-transfer-memo.spec.ts +++ b/tests/integration/clarity/natives/stx-transfer-memo.spec.ts @@ -71,13 +71,13 @@ describe("stx-transfer-memo?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("stx-transfer-memo?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("stx-transfer-memo?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,10 +150,10 @@ describe("stx-transfer-memo?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok true)"); expect(tx.success).toBeTruthy(); @@ -186,10 +186,10 @@ describe("stx-transfer-memo?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe("(err u4)"); expect(tx.success).toBeFalsy(); diff --git a/tests/integration/clarity/natives/to-consensus-buff.spec.ts b/tests/integration/clarity/natives/to-consensus-buff.spec.ts index b35b36c..b7e2b09 100644 --- a/tests/integration/clarity/natives/to-consensus-buff.spec.ts +++ b/tests/integration/clarity/natives/to-consensus-buff.spec.ts @@ -71,13 +71,13 @@ describe("to-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -86,7 +86,7 @@ describe("to-consensus-buff?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -116,10 +116,10 @@ describe("to-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -150,13 +150,13 @@ describe("to-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe( - "(ok (some 0x0000000000000000000000000000000001))" + "(ok (some 0x0000000000000000000000000000000001))", ); expect(tx.success).toBeTruthy(); }); @@ -187,13 +187,13 @@ describe("to-consensus-buff?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-2()`, ); expect(tx.result).toBe( - "(ok (some 0x0100000000000000000000000000000001))" + "(ok (some 0x0100000000000000000000000000000001))", ); expect(tx.success).toBeTruthy(); }); @@ -224,13 +224,13 @@ describe("to-consensus-buff?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-3()`, ); expect(tx.result).toBe( - "(ok (some 0x0c00000002036162630000000000000000000000000000000003036465660000000000000000000000000000000004))" + "(ok (some 0x0c00000002036162630000000000000000000000000000000003036465660000000000000000000000000000000004))", ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/natives/tx-sponsor.spec.ts b/tests/integration/clarity/natives/tx-sponsor.spec.ts index 102cfe8..06243a8 100644 --- a/tests/integration/clarity/natives/tx-sponsor.spec.ts +++ b/tests/integration/clarity/natives/tx-sponsor.spec.ts @@ -66,13 +66,13 @@ describe("tx-sponsor?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThanOrEqual( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-05`, ); expect(tx.success).toBeFalsy(); }); @@ -81,7 +81,7 @@ describe("tx-sponsor?", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); await orchestrator.waitForNextStacksBlock(); }); @@ -111,10 +111,10 @@ describe("tx-sponsor?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.test-2-1`, ); expect(tx.success).toBeTruthy(); }); @@ -145,10 +145,10 @@ describe("tx-sponsor?", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe("(ok none)"); expect(tx.success).toBeTruthy(); @@ -186,10 +186,10 @@ describe("tx-sponsor?", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - sponsoredTx.txid() + sponsoredTx.txid(), ); expect(tx.description).toBe( - `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()` + `invoked: ${Accounts.DEPLOYER.stxAddress}.test-2-1::test-1()`, ); expect(tx.result).toBe(`(ok (some ${Accounts.WALLET_2.stxAddress}))`); expect(tx.success).toBeTruthy(); diff --git a/tests/integration/clarity/traits/call-nested-1.spec.ts b/tests/integration/clarity/traits/call-nested-1.spec.ts index ffd2663..0a613e6 100644 --- a/tests/integration/clarity/traits/call-nested-1.spec.ts +++ b/tests/integration/clarity/traits/call-nested-1.spec.ts @@ -41,21 +41,21 @@ describe("call functions with nested traits", () => { "empty-trait", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "math-trait", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-1", 3, network, - orchestrator + orchestrator, ); let res = await contract_call( Accounts.WALLET_1, @@ -70,7 +70,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -83,7 +83,7 @@ describe("call functions with nested traits", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -93,7 +93,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, @@ -101,7 +101,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -109,7 +109,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -117,7 +117,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 1 + 1, ); let res = await contract_call( Accounts.WALLET_2, @@ -132,7 +132,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); }); @@ -143,7 +143,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, @@ -151,7 +151,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -159,7 +159,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -167,7 +167,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 2 + 2, ); let res = await contract_call( Accounts.WALLET_3, @@ -182,7 +182,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/call-nested-2.spec.ts b/tests/integration/clarity/traits/call-nested-2.spec.ts index 8d31e35..4be22b6 100644 --- a/tests/integration/clarity/traits/call-nested-2.spec.ts +++ b/tests/integration/clarity/traits/call-nested-2.spec.ts @@ -41,21 +41,21 @@ describe("call functions with nested traits", () => { "empty-trait", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "math-trait", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-2", 3, network, - orchestrator + orchestrator, ); let res = await contract_call( Accounts.WALLET_1, @@ -65,7 +65,7 @@ describe("call functions with nested traits", () => { [someCV(contractPrincipalCV(Accounts.DEPLOYER.stxAddress, "empty"))], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -78,7 +78,7 @@ describe("call functions with nested traits", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -88,7 +88,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, @@ -96,7 +96,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -104,7 +104,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -112,7 +112,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 1 + 1, ); let res = await contract_call( Accounts.WALLET_2, @@ -122,7 +122,7 @@ describe("call functions with nested traits", () => { [someCV(contractPrincipalCV(Accounts.WALLET_1.stxAddress, "empty"))], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); }); @@ -133,7 +133,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, @@ -141,7 +141,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -149,7 +149,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -157,7 +157,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 2 + 2, ); let res = await contract_call( Accounts.WALLET_3, @@ -167,7 +167,7 @@ describe("call functions with nested traits", () => { [someCV(contractPrincipalCV(Accounts.WALLET_2.stxAddress, "empty"))], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/call-nested-3-err.spec.ts b/tests/integration/clarity/traits/call-nested-3-err.spec.ts index 4332907..f7455ce 100644 --- a/tests/integration/clarity/traits/call-nested-3-err.spec.ts +++ b/tests/integration/clarity/traits/call-nested-3-err.spec.ts @@ -41,21 +41,21 @@ describe("call functions with nested traits", () => { "empty-trait", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "math-trait", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-3", 3, network, - orchestrator + orchestrator, ); let res = await contract_call( Accounts.WALLET_1, @@ -64,12 +64,12 @@ describe("call functions with nested traits", () => { "foo", [ responseErrorCV( - contractPrincipalCV(Accounts.DEPLOYER.stxAddress, "empty") + contractPrincipalCV(Accounts.DEPLOYER.stxAddress, "empty"), ), ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -82,7 +82,7 @@ describe("call functions with nested traits", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -92,7 +92,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, @@ -100,7 +100,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -108,7 +108,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -116,7 +116,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 1 + 1, ); let res = await contract_call( Accounts.WALLET_2, @@ -125,12 +125,12 @@ describe("call functions with nested traits", () => { "foo", [ responseErrorCV( - contractPrincipalCV(Accounts.WALLET_1.stxAddress, "empty") + contractPrincipalCV(Accounts.WALLET_1.stxAddress, "empty"), ), ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); }); @@ -141,7 +141,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, @@ -149,7 +149,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -157,7 +157,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -165,7 +165,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 2 + 2, ); let res = await contract_call( Accounts.WALLET_3, @@ -175,7 +175,7 @@ describe("call functions with nested traits", () => { [responseErrorCV(falseCV())], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/call-nested-3-ok.spec.ts b/tests/integration/clarity/traits/call-nested-3-ok.spec.ts index ab6a194..9a460e1 100644 --- a/tests/integration/clarity/traits/call-nested-3-ok.spec.ts +++ b/tests/integration/clarity/traits/call-nested-3-ok.spec.ts @@ -42,21 +42,21 @@ describe("call functions with nested traits", () => { "empty-trait", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "math-trait", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-3", 3, network, - orchestrator + orchestrator, ); let res = await contract_call( Accounts.WALLET_1, @@ -65,12 +65,12 @@ describe("call functions with nested traits", () => { "foo", [ responseOkCV( - contractPrincipalCV(Accounts.DEPLOYER.stxAddress, "empty") + contractPrincipalCV(Accounts.DEPLOYER.stxAddress, "empty"), ), ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -83,7 +83,7 @@ describe("call functions with nested traits", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -93,7 +93,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, @@ -101,7 +101,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -109,7 +109,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -117,7 +117,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 1 + 1, ); let res = await contract_call( Accounts.WALLET_2, @@ -126,12 +126,12 @@ describe("call functions with nested traits", () => { "foo", [ responseOkCV( - contractPrincipalCV(Accounts.WALLET_1.stxAddress, "empty") + contractPrincipalCV(Accounts.WALLET_1.stxAddress, "empty"), ), ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); }); @@ -142,7 +142,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, @@ -150,7 +150,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -158,7 +158,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -166,7 +166,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 2 + 2, ); let res = await contract_call( Accounts.WALLET_3, @@ -175,12 +175,12 @@ describe("call functions with nested traits", () => { "foo", [ responseOkCV( - contractPrincipalCV(Accounts.WALLET_2.stxAddress, "empty") + contractPrincipalCV(Accounts.WALLET_2.stxAddress, "empty"), ), ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/call-nested-4.spec.ts b/tests/integration/clarity/traits/call-nested-4.spec.ts index 8c68ec3..4e41a40 100644 --- a/tests/integration/clarity/traits/call-nested-4.spec.ts +++ b/tests/integration/clarity/traits/call-nested-4.spec.ts @@ -41,21 +41,21 @@ describe("call functions with nested traits", () => { "empty-trait", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "math-trait", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-4", 3, network, - orchestrator + orchestrator, ); let res = await contract_call( Accounts.WALLET_1, @@ -69,7 +69,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -82,7 +82,7 @@ describe("call functions with nested traits", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -92,7 +92,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, @@ -100,7 +100,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -108,7 +108,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -116,7 +116,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 1 + 1, ); let res = await contract_call( Accounts.WALLET_2, @@ -130,7 +130,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); }); @@ -141,7 +141,7 @@ describe("call functions with nested traits", () => { "empty", 0, // Reuse nonce 0 since previous tx was rejected network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, @@ -149,7 +149,7 @@ describe("call functions with nested traits", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -157,7 +157,7 @@ describe("call functions with nested traits", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -165,7 +165,7 @@ describe("call functions with nested traits", () => { 3, network, orchestrator, - 2 + 2, ); let res = await contract_call( Accounts.WALLET_3, @@ -179,7 +179,7 @@ describe("call functions with nested traits", () => { ], 0, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/circular.spec.ts b/tests/integration/clarity/traits/circular.spec.ts index 13ea5fd..8a3e6b8 100644 --- a/tests/integration/clarity/traits/circular.spec.ts +++ b/tests/integration/clarity/traits/circular.spec.ts @@ -86,10 +86,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-1`, ); expect(tx.success).toBeFalsy(); }); @@ -120,10 +120,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-2`, ); expect(tx.success).toBeFalsy(); }); @@ -133,7 +133,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -162,10 +162,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-1-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-1-2`, ); expect(tx.success).toBeFalsy(); }); @@ -195,10 +195,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-2-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.circular-trait-2-2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/double.spec.ts b/tests/integration/clarity/traits/double.spec.ts index 086190a..b27edb2 100644 --- a/tests/integration/clarity/traits/double.spec.ts +++ b/tests/integration/clarity/traits/double.spec.ts @@ -79,10 +79,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -92,7 +92,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -123,10 +123,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait-2`, ); expect(tx.success).toBeTruthy(); }); @@ -157,10 +157,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait-3` + `deployed: ${Accounts.DEPLOYER.stxAddress}.double-trait-3`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/empty.spec.ts b/tests/integration/clarity/traits/empty.spec.ts index 3ab8230..95dbd42 100644 --- a/tests/integration/clarity/traits/empty.spec.ts +++ b/tests/integration/clarity/traits/empty.spec.ts @@ -77,10 +77,10 @@ describe("empty trait", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -111,10 +111,10 @@ describe("empty trait", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-copy` + `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-copy`, ); expect(tx.success).toBeTruthy(); }); @@ -124,7 +124,7 @@ describe("empty trait", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -153,10 +153,10 @@ describe("empty trait", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-2`, ); expect(tx.success).toBeTruthy(); }); @@ -186,10 +186,10 @@ describe("empty trait", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-copy-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.empty-trait-copy-2`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/helper.ts b/tests/integration/clarity/traits/helper.ts index c1e4b10..555fc55 100644 --- a/tests/integration/clarity/traits/helper.ts +++ b/tests/integration/clarity/traits/helper.ts @@ -32,11 +32,11 @@ export const load_versioned = async ( network: StacksNetwork, orchestrator: DevnetNetworkOrchestrator, version?: number, - suffix?: string + suffix?: string, ): Promise> => { let codeBody = fs.readFileSync( `tests/integration/clarity/traits/contracts/${contractName}.clar`, - "utf8" + "utf8", ); // Build the transaction to deploy the contract @@ -66,7 +66,7 @@ export const load_versioned = async ( // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); if (!tx.success) { return { ok: false, error: Error(tx.description) }; @@ -83,7 +83,7 @@ export const contract_call = async ( functionArgs: ClarityValue[], nonce: number, network: StacksNetwork, - orchestrator: DevnetNetworkOrchestrator + orchestrator: DevnetNetworkOrchestrator, ): Promise> => { // Build a transaction to call the contract let callTxOptions: SignedContractCallOptions = { @@ -112,7 +112,7 @@ export const contract_call = async ( // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); if (!tx.success) { return { ok: false, error: Error(tx.description) }; diff --git a/tests/integration/clarity/traits/identical-double.spec.ts b/tests/integration/clarity/traits/identical-double.spec.ts index 3f48843..6721821 100644 --- a/tests/integration/clarity/traits/identical-double.spec.ts +++ b/tests/integration/clarity/traits/identical-double.spec.ts @@ -74,17 +74,17 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait`, ); expect(tx.success).toBeTruthy(); // Make sure we stayed in 2.05 let chainUpdate = await orchestrator.waitForNextStacksBlock(); expect(getBitcoinBlockHeight(chainUpdate)).toBeLessThanOrEqual( - STACKS_2_1_EPOCH + STACKS_2_1_EPOCH, ); }); @@ -92,7 +92,7 @@ describe("define a trait with duplicate identical methods", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -122,10 +122,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait-2`, ); expect(tx.success).toBeTruthy(); }); @@ -156,10 +156,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait-3` + `deployed: ${Accounts.DEPLOYER.stxAddress}.identical-double-trait-3`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/impl-double-1.spec.ts b/tests/integration/clarity/traits/impl-double-1.spec.ts index 387466b..32f0b5c 100644 --- a/tests/integration/clarity/traits/impl-double-1.spec.ts +++ b/tests/integration/clarity/traits/impl-double-1.spec.ts @@ -109,10 +109,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1`, ); expect(tx.success).toBeFalsy(); @@ -141,10 +141,10 @@ describe("use", () => { // Wait for the transaction to be processed [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2`, ); expect(tx.success).toBeTruthy(); }); @@ -154,7 +154,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -184,10 +184,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1-c1`, ); expect(tx.success).toBeFalsy(); @@ -216,10 +216,10 @@ describe("use", () => { // Wait for the transaction to be processed [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2-c1`, ); expect(tx.success).toBeTruthy(); }); @@ -250,10 +250,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-1-c2`, ); expect(tx.success).toBeFalsy(); @@ -282,10 +282,10 @@ describe("use", () => { // Wait for the transaction to be processed [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-2-c2`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/impl-double-both.spec.ts b/tests/integration/clarity/traits/impl-double-both.spec.ts index edfa65f..9eae704 100644 --- a/tests/integration/clarity/traits/impl-double-both.spec.ts +++ b/tests/integration/clarity/traits/impl-double-both.spec.ts @@ -117,7 +117,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -173,10 +173,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-both-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-both-2`, ); expect(tx.success).toBeFalsy(); }); @@ -207,10 +207,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-both-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-double-trait-both-2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/impl-identical-double.spec.ts b/tests/integration/clarity/traits/impl-identical-double.spec.ts index e2f9a25..b4fb47b 100644 --- a/tests/integration/clarity/traits/impl-identical-double.spec.ts +++ b/tests/integration/clarity/traits/impl-identical-double.spec.ts @@ -104,10 +104,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -117,7 +117,7 @@ describe("define a trait with duplicate identical methods", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -147,10 +147,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait-c1`, ); expect(tx.success).toBeTruthy(); }); @@ -181,10 +181,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-identical-double-trait-c2`, ); // expect(tx.success).toBeFalsy(); // todo(brice) Assertion is always false }); diff --git a/tests/integration/clarity/traits/impl.spec.ts b/tests/integration/clarity/traits/impl.spec.ts index dfa9581..40e9f8a 100644 --- a/tests/integration/clarity/traits/impl.spec.ts +++ b/tests/integration/clarity/traits/impl.spec.ts @@ -85,10 +85,10 @@ describe("impl", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.math-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.math-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -119,10 +119,10 @@ describe("impl", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-math-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-math-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -132,7 +132,7 @@ describe("impl", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -161,10 +161,10 @@ describe("impl", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-math-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.impl-math-trait-2`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/nested-traits.spec.ts b/tests/integration/clarity/traits/nested-traits.spec.ts index 6e95fb8..eac4443 100644 --- a/tests/integration/clarity/traits/nested-traits.spec.ts +++ b/tests/integration/clarity/traits/nested-traits.spec.ts @@ -39,35 +39,35 @@ describe("use redefined trait from contract that redefines it", () => { "empty-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-1", 1, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-2", 2, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "nested-trait-3", 3, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.DEPLOYER, "nested-trait-4", 4, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); @@ -80,7 +80,7 @@ describe("use redefined trait from contract that redefines it", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -91,7 +91,7 @@ describe("use redefined trait from contract that redefines it", () => { 0, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -99,7 +99,7 @@ describe("use redefined trait from contract that redefines it", () => { 1, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -107,7 +107,7 @@ describe("use redefined trait from contract that redefines it", () => { 2, network, orchestrator, - 1 + 1, ); await load_versioned( Accounts.WALLET_1, @@ -115,7 +115,7 @@ describe("use redefined trait from contract that redefines it", () => { 3, network, orchestrator, - 1 + 1, ); let res = await load_versioned( Accounts.WALLET_1, @@ -123,7 +123,7 @@ describe("use redefined trait from contract that redefines it", () => { 4, network, orchestrator, - 1 + 1, ); expect(res.ok).toBeTruthy(); }); @@ -135,7 +135,7 @@ describe("use redefined trait from contract that redefines it", () => { 0, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -143,7 +143,7 @@ describe("use redefined trait from contract that redefines it", () => { 1, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -151,7 +151,7 @@ describe("use redefined trait from contract that redefines it", () => { 2, network, orchestrator, - 2 + 2, ); await load_versioned( Accounts.WALLET_2, @@ -159,7 +159,7 @@ describe("use redefined trait from contract that redefines it", () => { 3, network, orchestrator, - 2 + 2, ); let res = await load_versioned( Accounts.WALLET_2, @@ -167,7 +167,7 @@ describe("use redefined trait from contract that redefines it", () => { 4, network, orchestrator, - 2 + 2, ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/no-response.spec.ts b/tests/integration/clarity/traits/no-response.spec.ts index 8043d90..63828b7 100644 --- a/tests/integration/clarity/traits/no-response.spec.ts +++ b/tests/integration/clarity/traits/no-response.spec.ts @@ -81,10 +81,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.no-response-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.no-response-trait`, ); expect(tx.success).toBeFalsy(); }); @@ -94,7 +94,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -123,10 +123,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.no-response-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.no-response-trait-2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/out-of-order.spec.ts b/tests/integration/clarity/traits/out-of-order.spec.ts index 74c543d..017fa4b 100644 --- a/tests/integration/clarity/traits/out-of-order.spec.ts +++ b/tests/integration/clarity/traits/out-of-order.spec.ts @@ -87,10 +87,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.out-of-order-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.out-of-order-trait`, ); // expect(tx.success).toBeFalsy(); // todo(brice) }); @@ -100,7 +100,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -129,10 +129,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.out-of-order-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.out-of-order-trait-2`, ); // expect(tx.success).toBeFalsy(); // todo(brice) }); diff --git a/tests/integration/clarity/traits/selfret.spec.ts b/tests/integration/clarity/traits/selfret.spec.ts index 00547a2..aa463d8 100644 --- a/tests/integration/clarity/traits/selfret.spec.ts +++ b/tests/integration/clarity/traits/selfret.spec.ts @@ -72,17 +72,17 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret` + `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret`, ); expect(tx.success).toBeFalsy(); // Make sure we stayed in 2.05 let chainUpdate = await orchestrator.waitForNextStacksBlock(); expect(getBitcoinBlockHeight(chainUpdate)).toBeLessThanOrEqual( - STACKS_2_1_EPOCH + STACKS_2_1_EPOCH, ); }); @@ -90,7 +90,7 @@ describe("define a trait with duplicate identical methods", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -120,10 +120,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret-2`, ); expect(tx.success).toBeFalsy(); }); @@ -154,10 +154,10 @@ describe("define a trait with duplicate identical methods", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret-3` + `deployed: ${Accounts.DEPLOYER.stxAddress}.selfret-3`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/undefined.spec.ts b/tests/integration/clarity/traits/undefined.spec.ts index db3f990..fb49523 100644 --- a/tests/integration/clarity/traits/undefined.spec.ts +++ b/tests/integration/clarity/traits/undefined.spec.ts @@ -82,10 +82,10 @@ describe("undefined trait", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.no-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.no-trait`, ); expect(tx.success).toBeFalsy(); }); @@ -95,7 +95,7 @@ describe("undefined trait", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -124,10 +124,10 @@ describe("undefined trait", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.no-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.no-trait-2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use-and-define.spec.ts b/tests/integration/clarity/traits/use-and-define.spec.ts index c6c33ea..8c86dda 100644 --- a/tests/integration/clarity/traits/use-and-define.spec.ts +++ b/tests/integration/clarity/traits/use-and-define.spec.ts @@ -36,7 +36,7 @@ describe("use and define trait with same name", () => { console.log(`network #${networkId}`); orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); network = new StacksTestnet({ url: orchestrator.getStacksNodeUrl() }); @@ -109,7 +109,7 @@ describe("use and define trait with same name", () => { await orchestrator.waitForStacksBlockIncludingTransaction(tx.txid()); let metadata = transaction.metadata; expect(metadata.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait`, ); expect(metadata.success).toBeFalsy(); @@ -121,7 +121,7 @@ describe("use and define trait with same name", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + 1 + timeline.epoch_2_1 + 1, ); }); @@ -154,7 +154,7 @@ describe("use and define trait with same name", () => { await orchestrator.waitForStacksBlockIncludingTransaction(tx.txid()); let metadata = transaction.metadata; expect(metadata.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait-c1`, ); expect(metadata.success).toBeFalsy(); }); @@ -188,7 +188,7 @@ describe("use and define trait with same name", () => { await orchestrator.waitForStacksBlockIncludingTransaction(tx.txid()); let metadata = transaction.metadata; expect(metadata.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-original-and-define-a-trait-c2`, ); expect(metadata.success).toBeTruthy(); }); @@ -243,7 +243,7 @@ describe("use and define trait with same name", () => { await orchestrator.waitForStacksBlockIncludingTransaction(tx.txid()); let metadata = transaction.metadata; expect(metadata.description).toBe( - `deployed: ${Accounts.WALLET_1.stxAddress}.use-original-and-define-a-trait` + `deployed: ${Accounts.WALLET_1.stxAddress}.use-original-and-define-a-trait`, ); expect(metadata.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/use-double.spec.ts b/tests/integration/clarity/traits/use-double.spec.ts index 6e3cdef..e15e798 100644 --- a/tests/integration/clarity/traits/use-double.spec.ts +++ b/tests/integration/clarity/traits/use-double.spec.ts @@ -135,10 +135,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait`, ); expect(tx.success).toBeFalsy(); }); @@ -148,7 +148,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -178,10 +178,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait-2-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait-2-c1`, ); expect(tx.success).toBeFalsy(); }); @@ -212,10 +212,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait-2-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-double-trait-2-c2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use-partial-double-1.spec.ts b/tests/integration/clarity/traits/use-partial-double-1.spec.ts index 20023d9..d3b8381 100644 --- a/tests/integration/clarity/traits/use-partial-double-1.spec.ts +++ b/tests/integration/clarity/traits/use-partial-double-1.spec.ts @@ -130,10 +130,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1`, ); expect(tx.success).toBeFalsy(); }); @@ -143,7 +143,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -173,10 +173,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1-c1`, ); expect(tx.success).toBeFalsy(); }); @@ -207,10 +207,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-1-c2`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use-partial-double-2.spec.ts b/tests/integration/clarity/traits/use-partial-double-2.spec.ts index 7e45f6e..7d24692 100644 --- a/tests/integration/clarity/traits/use-partial-double-2.spec.ts +++ b/tests/integration/clarity/traits/use-partial-double-2.spec.ts @@ -131,10 +131,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2`, ); expect(tx.success).toBeTruthy(); }); @@ -144,7 +144,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -174,10 +174,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2-c1`, ); expect(tx.success).toBeTruthy(); }); @@ -208,10 +208,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-partial-double-trait-2-c2`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/use-redefined-trait.spec.ts b/tests/integration/clarity/traits/use-redefined-trait.spec.ts index f8532bc..1418bba 100644 --- a/tests/integration/clarity/traits/use-redefined-trait.spec.ts +++ b/tests/integration/clarity/traits/use-redefined-trait.spec.ts @@ -39,21 +39,21 @@ describe("use redefined trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.DEPLOYER, "use-a-trait-transitive-redefined", 2, network, - orchestrator + orchestrator, ); expect(res.ok).toBeTruthy(); @@ -66,7 +66,7 @@ describe("use redefined trait from contract that redefines it", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -77,14 +77,14 @@ describe("use redefined trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.WALLET_1, @@ -93,7 +93,7 @@ describe("use redefined trait from contract that redefines it", () => { network, orchestrator, 1, - "1" + "1", ); expect(res.ok).toBeTruthy(); }); @@ -104,14 +104,14 @@ describe("use redefined trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.WALLET_2, @@ -120,7 +120,7 @@ describe("use redefined trait from contract that redefines it", () => { network, orchestrator, 2, - "2" + "2", ); expect(res.ok).toBeTruthy(); }); diff --git a/tests/integration/clarity/traits/use-transitive-alias.spec.ts b/tests/integration/clarity/traits/use-transitive-alias.spec.ts index 97f7d4d..1660b4b 100644 --- a/tests/integration/clarity/traits/use-transitive-alias.spec.ts +++ b/tests/integration/clarity/traits/use-transitive-alias.spec.ts @@ -135,17 +135,17 @@ describe("use transitive trait alias", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias`, ); expect(tx.success).toBeFalsy(); // Make sure we stayed in 2.05 let chainUpdate = await orchestrator.waitForNextStacksBlock(); expect(getBitcoinBlockHeight(chainUpdate)).toBeLessThanOrEqual( - STACKS_2_1_EPOCH + STACKS_2_1_EPOCH, ); }); @@ -153,7 +153,7 @@ describe("use transitive trait alias", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -183,10 +183,10 @@ describe("use transitive trait alias", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias-c1`, ); expect(tx.success).toBeFalsy(); }); @@ -218,10 +218,10 @@ describe("use transitive trait alias", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-alias-c2`, ); expect(tx.success).toBeFalsy(); }); @@ -296,10 +296,10 @@ describe("use transitive trait alias", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.WALLET_1.stxAddress}.use-math-trait-transitive-alias` + `deployed: ${Accounts.WALLET_1.stxAddress}.use-math-trait-transitive-alias`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use-transitive-name.spec.ts b/tests/integration/clarity/traits/use-transitive-name.spec.ts index ff18328..b3085e4 100644 --- a/tests/integration/clarity/traits/use-transitive-name.spec.ts +++ b/tests/integration/clarity/traits/use-transitive-name.spec.ts @@ -132,17 +132,17 @@ describe("use transitive trait name", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name`, ); expect(tx.success).toBeTruthy(); // Make sure we stayed in 2.05 let chainUpdate = await orchestrator.waitForNextStacksBlock(); expect(getBitcoinBlockHeight(chainUpdate)).toBeLessThanOrEqual( - STACKS_2_1_EPOCH + STACKS_2_1_EPOCH, ); }); @@ -150,7 +150,7 @@ describe("use transitive trait name", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -181,10 +181,10 @@ describe("use transitive trait name", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name-c1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name-c1`, ); expect(tx.success).toBeTruthy(); }); @@ -216,10 +216,10 @@ describe("use transitive trait name", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name-c2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-transitive-name-c2`, ); expect(tx.success).toBeTruthy(); }); @@ -291,10 +291,10 @@ describe("use transitive trait name", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.WALLET_1.stxAddress}.use-math-trait-transitive-name` + `deployed: ${Accounts.WALLET_1.stxAddress}.use-math-trait-transitive-name`, ); expect(tx.success).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use-transitive-original.spec.ts b/tests/integration/clarity/traits/use-transitive-original.spec.ts index 3c22969..69d373b 100644 --- a/tests/integration/clarity/traits/use-transitive-original.spec.ts +++ b/tests/integration/clarity/traits/use-transitive-original.spec.ts @@ -39,21 +39,21 @@ describe("use trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.DEPLOYER, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.DEPLOYER, "use-a-trait-transitive-original", 2, network, - orchestrator + orchestrator, ); expect(res.ok).toBeFalsy(); @@ -66,7 +66,7 @@ describe("use trait from contract that redefines it", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -77,14 +77,14 @@ describe("use trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_1, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.WALLET_1, @@ -93,7 +93,7 @@ describe("use trait from contract that redefines it", () => { network, orchestrator, 1, - "1" + "1", ); expect(res.ok).toBeFalsy(); }); @@ -104,14 +104,14 @@ describe("use trait from contract that redefines it", () => { "a-trait", 0, network, - orchestrator + orchestrator, ); await load_versioned( Accounts.WALLET_2, "use-and-define-a-trait", 1, network, - orchestrator + orchestrator, ); let res = await load_versioned( Accounts.WALLET_2, @@ -120,7 +120,7 @@ describe("use trait from contract that redefines it", () => { network, orchestrator, 2, - "2" + "2", ); expect(res.ok).toBeFalsy(); }); diff --git a/tests/integration/clarity/traits/use.spec.ts b/tests/integration/clarity/traits/use.spec.ts index 60b2bc8..d0ea54c 100644 --- a/tests/integration/clarity/traits/use.spec.ts +++ b/tests/integration/clarity/traits/use.spec.ts @@ -90,10 +90,10 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.math-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.math-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -126,13 +126,13 @@ describe("use", () => { // Wait for the transaction to be processed let [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(block.bitcoin_anchor_block_identifier.index).toBeLessThan( - STACKS_2_1_EPOCH + STACKS_2_1_EPOCH, ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait`, ); expect(tx.success).toBeTruthy(); }); @@ -142,7 +142,7 @@ describe("use", () => { beforeAll(async () => { // Wait for 2.1 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - STACKS_2_1_EPOCH + 1 + STACKS_2_1_EPOCH + 1, ); }); @@ -173,10 +173,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-2-clarity-1` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-2-clarity-1`, ); expect(tx.success).toBeTruthy(); }); @@ -207,10 +207,10 @@ describe("use", () => { // Wait for the transaction to be processed let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-2-clarity-2` + `deployed: ${Accounts.DEPLOYER.stxAddress}.use-math-trait-2-clarity-2`, ); expect(tx.success).toBeTruthy(); }); diff --git a/tests/integration/consensus/transaction-fee.spec.ts b/tests/integration/consensus/transaction-fee.spec.ts index b5f3345..bc7ca7d 100644 --- a/tests/integration/consensus/transaction-fee.spec.ts +++ b/tests/integration/consensus/transaction-fee.spec.ts @@ -62,39 +62,39 @@ describe("transaction-fee", () => { // Wait for Stacks 2.1 to start await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_1 + Constants.DEVNET_DEFAULT_EPOCH_2_1, ); let deploy = deployContract(orchestrator, network); let tx_foo = await deploy("foo", CONTRACT_TRAIT, 0); expect(tx_foo.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.foo` + `deployed: ${Accounts.DEPLOYER.stxAddress}.foo`, ); expect(tx_foo.success).toBeTruthy(); let tx_foo_impl = await deploy("foo-impl", CONTRACT_IMPL_TRAIT, 1); expect(tx_foo_impl.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.foo-impl` + `deployed: ${Accounts.DEPLOYER.stxAddress}.foo-impl`, ); expect(tx_foo_impl.success).toBeTruthy(); let tx_foo_test = await deploy("foo-test", CONTRACT_TRIGGER_CHECKERROR, 2); expect(tx_foo_test.description).toBe( - `deployed: ${Accounts.DEPLOYER.stxAddress}.foo-test` + `deployed: ${Accounts.DEPLOYER.stxAddress}.foo-test`, ); expect(tx_foo_test.success).toBeTruthy(); let { balance: balanceBeforeFunctionCall } = await getAccount( network, - Accounts.DEPLOYER.stxAddress + Accounts.DEPLOYER.stxAddress, ); let contractPrincipalArg = contractPrincipalCV( Accounts.DEPLOYER.stxAddress, - "foo-impl" + "foo-impl", ); let call = callFunction(orchestrator, network); @@ -105,7 +105,7 @@ describe("transaction-fee", () => { "foo-test", "test", [contractPrincipalArg], - 4 + 4, ); expect(tx_function_call_1.success).toBeTruthy(); @@ -118,20 +118,20 @@ describe("transaction-fee", () => { network, Accounts.DEPLOYER.stxAddress, expectedBalanceAfterFunctionCall, - 0 + 0, ); }); }); function callFunction( orchestrator: DevnetNetworkOrchestrator, - network: StacksNetwork + network: StacksNetwork, ) { return async ( contractName: string, functionName: string, functionArgs: ClarityValue[], - nonce: number + nonce: number, ) => { let deployTxOptions = { senderKey: Accounts.DEPLOYER.secretKey, @@ -155,7 +155,7 @@ function callFunction( // Wait for the transaction to be processed let [_, transaction] = await waitForStacksTransaction( orchestrator, - tx.txid() + tx.txid(), ); return transaction; }; @@ -163,7 +163,7 @@ function callFunction( function deployContract( orchestrator: DevnetNetworkOrchestrator, - network: StacksNetwork + network: StacksNetwork, ) { return async (contractName: string, codeBody: string, nonce: number) => { let deployTxOptions = { @@ -187,7 +187,7 @@ function deployContract( // Wait for the transaction to be processed let [_, transaction] = await waitForStacksTransaction( orchestrator, - tx.txid() + tx.txid(), ); return transaction; }; diff --git a/tests/integration/epoch-2-2/wrap-trait-workaround.spec.ts b/tests/integration/epoch-2-2/wrap-trait-workaround.spec.ts index ae26e69..c144ef6 100644 --- a/tests/integration/epoch-2-2/wrap-trait-workaround.spec.ts +++ b/tests/integration/epoch-2-2/wrap-trait-workaround.spec.ts @@ -58,7 +58,7 @@ describe("trait parameter with wrapped caller in Stacks 2.2", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -78,7 +78,7 @@ describe("trait parameter with wrapped caller in Stacks 2.2", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); @@ -87,19 +87,19 @@ describe("trait parameter with wrapped caller in Stacks 2.2", () => { Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); let [block, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); await orchestrator.waitForNextStacksBlock(); // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); // Deploy a wrapper contract @@ -108,12 +108,12 @@ describe("trait parameter with wrapped caller in Stacks 2.2", () => { Accounts.DEPLOYER, 2, "test-trait-wrapper", - codeBodyTestTraitWrapper + codeBodyTestTraitWrapper, )); expect(response.error).toBeUndefined(); [block, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); // Call the public function @@ -136,7 +136,7 @@ describe("trait parameter with wrapped caller in Stacks 2.2", () => { response = await broadcastTransaction(transaction, network); [block, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(err none)"); }); diff --git a/tests/integration/epoch-2-2/wrap-trait-workaround2.spec.ts b/tests/integration/epoch-2-2/wrap-trait-workaround2.spec.ts index a5129ca..6b7e131 100644 --- a/tests/integration/epoch-2-2/wrap-trait-workaround2.spec.ts +++ b/tests/integration/epoch-2-2/wrap-trait-workaround2.spec.ts @@ -48,7 +48,7 @@ describe("trait parameter with wrapped implementation in Stacks 2.2", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -68,7 +68,7 @@ describe("trait parameter with wrapped implementation in Stacks 2.2", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); @@ -77,19 +77,19 @@ describe("trait parameter with wrapped implementation in Stacks 2.2", () => { Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); let [block, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); await orchestrator.waitForNextStacksBlock(); // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); // Deploy a wrapper contract @@ -98,12 +98,12 @@ describe("trait parameter with wrapped implementation in Stacks 2.2", () => { Accounts.DEPLOYER, 2, "impl-trait-wrapper", - codeBodyImplTraitWrapper + codeBodyImplTraitWrapper, )); expect(response.error).toBeUndefined(); [block, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); // Call the public function diff --git a/tests/integration/epoch-2-2/wrap-trait-workaround3.spec.ts b/tests/integration/epoch-2-2/wrap-trait-workaround3.spec.ts index b0d90ff..86b7ebf 100644 --- a/tests/integration/epoch-2-2/wrap-trait-workaround3.spec.ts +++ b/tests/integration/epoch-2-2/wrap-trait-workaround3.spec.ts @@ -52,7 +52,7 @@ describe("concrete trait parameter used in a wrapper", () => { const callReadOnlyTestTraitWrapperCallFo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait-wrapper", @@ -68,7 +68,7 @@ describe("concrete trait parameter used in a wrapper", () => { network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -90,7 +90,7 @@ describe("concrete trait parameter used in a wrapper", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -109,7 +109,7 @@ describe("concrete trait parameter used in a wrapper", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -119,7 +119,7 @@ describe("concrete trait parameter used in a wrapper", () => { Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -130,7 +130,7 @@ describe("concrete trait parameter used in a wrapper", () => { // Wait for the 2.2 activation, then check // await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); ({ response, transaction } = await deployContract( @@ -138,7 +138,7 @@ describe("concrete trait parameter used in a wrapper", () => { Accounts.DEPLOYER, 2, "test-trait-wrapper", - codeBodyTestTraitWrapper + codeBodyTestTraitWrapper, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -150,12 +150,12 @@ describe("concrete trait parameter used in a wrapper", () => { network, Accounts.WALLET_1, 0, - { a: 3 } + { a: 3 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(err none)"); }); @@ -166,7 +166,7 @@ describe("concrete trait parameter used in a wrapper", () => { // Wait for the 2.3 activation, then check again // await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the public function @@ -174,12 +174,12 @@ describe("concrete trait parameter used in a wrapper", () => { network, Accounts.WALLET_1, 1, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/helpers.ts b/tests/integration/helpers.ts index ffa27a8..0bf551e 100644 --- a/tests/integration/helpers.ts +++ b/tests/integration/helpers.ts @@ -99,7 +99,7 @@ export function buildDevnetNetworkOrchestrator( networkId: number, timeline: EpochTimeline = DEFAULT_EPOCH_TIMELINE, logs = false, - stacks_node_image_url?: string + stacks_node_image_url?: string, ) { let uuid = Date.now(); let working_dir = `/tmp/stacks-test-${uuid}-${networkId}`; @@ -132,14 +132,14 @@ export function buildDevnetNetworkOrchestrator( }; let consolidatedConfig = getIsolatedNetworkConfigUsingNetworkId( networkId, - config + config, ); let orchestrator = new DevnetNetworkOrchestrator(consolidatedConfig, 2500); return orchestrator; } export const getBitcoinBlockHeight = ( - chainUpdate: StacksChainUpdate + chainUpdate: StacksChainUpdate, ): number => { let metadata = chainUpdate.new_blocks[0].block .metadata! as StacksBlockMetadata; @@ -148,7 +148,7 @@ export const getBitcoinBlockHeight = ( export const waitForStacksTransaction = async ( orchestrator: DevnetNetworkOrchestrator, - txid: string + txid: string, ): Promise<[StacksBlockMetadata, StacksTransactionMetadata]> => { let { chainUpdate, transaction } = await orchestrator.waitForStacksBlockIncludingTransaction(txid); @@ -162,8 +162,8 @@ export const getNetworkIdFromEnv = (): number => { let networkId = process.env.JEST_WORKER_ID ? parseInt(process.env.JEST_WORKER_ID!) : process.env.VITEST_WORKER_ID - ? parseInt(process.env.VITEST_WORKER_ID!) - : 1; + ? parseInt(process.env.VITEST_WORKER_ID!) + : 1; return networkId; }; @@ -183,7 +183,7 @@ const delay = () => new Promise((resolve) => setTimeout(resolve, 2000)); export const getChainInfo = async ( network: StacksNetwork, - retry?: number + retry?: number, ): Promise => { let retryCountdown = retry ? retry : 20; if (retryCountdown == 0) return Promise.reject(); @@ -206,7 +206,7 @@ export interface AccountInfo { export async function asyncExpectStacksTransactionSuccess( orchestrator: DevnetNetworkOrchestrator, - txid: string + txid: string, ) { let [block, tx] = await waitForStacksTransaction(orchestrator, txid); expect(tx.success, tx.result).toBeTruthy(); @@ -228,7 +228,7 @@ export interface BroadcastOptions { export const broadcastSTXTransfer = async ( { network, account, fee, nonce }: BroadcastOptions, - { recipient, amount }: { recipient: string; amount: number } + { recipient, amount }: { recipient: string; amount: number }, ): Promise => { const txOptions = { recipient, @@ -251,7 +251,7 @@ export async function deployContract( sender: Account, nonce: number, contractName: string, - codeBody: string + codeBody: string, ) { // Build the transaction to deploy the contract let deployTxOptions = { diff --git a/tests/integration/pox/helpers-direct-stacking.ts b/tests/integration/pox/helpers-direct-stacking.ts index 2e1cace..da2e90d 100644 --- a/tests/integration/pox/helpers-direct-stacking.ts +++ b/tests/integration/pox/helpers-direct-stacking.ts @@ -19,7 +19,7 @@ export const broadcastStackSTX = async ( amount, blockHeight, cycles, - }: { amount: number; blockHeight: number; cycles: number } + }: { amount: number; blockHeight: number; cycles: number }, ): Promise => { const { version, data } = decodeBtcAddress(account.btcAddress); const address = { @@ -53,7 +53,7 @@ export const broadcastStackSTX = async ( export const broadcastStackIncrease = async ( { poxVersion, network, account, fee, nonce }: BroadcastOptionsPox, - { amount }: { amount: number } + { amount }: { amount: number }, ): Promise => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; const txOptions = { @@ -76,7 +76,7 @@ export const broadcastStackIncrease = async ( export const broadcastStackExtend = async ( { poxVersion, network, account, fee, nonce }: BroadcastOptionsPox, - { cycles }: { cycles: number } + { cycles }: { cycles: number }, ): Promise => { const { version, data } = decodeBtcAddress(account.btcAddress); const address = { diff --git a/tests/integration/pox/helpers-pooled-stacking.ts b/tests/integration/pox/helpers-pooled-stacking.ts index dba798f..c011b7a 100644 --- a/tests/integration/pox/helpers-pooled-stacking.ts +++ b/tests/integration/pox/helpers-pooled-stacking.ts @@ -28,7 +28,7 @@ export const broadcastDelegateSTX = async ( poolAddress: Account; poolRewardAccount?: Account; untilBurnHeight?: number; - } + }, ): Promise => { let poxAddressCV; if (poolRewardAccount) { @@ -110,7 +110,7 @@ export const broadcastDelegateStackSTX = async ( poolRewardAccount: Account; startBurnHeight: number; lockPeriodCycles: number; - } + }, ): Promise => { const { version, data } = decodeBtcAddress(poolRewardAccount.btcAddress); const poxAddress = { @@ -149,7 +149,7 @@ export const broadcastDelegateStackExtend = async ( stacker, poolRewardAccount, extendByCount, - }: { stacker: Account; poolRewardAccount: Account; extendByCount: number } + }: { stacker: Account; poolRewardAccount: Account; extendByCount: number }, ): Promise => { const { version, data } = decodeBtcAddress(poolRewardAccount.btcAddress); const poxAddress = { @@ -190,7 +190,7 @@ export const broadcastDelegateStackIncrease = async ( stacker: Account; poolRewardAccount: Account; increaseByAmountUstx: number; - } + }, ): Promise => { const { version, data } = decodeBtcAddress(poolRewardAccount.btcAddress); const poxAddress = { @@ -238,7 +238,7 @@ export const broadcastStackAggregationCommitIndexed = async ( { poolRewardAccount, cycleId, - }: { poolRewardAccount: Account; cycleId: number } + }: { poolRewardAccount: Account; cycleId: number }, ): Promise => { const { version, data } = decodeBtcAddress(poolRewardAccount.btcAddress); const poxAddress = { @@ -274,7 +274,7 @@ export const broadcastStackAggregationIncrease = async ( poolRewardAccount, cycleId, rewardIndex, - }: { poolRewardAccount: Account; cycleId: number; rewardIndex: number } + }: { poolRewardAccount: Account; cycleId: number; rewardIndex: number }, ): Promise => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; const { version, data } = decodeBtcAddress(poolRewardAccount.btcAddress); diff --git a/tests/integration/pox/helpers.ts b/tests/integration/pox/helpers.ts index d821543..ce8ecc9 100644 --- a/tests/integration/pox/helpers.ts +++ b/tests/integration/pox/helpers.ts @@ -48,7 +48,7 @@ const delay = () => new Promise((resolve) => setTimeout(resolve, 3000)); export const getCoreInfo = async ( network: StacksNetwork, - retry?: number + retry?: number, ): Promise< CoreInfo & { stacks_tip_height: number; @@ -70,7 +70,7 @@ export const getCoreInfo = async ( export const getPoxInfo = async ( network: StacksNetwork, - retry?: number + retry?: number, ): Promise< PoxInfo & { total_liquid_supply_ustx: number; @@ -92,7 +92,7 @@ export const getPoxInfo = async ( export const getAccount = async ( network: StacksNetwork, address: string, - retry?: number + retry?: number, ): Promise => { let retryCountdown = retry ? retry : 20; if (retryCountdown == 0) return Promise.reject(); @@ -113,7 +113,7 @@ export const getAccount = async ( export const getBitcoinHeightOfNextRewardPhase = async ( network: StacksNetwork, - retry?: number + retry?: number, ): Promise => { let response = await getPoxInfo(network, retry); return response.next_cycle.reward_phase_start_block_height; @@ -121,7 +121,7 @@ export const getBitcoinHeightOfNextRewardPhase = async ( export const getBitcoinHeightOfNextPreparePhase = async ( network: StacksNetwork, - retry?: number + retry?: number, ): Promise => { let response = await getPoxInfo(network, retry); return response.next_cycle.prepare_phase_start_block_height; @@ -130,14 +130,14 @@ export const getBitcoinHeightOfNextPreparePhase = async ( export const waitForNextPreparePhase = async ( network: StacksNetwork, orchestrator: DevnetNetworkOrchestrator, - offset?: number + offset?: number, ): Promise => { var height = await getBitcoinHeightOfNextPreparePhase(network); if (offset) { height = height + offset; } return await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - height + height, ); }; @@ -145,7 +145,7 @@ export const waitForRewardCycleId = async ( network: StacksNetwork, orchestrator: DevnetNetworkOrchestrator, id: number, - offset?: number + offset?: number, ): Promise => { let response = await getPoxInfo(network); let height = @@ -154,21 +154,21 @@ export const waitForRewardCycleId = async ( height = height + offset; } return await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - height + height, ); }; export const waitForNextRewardPhase = async ( network: StacksNetwork, orchestrator: DevnetNetworkOrchestrator, - offset?: number + offset?: number, ): Promise => { var height = await getBitcoinHeightOfNextRewardPhase(network); if (offset) { height = height + offset; } return await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - height + height, ); }; @@ -186,7 +186,7 @@ export const expectAccountToBe = async ( network: StacksNetwork, address: string, account: number, - locked: number + locked: number, ) => { const wallet = await getAccount(network, address); expect(wallet.balance).toBe(BigInt(account)); @@ -196,7 +196,7 @@ export const expectAccountToBe = async ( export const callReadOnlystackerInfo = ( network: StacksNetwork, poxVersion: number, - user: Account + user: Account, ) => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; return callReadOnlyFunction({ @@ -216,7 +216,7 @@ export const expectNoError = (response: TxBroadcastResult) => { " " + response.reason + " " + - JSON.stringify(response.reason_data) + JSON.stringify(response.reason_data), ).toBeUndefined(); }; @@ -228,13 +228,13 @@ export const errorToCV = (e: Error) => { export const readRewardCyclePoxAddressList = async ( network: StacksNetwork, poxVersion: number, - cycleId: number + cycleId: number, ) => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; const url = network.getMapEntryUrl( poxContract.address, poxContract.name, - "reward-cycle-pox-address-list-len" + "reward-cycle-pox-address-list-len", ); const cycleIdValue = uintCV(cycleId); const keyValue = tupleCV({ @@ -250,7 +250,7 @@ export const readRewardCyclePoxAddressList = async ( if (!response.ok) { const msg = await response.text().catch(() => ""); throw new Error( - `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"` + `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"`, ); } let lengthJson = await response.json(); @@ -267,7 +267,7 @@ export const readRewardCyclePoxAddressList = async ( network, poxVersion, cycleId, - i + i, )) as Record; poxAddrInfoList.push(poxAddressInfo); } @@ -278,16 +278,16 @@ export const readRewardCyclePoxAddressList = async ( export const readStackingStateForAddress = async ( network: StacksNetwork, poxVersion: number, - address: string + address: string, ) => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; const url = network.getMapEntryUrl( poxContract.address, poxContract.name, - "stacking-state" + "stacking-state", ); const keyValue = tupleCV({ - "stacker": principalCV(address), + stacker: principalCV(address), }); const response = await network.fetchFn(url, { method: "POST", @@ -299,7 +299,7 @@ export const readStackingStateForAddress = async ( if (!response.ok) { const msg = await response.text().catch(() => ""); throw new Error( - `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"` + `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"`, ); } let json = await response.json(); @@ -310,7 +310,7 @@ export const readRewardCyclePoxAddressForAddress = async ( network: StacksNetwork, poxVersion: number, cycleId: number, - address: string + address: string, ) => { // TODO: There might be a better way to do this using the `stacking-state` // map to get the index @@ -318,7 +318,7 @@ export const readRewardCyclePoxAddressForAddress = async ( const url = network.getMapEntryUrl( poxContract.address, poxContract.name, - "reward-cycle-pox-address-list-len" + "reward-cycle-pox-address-list-len", ); const cycleIdValue = uintCV(cycleId); const keyValue = tupleCV({ @@ -334,7 +334,7 @@ export const readRewardCyclePoxAddressForAddress = async ( if (!response.ok) { const msg = await response.text().catch(() => ""); throw new Error( - `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"` + `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"`, ); } let lengthJson = await response.json(); @@ -350,7 +350,7 @@ export const readRewardCyclePoxAddressForAddress = async ( network, poxVersion, cycleId, - i + i, ); if (poxAddressInfo?.["stacker"]?.type === ClarityType.OptionalNone) { continue; @@ -375,13 +375,13 @@ export const readRewardCyclePoxAddressListAtIndex = async ( network: StacksNetwork, poxVersion: number, cycleId: number, - index: number + index: number, ): Promise => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; const url = network.getMapEntryUrl( poxContract.address, poxContract.name, - "reward-cycle-pox-address-list" + "reward-cycle-pox-address-list", ); const cycleIdValue = uintCV(cycleId); const indexValue = uintCV(index); @@ -399,7 +399,7 @@ export const readRewardCyclePoxAddressListAtIndex = async ( if (!response.ok) { const msg = await response.text().catch(() => ""); throw new Error( - `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"` + `Error calling read-only function. Response ${response.status}: ${response.statusText}. Attempted to fetch ${url} and failed with the message: "${msg}"`, ); } let poxAddrInfoJson = await response.json(); @@ -443,7 +443,7 @@ export const callReadOnlyIsPoxActive = ( poxVersion: number, network: StacksNetwork, account: Account, - rewardCycle: number + rewardCycle: number, ) => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; return callReadOnlyFunction({ @@ -460,7 +460,7 @@ export const getTotalPoxRejection = ( poxVersion: number, network: StacksNetwork, account: Account, - rewardCycle: number + rewardCycle: number, ) => { let poxContract = Contracts.POX[poxVersion] || Contracts.DEFAULT; return callReadOnlyFunction({ diff --git a/tests/integration/pox/pox-3/direct-and-pooled.spec.ts b/tests/integration/pox/pox-3/direct-and-pooled.spec.ts index 3c33c59..3644dd2 100644 --- a/tests/integration/pox/pox-3/direct-and-pooled.spec.ts +++ b/tests/integration/pox/pox-3/direct-and-pooled.spec.ts @@ -41,7 +41,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -55,7 +55,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); // Wait for the next reward phase (#2) @@ -74,7 +74,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { fee, nonce: aliceNonce++, }, - { amount: 75_000_000_000_000, blockHeight, cycles } + { amount: 75_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); const stackTxid = response.txid; @@ -88,7 +88,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { fee, nonce: aliceNonce++, }, - { amount: 100_000_000_000_000, poolAddress: Accounts.WALLET_2 } + { amount: 100_000_000_000_000, poolAddress: Accounts.WALLET_2 }, ); expect(response.error).toBeUndefined(); const delegateTxid = response.txid; @@ -108,7 +108,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { poolRewardAccount: Accounts.WALLET_2, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); const delegateStackTxid = response.txid; @@ -122,7 +122,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { fee: fee, nonce: bobNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 }, ); expect(response.error).toBeUndefined(); const commitTxid = response.txid; @@ -169,7 +169,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 3, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(75_000_000_000_000)); }); @@ -187,7 +187,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { fee, nonce: faucetNonce++, }, - { amount: 900_000_000_000_000, blockHeight, cycles } + { amount: 900_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -199,7 +199,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { let poxInfo = await getPoxInfo(network); expect(poxInfo.current_cycle.id).toBe(2); expect(poxInfo.current_burnchain_block_height).toBeLessThan( - poxInfo.next_cycle.prepare_phase_start_block_height + poxInfo.next_cycle.prepare_phase_start_block_height, ); expect(poxInfo.current_cycle.min_threshold_ustx).toBe(29_290_000_000_000); expect(poxInfo.next_cycle.stacked_ustx).toBe(975_000_000_000_000); @@ -235,7 +235,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 3, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -244,7 +244,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 3, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(900_000_000_000_000)); @@ -253,7 +253,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 4, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -268,7 +268,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); }); @@ -287,7 +287,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { fee, nonce: chloeNonce++, }, - { amount: 90_000_000_000_000, blockHeight, cycles } + { amount: 90_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -295,7 +295,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { let poxInfo = await getPoxInfo(network); expect(poxInfo.current_cycle.id).toBe(3); expect(poxInfo.current_burnchain_block_height).toBeLessThan( - poxInfo.next_cycle.prepare_phase_start_block_height + poxInfo.next_cycle.prepare_phase_start_block_height, ); expect(poxInfo.next_cycle.stacked_ustx).toBe(90_000_000_000_000); }); @@ -324,7 +324,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 4, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -333,7 +333,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, 3, 4, - Accounts.WALLET_3.stxAddress + Accounts.WALLET_3.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -342,7 +342,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Chloe's STX are locked @@ -350,7 +350,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, Accounts.WALLET_3.stxAddress, 10_000_000_000_000 - chloeNonce * fee, - 90_000_000_000_000 + 90_000_000_000_000, ); // Faucet's STX are still unlocked @@ -358,7 +358,7 @@ describe("testing mixed direct and pooled stacking in pox-3", () => { network, Accounts.FAUCET.stxAddress, 1_000_000_000_000_000 - faucetNonce * fee, - 0 + 0, ); }); }); diff --git a/tests/integration/pox/pox-3/direct-stacking-auto-unlock.spec.ts b/tests/integration/pox/pox-3/direct-stacking-auto-unlock.spec.ts index bd012ae..70f6781 100644 --- a/tests/integration/pox/pox-3/direct-stacking-auto-unlock.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-auto-unlock.spec.ts @@ -29,7 +29,7 @@ describe("testing solo stacker below minimum", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -43,7 +43,7 @@ describe("testing solo stacker below minimum", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -60,12 +60,12 @@ describe("testing solo stacker below minimum", () => { fee, nonce: aliceNonce++, }, - { amount: 80_000_000_000_000, blockHeight, cycles } + { amount: 80_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -78,7 +78,7 @@ describe("testing solo stacker below minimum", () => { fee, nonce: faucetNonce++, }, - { amount: 999_000_000_000_000, blockHeight, cycles } + { amount: 999_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -96,7 +96,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - fee, - 80_000_000_000_000 + 80_000_000_000_000, ); // Check Alice's table entry @@ -104,7 +104,7 @@ describe("testing solo stacker below minimum", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -113,7 +113,7 @@ describe("testing solo stacker below minimum", () => { network, 3, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); @@ -132,7 +132,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - fee, - 0 + 0, ); // Table entries for cycle #2 is cleared for auto-unlocked stackers. @@ -141,7 +141,7 @@ describe("testing solo stacker below minimum", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -150,7 +150,7 @@ describe("testing solo stacker below minimum", () => { network, 3, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); diff --git a/tests/integration/pox/pox-3/direct-stacking-bad-order.spec.ts b/tests/integration/pox/pox-3/direct-stacking-bad-order.spec.ts index 6f771aa..2502627 100644 --- a/tests/integration/pox/pox-3/direct-stacking-bad-order.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-bad-order.spec.ts @@ -25,7 +25,7 @@ describe("testing solo stacker increase without bug", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -41,7 +41,7 @@ describe("testing solo stacker increase without bug", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -58,12 +58,12 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 30_000_000_000_010, blockHeight, cycles } + { amount: 30_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -76,7 +76,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: aliceNonce++, }, - { amount: 50_000_000_000_001, blockHeight, cycles } + { amount: 50_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -91,7 +91,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 20000000000100 } + { amount: 20000000000100 }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -112,7 +112,7 @@ describe("testing solo stacker increase without bug", () => { network, 3, 2, - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, )) as Record; expect(cvToString(poxAddrInfo0["total-ustx"])).toBe("u50000000000110"); @@ -122,7 +122,7 @@ describe("testing solo stacker increase without bug", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, )) as Record; expect(poxAddrInfo1["total-ustx"]).toEqual(uintCV(50_000_000_000_001)); }); diff --git a/tests/integration/pox/pox-3/direct-stacking-extend.spec.ts b/tests/integration/pox/pox-3/direct-stacking-extend.spec.ts index 6435db0..36667e0 100644 --- a/tests/integration/pox/pox-3/direct-stacking-extend.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-extend.spec.ts @@ -28,7 +28,7 @@ describe("testing stack-extend functionality", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -42,7 +42,7 @@ describe("testing stack-extend functionality", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -62,13 +62,13 @@ describe("testing stack-extend functionality", () => { amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking transaction to confirm let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -81,7 +81,7 @@ describe("testing stack-extend functionality", () => { fee, nonce: aliceNonce++, }, - { cycles: 2 } + { cycles: 2 }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking extension transaction to confirm @@ -99,7 +99,7 @@ describe("testing stack-extend functionality", () => { network, 3, cycle + 1, // cycle + 1 because we are checking the next cycle, including rewards - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, )) as Record; expect(poxAddrInfo?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); diff --git a/tests/integration/pox/pox-3/direct-stacking-good-order.spec.ts b/tests/integration/pox/pox-3/direct-stacking-good-order.spec.ts index f52a8d3..a4aa095 100644 --- a/tests/integration/pox/pox-3/direct-stacking-good-order.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-good-order.spec.ts @@ -25,7 +25,7 @@ describe("testing solo stacker increase without bug", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -41,7 +41,7 @@ describe("testing solo stacker increase without bug", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -58,7 +58,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 30_000_000_000_010, blockHeight, cycles } + { amount: 30_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -71,12 +71,12 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 20000000000100 } + { amount: 20000000000100 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -89,7 +89,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: aliceNonce++, }, - { amount: 50_000_000_000_001, blockHeight, cycles } + { amount: 50_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -110,7 +110,7 @@ describe("testing solo stacker increase without bug", () => { network, 3, 2, - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, )) as Record; expect(cvToString(poxAddrInfo0["total-ustx"])).toBe("u50000000000110"); @@ -120,7 +120,7 @@ describe("testing solo stacker increase without bug", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, )) as Record; expect(poxAddrInfo1["total-ustx"]).toEqual(uintCV(50_000_000_000_001)); }); diff --git a/tests/integration/pox/pox-3/direct-stacking-increase-twice.spec.ts b/tests/integration/pox/pox-3/direct-stacking-increase-twice.spec.ts index 15d583b..e3ced8a 100644 --- a/tests/integration/pox/pox-3/direct-stacking-increase-twice.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-increase-twice.spec.ts @@ -23,7 +23,7 @@ describe("testing solo stacker increase without bug", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -37,7 +37,7 @@ describe("testing solo stacker increase without bug", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -54,7 +54,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 30_000_000_000_010, blockHeight, cycles } + { amount: 30_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -67,7 +67,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 20_000_000_000_100 } + { amount: 20_000_000_000_100 }, ); expect(response.error).toBeUndefined(); @@ -80,13 +80,13 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 5_000_000_001_000 } + { amount: 5_000_000_001_000 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -98,7 +98,7 @@ describe("testing solo stacker increase without bug", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 55_000_000_001_110 - bobNonce * fee, - 55_000_000_001_110 + 55_000_000_001_110, ); }); }); diff --git a/tests/integration/pox/pox-3/direct-stacking-many-increase.spec.ts b/tests/integration/pox/pox-3/direct-stacking-many-increase.spec.ts index 2f21505..8440c47 100644 --- a/tests/integration/pox/pox-3/direct-stacking-many-increase.spec.ts +++ b/tests/integration/pox/pox-3/direct-stacking-many-increase.spec.ts @@ -25,7 +25,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -40,7 +40,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -60,14 +60,14 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking transaction to confirm let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -84,7 +84,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -102,7 +102,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" fee, nonce: aliceNonce++, }, - { amount: increaseAmount } + { amount: increaseAmount }, ); const bobIncrease = broadcastStackIncrease( @@ -113,7 +113,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" fee, nonce: bobNonce++, }, - { amount: increaseAmount } + { amount: increaseAmount }, ); // Wait for both stack-increase transactions to confirm @@ -127,7 +127,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" const [bobBlock, bobTx] = await waitForStacksTransaction( orchestrator, - bobResponse.txid + bobResponse.txid, ); expect(bobTx.success).toBeTruthy(); @@ -136,13 +136,13 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" network, 3, 2, // the next cycle - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); const bobPoxAddressInfo = await readRewardCyclePoxAddressForAddress( network, 3, 2, // the next cycle - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, ); const aliceTotalUstx = alicePoxAddressInfo diff --git a/tests/integration/pox/pox-3/pooled-stacking-adjust.spec.ts b/tests/integration/pox/pox-3/pooled-stacking-adjust.spec.ts index bd56a53..552aee5 100644 --- a/tests/integration/pox/pox-3/pooled-stacking-adjust.spec.ts +++ b/tests/integration/pox/pox-3/pooled-stacking-adjust.spec.ts @@ -33,7 +33,7 @@ describe("testing pooled stacking under epoch 2.4", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -47,7 +47,7 @@ describe("testing pooled stacking under epoch 2.4", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -60,7 +60,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -73,7 +73,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: bobNonce++, }, - { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -92,13 +92,13 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: timeline.epoch_2_4 + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -117,7 +117,7 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: timeline.epoch_2_4 + 6, lockPeriodCycles: 3, - } + }, ); expect(response.error).toBeUndefined(); @@ -133,7 +133,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -150,7 +150,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(130_000_000_000_000)); }); @@ -176,7 +176,7 @@ describe("testing pooled stacking under epoch 2.4", () => { let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(ok true)"); @@ -185,7 +185,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 50_000_000_000_000 - bobNonce * fee, - 50_000_000_000_000 + 50_000_000_000_000, ); // Bob delegates 90m STX while stacking @@ -197,7 +197,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: bobNonce++, }, - { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -218,7 +218,7 @@ describe("testing pooled stacking under epoch 2.4", () => { stacker: Accounts.WALLET_2, poolRewardAccount: Accounts.WALLET_3, increaseByAmountUstx: 30_000_000_000_000, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -229,7 +229,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - bobNonce * fee, - 80_000_000_000_000 + 80_000_000_000_000, ); }); }); diff --git a/tests/integration/pox/pox-3/pooled-stacking-auto-unlock.spec.ts b/tests/integration/pox/pox-3/pooled-stacking-auto-unlock.spec.ts index 236796f..b283615 100644 --- a/tests/integration/pox/pox-3/pooled-stacking-auto-unlock.spec.ts +++ b/tests/integration/pox/pox-3/pooled-stacking-auto-unlock.spec.ts @@ -36,7 +36,7 @@ describe("testing pooled stacking with auto unlock", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -50,7 +50,7 @@ describe("testing pooled stacking with auto unlock", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -67,7 +67,7 @@ describe("testing pooled stacking with auto unlock", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -80,7 +80,7 @@ describe("testing pooled stacking with auto unlock", () => { fee, nonce: bobNonce++, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -99,13 +99,13 @@ describe("testing pooled stacking with auto unlock", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -118,7 +118,7 @@ describe("testing pooled stacking with auto unlock", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -136,7 +136,7 @@ describe("testing pooled stacking with auto unlock", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -149,7 +149,7 @@ describe("testing pooled stacking with auto unlock", () => { fee, nonce: faucetNonce++, }, - { amount: 999_000_000_000_000, blockHeight, cycles } + { amount: 999_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -168,7 +168,7 @@ describe("testing pooled stacking with auto unlock", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - fee, - 80_000_000_000_000 + 80_000_000_000_000, ); // Check Pool's table entry @@ -178,11 +178,11 @@ describe("testing pooled stacking with auto unlock", () => { cvToString( tupleCV({ hashbytes: bufferCV( - hexToBytes("a5180cc1ff6050df53f0ab766d76b630e14feb0c") + hexToBytes("a5180cc1ff6050df53f0ab766d76b630e14feb0c"), ), version: bufferCV(new Uint8Array([0])), - }) - ) + }), + ), ); // Check Faucets's table entry @@ -190,7 +190,7 @@ describe("testing pooled stacking with auto unlock", () => { network, 3, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); @@ -211,7 +211,7 @@ describe("testing pooled stacking with auto unlock", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - fee, - 80_000_000_000_000 + 80_000_000_000_000, ); // Table entries for cycle #2 is cleared due to auto unlocked. @@ -220,7 +220,7 @@ describe("testing pooled stacking with auto unlock", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -229,7 +229,7 @@ describe("testing pooled stacking with auto unlock", () => { network, 3, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); diff --git a/tests/integration/pox/pox-3/pooled-stacking-switch-pools.spec.ts b/tests/integration/pox/pox-3/pooled-stacking-switch-pools.spec.ts index 3238b82..a612aa8 100644 --- a/tests/integration/pox/pox-3/pooled-stacking-switch-pools.spec.ts +++ b/tests/integration/pox/pox-3/pooled-stacking-switch-pools.spec.ts @@ -38,7 +38,7 @@ describe("testing pooled stacking under epoch 2.1", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -52,7 +52,7 @@ describe("testing pooled stacking under epoch 2.1", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -65,7 +65,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: aliceNonce++, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -87,7 +87,7 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -100,7 +100,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -116,7 +116,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -125,7 +125,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); }); @@ -153,12 +153,12 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: aliceNonce++, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_2 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_2 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -176,7 +176,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -196,7 +196,7 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_2, startBurnHeight: blockHeight, lockPeriodCycles: 3, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -211,7 +211,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: bobNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 2 }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -231,7 +231,7 @@ describe("testing pooled stacking under epoch 2.1", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_2, increaseByAmountUstx: 5_000_000_000_000, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -251,7 +251,7 @@ describe("testing pooled stacking under epoch 2.1", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_2, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -288,7 +288,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toBeUndefined(); @@ -296,7 +296,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 3, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toBeUndefined(); }); @@ -325,7 +325,7 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_2, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -339,7 +339,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: bobNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 4 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 4 }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -355,7 +355,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 3, 4, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -364,7 +364,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 90_000_000_000_000 - aliceNonce * DEFAULT_FEE, - 90_000_000_000_000 + 90_000_000_000_000, ); }); }); diff --git a/tests/integration/pox/pox-3/pooled-stacking-switch-pox-addr.spec.ts b/tests/integration/pox/pox-3/pooled-stacking-switch-pox-addr.spec.ts index e764c2c..0f2e2f3 100644 --- a/tests/integration/pox/pox-3/pooled-stacking-switch-pox-addr.spec.ts +++ b/tests/integration/pox/pox-3/pooled-stacking-switch-pox-addr.spec.ts @@ -21,13 +21,13 @@ import { getPoxInfo, readRewardCyclePoxAddressForAddress, readRewardCyclePoxAddressListAtIndex, - waitForNextRewardPhase + waitForNextRewardPhase, } from "../helpers"; import { broadcastDelegateSTX, broadcastDelegateStackExtend, broadcastDelegateStackSTX, - broadcastStackAggregationCommitIndexed + broadcastStackAggregationCommitIndexed, } from "../helpers-pooled-stacking"; describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { @@ -41,7 +41,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -55,7 +55,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -68,7 +68,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { fee, nonce: aliceNonce++, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -81,7 +81,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { fee, nonce: bobNonce++, }, - { amount: 10_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 10_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -103,7 +103,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -116,7 +116,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -137,7 +137,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_2, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -152,7 +152,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -161,7 +161,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); }); @@ -182,12 +182,12 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_2, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); expect(tx.result).toBe( @@ -196,9 +196,9 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { tupleCV({ stacker: principalCV(Accounts.WALLET_1.stxAddress), "unlock-burn-height": uintCV(140), - }) - ) - ) + }), + ), + ), ); // Chloe extends Bobs 10m by 1 cycle using wallet_2.btcAddress @@ -214,7 +214,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { stacker: Accounts.WALLET_2, poolRewardAccount: Accounts.WALLET_2, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -225,9 +225,9 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { tupleCV({ stacker: principalCV(Accounts.WALLET_2.stxAddress), "unlock-burn-height": uintCV(140), - }) - ) - ) + }), + ), + ), ); // Chloe commits 100m for cycle #3 using wallet_2.btcAddress @@ -239,7 +239,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -260,7 +260,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -290,7 +290,7 @@ describe("testing pooled stacking for sbtc mini under epoch 2.4", () => { network, 3, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(100_000_000_000_000)); }); diff --git a/tests/integration/pox/pox-3/pooled-stacking.spec.ts b/tests/integration/pox/pox-3/pooled-stacking.spec.ts index e96ef15..c4dd559 100644 --- a/tests/integration/pox/pox-3/pooled-stacking.spec.ts +++ b/tests/integration/pox/pox-3/pooled-stacking.spec.ts @@ -43,7 +43,7 @@ describe("testing pooled stacking under epoch 2.4", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -57,7 +57,7 @@ describe("testing pooled stacking under epoch 2.4", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -70,7 +70,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -83,7 +83,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: bobNonce++, }, - { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -102,13 +102,13 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -121,7 +121,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -138,7 +138,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -147,7 +147,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); }); @@ -170,7 +170,7 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -187,12 +187,12 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, cycleId: 2, rewardIndex: 0, // reward index 0 because we are the only stackers - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -210,7 +210,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(130_000_000_000_000)); @@ -237,7 +237,7 @@ describe("testing pooled stacking under epoch 2.4", () => { let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(ok true)"); @@ -246,7 +246,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 50_000_000_000_000 - bobNonce * fee, - 50_000_000_000_000 + 50_000_000_000_000, ); }); @@ -268,13 +268,13 @@ describe("testing pooled stacking under epoch 2.4", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 16, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(err 3)"); // ERR_STACKING_ALREADY_STACKED expect(tx.success).toBeFalsy(); @@ -297,13 +297,13 @@ describe("testing pooled stacking under epoch 2.4", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_3, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); let poxInfo = await getPoxInfo(network); @@ -321,7 +321,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 3, - 0 + 0, ); expect(poxAddrInfo0).toBeNull(); @@ -343,7 +343,7 @@ describe("testing pooled stacking under epoch 2.4", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_3, increaseByAmountUstx: 10000000000000, - } + }, ); expect(response.error).toBeUndefined(); @@ -356,13 +356,13 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 3 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(ok u0)"); expect(tx.success).toBeTruthy(); @@ -383,7 +383,7 @@ describe("testing pooled stacking under epoch 2.4", () => { network, 3, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -420,7 +420,7 @@ describe("testing pooled stacking under epoch 2.4", () => { const stackerInfo = await callReadOnlystackerInfo( network, 3, - Accounts.WALLET_1 + Accounts.WALLET_1, ); expect(cvToString(stackerInfo)).toBe(cvToString(noneCV())); @@ -437,12 +437,12 @@ describe("testing pooled stacking under epoch 2.4", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_3, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeFalsy(); expect(tx.result).toBe("(err 26)"); // ERR_STACK_EXTEND_NOT_LOCKED @@ -456,7 +456,7 @@ describe("testing pooled stacking under epoch 2.4", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 5 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 5 }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); diff --git a/tests/integration/pox/pox-3/reject-pox.spec.ts b/tests/integration/pox/pox-3/reject-pox.spec.ts index 8ec798d..8aca680 100644 --- a/tests/integration/pox/pox-3/reject-pox.spec.ts +++ b/tests/integration/pox/pox-3/reject-pox.spec.ts @@ -29,7 +29,7 @@ describe("testing reject-pox", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -43,7 +43,7 @@ describe("testing reject-pox", () => { // Wait for 2.4 to go live await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_4 + timeline.epoch_2_4, ); await orchestrator.waitForNextStacksBlock(); @@ -60,12 +60,12 @@ describe("testing reject-pox", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_001, blockHeight, cycles } + { amount: 90_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -78,7 +78,7 @@ describe("testing reject-pox", () => { fee, nonce: bobNonce++, }, - { amount: 90_000_000_000_010, blockHeight, cycles } + { amount: 90_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -111,7 +111,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.current_cycle.id + poxInfo.current_cycle.id, ); expect(isPoxActive).toEqual(trueCV()); @@ -119,7 +119,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.next_cycle.id + poxInfo.next_cycle.id, ); expect(isPoxActive).toEqual(trueCV()); @@ -141,7 +141,7 @@ describe("testing reject-pox", () => { expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeFalsy(); expect(tx.result).toBe("(err 3)"); @@ -160,7 +160,7 @@ describe("testing reject-pox", () => { expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -171,7 +171,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.current_cycle.id + poxInfo.current_cycle.id, ); expect(isPoxActive).toEqual(trueCV()); @@ -179,7 +179,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.next_cycle.id + poxInfo.next_cycle.id, ); expect(isPoxActive).toEqual(falseCV()); @@ -193,7 +193,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.current_cycle.id + poxInfo.current_cycle.id, ); expect(isPoxActive).toEqual(falseCV()); }); @@ -210,7 +210,7 @@ describe("testing reject-pox", () => { 3, network, Accounts.WALLET_1, - poxInfo.current_cycle.id + poxInfo.current_cycle.id, ); expect(isPoxActive).toEqual(trueCV()); }); diff --git a/tests/integration/pox/stacking/direct-and-pooled-extend-bug.spec.ts b/tests/integration/pox/stacking/direct-and-pooled-extend-bug.spec.ts index 927c795..002fe66 100644 --- a/tests/integration/pox/stacking/direct-and-pooled-extend-bug.spec.ts +++ b/tests/integration/pox/stacking/direct-and-pooled-extend-bug.spec.ts @@ -41,7 +41,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -70,7 +70,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", fee, nonce: aliceNonce++, }, - { amount: 75_000_000_000_000, blockHeight, cycles } + { amount: 75_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -83,12 +83,12 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", fee, nonce: aliceNonce++, }, - { amount: 100_000_000_000_000, poolAddress: Accounts.WALLET_2 } + { amount: 100_000_000_000_000, poolAddress: Accounts.WALLET_2 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success, tx.result).toBeTruthy(); @@ -105,7 +105,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_2, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -122,7 +122,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", fee, nonce: bobNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 }, ); expect(response.error).toBeUndefined(); @@ -141,7 +141,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(75_000_000_000_000)); @@ -150,7 +150,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 2, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toBeUndefined(); }); @@ -170,7 +170,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", fee, nonce: faucetNonce++, }, - { amount: 900_000_000_000_000, blockHeight, cycles } + { amount: 900_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -209,7 +209,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(75_000_000_000_000)); @@ -218,11 +218,11 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 2, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(900_000_000_000_000)); expect(cvToString((poxAddrInfo1?.stacker as SomeCV).value)).toEqual( - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); // Check Alice's table entry for cycle 3 poxAddrInfo0 = await readRewardCyclePoxAddressListAtIndex(network, 2, 3, 0); @@ -236,7 +236,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - fee * 2, - 0 + 0, ); }); @@ -254,7 +254,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", fee, nonce: chloeNonce++, }, - { amount: 80_000_000_000_000, blockHeight, cycles } + { amount: 80_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -287,7 +287,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(75_000_000_000_000)); @@ -296,11 +296,11 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, 2, 3, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); expect(cvToString((poxAddrInfo1?.stacker as SomeCV).value)).toEqual( - Accounts.WALLET_3.stxAddress + Accounts.WALLET_3.stxAddress, ); // THIS IS A BUG @@ -309,7 +309,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - fee * 2, - 0 + 0, ); }); @@ -322,7 +322,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Alice's account info @@ -330,7 +330,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -339,7 +339,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -348,7 +348,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -357,7 +357,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -371,7 +371,7 @@ describe("testing mixed direct and pooled stacking with extend under epoch 2.1", await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-and-pooled-increase-as-pool-operator.spec.ts b/tests/integration/pox/stacking/direct-and-pooled-increase-as-pool-operator.spec.ts index f5d23f2..13f2be3 100644 --- a/tests/integration/pox/stacking/direct-and-pooled-increase-as-pool-operator.spec.ts +++ b/tests/integration/pox/stacking/direct-and-pooled-increase-as-pool-operator.spec.ts @@ -39,7 +39,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -68,7 +68,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc fee, nonce: aliceNonce++, }, - { amount: 80_000_000_000_000, blockHeight, cycles } + { amount: 80_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -81,12 +81,12 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc fee, nonce: faucetNonce++, }, - { amount: 999000000000000, poolAddress: Accounts.WALLET_1 } + { amount: 999000000000000, poolAddress: Accounts.WALLET_1 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success, tx.result).toBeTruthy(); @@ -105,7 +105,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc poolRewardAccount: Accounts.WALLET_1, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -120,7 +120,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc fee, nonce: aliceNonce++, }, - { poolRewardAccount: Accounts.WALLET_1, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_1, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -138,7 +138,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -147,7 +147,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, 2, 2, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); @@ -155,7 +155,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - aliceNonce * fee, - 80_000_000_000_000 + 80_000_000_000_000, ); // Wait until unlock happens that is block N+5 where N is the height of the next reward phase @@ -182,7 +182,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - aliceNonce * fee, - 80_000_000_000_000 + 80_000_000_000_000, ); }); @@ -195,7 +195,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Alice's account info @@ -203,7 +203,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -212,7 +212,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -221,7 +221,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc network, Accounts.FAUCET.stxAddress, 1_000_000_000_000_000 - faucetNonce * fee, - 0 + 0, ); // Verify that Faucet's STX are really unlocked by doing a transfer @@ -230,7 +230,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc { amount: 1_000_000_000_000_000 - faucetNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -244,7 +244,7 @@ describe("testing direct stacker as pool operator without auto-unlock under epoc await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-and-pooled-increase-bad-pool-operator.spec.ts b/tests/integration/pox/stacking/direct-and-pooled-increase-bad-pool-operator.spec.ts index 859bb8c..3f74d4c 100644 --- a/tests/integration/pox/stacking/direct-and-pooled-increase-bad-pool-operator.spec.ts +++ b/tests/integration/pox/stacking/direct-and-pooled-increase-bad-pool-operator.spec.ts @@ -56,7 +56,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_000, blockHeight, cycles } + { amount: 90_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -69,12 +69,12 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { fee, nonce: bobNonce++, }, - { amount: 80000000000000, poolAddress: Accounts.WALLET_1 } + { amount: 80000000000000, poolAddress: Accounts.WALLET_1 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -91,7 +91,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { stacker: Accounts.WALLET_2, poolRewardAccount: Accounts.WALLET_1, increaseByAmountUstx: 80000000000000, - } + }, ); expect(response.error).toBeUndefined(); [block, tx] = await waitForStacksTransaction(orchestrator, response.txid); @@ -113,7 +113,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2 + Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2, ); // Check Alice's account info @@ -121,7 +121,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -130,7 +130,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -139,7 +139,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -148,7 +148,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -163,7 +163,7 @@ describe("testing stacker who is a bad pool operator under epoch 2.1", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-and-pooled-increase-bug.spec.ts b/tests/integration/pox/stacking/direct-and-pooled-increase-bug.spec.ts index 99dd1dd..a10cba9 100644 --- a/tests/integration/pox/stacking/direct-and-pooled-increase-bug.spec.ts +++ b/tests/integration/pox/stacking/direct-and-pooled-increase-bug.spec.ts @@ -39,7 +39,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -68,7 +68,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { fee, nonce: faucetNonce++, }, - { amount: 75_000_000_000_000, blockHeight, cycles } + { amount: 75_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -81,12 +81,12 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { fee, nonce: faucetNonce++, }, - { amount: 1_100_000_000_000_000, poolAddress: Accounts.WALLET_2 } + { amount: 1_100_000_000_000_000, poolAddress: Accounts.WALLET_2 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -103,7 +103,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { stacker: Accounts.FAUCET, poolRewardAccount: Accounts.WALLET_2, increaseByAmountUstx: 920_000_000_000_000, - } + }, ); expect(response.error).toBeUndefined(); @@ -119,7 +119,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { fee, nonce: bobNonce++, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -139,7 +139,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(75_000_000_000_000)); @@ -148,7 +148,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, 2, 2, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(920_000_000_000_000)); }); @@ -174,7 +174,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(920_000_000_000_000)); @@ -182,7 +182,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, 2, 2, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toBeUndefined(); @@ -192,7 +192,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, Accounts.FAUCET.stxAddress, 1_000_000_000_000_000 - faucetNonce * fee, - 0 + 0, ); }); @@ -205,7 +205,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Bob's account info @@ -213,7 +213,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -222,7 +222,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -231,7 +231,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { network, Accounts.FAUCET.stxAddress, 1_000_000_000_000_000 - faucetNonce * fee, - 0 + 0, ); // Verify that Faucet's STX are really unlocked by doing a transfer @@ -240,7 +240,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { { amount: 1_000_000_000_000_000 - faucetNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -254,7 +254,7 @@ describe("testing mixed direct and pooled stacking under epoch 2.1", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-auto-unlock.spec.ts b/tests/integration/pox/stacking/direct-stacking-auto-unlock.spec.ts index 9005993..5b0d4fb 100644 --- a/tests/integration/pox/stacking/direct-stacking-auto-unlock.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-auto-unlock.spec.ts @@ -34,7 +34,7 @@ describe("testing solo stacker below minimum", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -63,12 +63,12 @@ describe("testing solo stacker below minimum", () => { fee, nonce: aliceNonce++, }, - { amount: 80_000_000_000_000, blockHeight, cycles } + { amount: 80_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -81,7 +81,7 @@ describe("testing solo stacker below minimum", () => { fee, nonce: faucetNonce++, }, - { amount: 999_000_000_000_000, blockHeight, cycles } + { amount: 999_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -99,7 +99,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - 80_000_000_000_000 - fee, - 80_000_000_000_000 + 80_000_000_000_000, ); // Check Alice's table entry @@ -107,7 +107,7 @@ describe("testing solo stacker below minimum", () => { network, 2, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -116,7 +116,7 @@ describe("testing solo stacker below minimum", () => { network, 2, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); @@ -135,7 +135,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - fee, - 0 + 0, ); // Table entries for cycle #2 is cleared for auto-unlocked stackers. @@ -144,7 +144,7 @@ describe("testing solo stacker below minimum", () => { network, 2, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toBeUndefined(); @@ -153,7 +153,7 @@ describe("testing solo stacker below minimum", () => { network, 2, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(999_000_000_000_000)); }); @@ -167,7 +167,7 @@ describe("testing solo stacker below minimum", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Alice's account info @@ -175,7 +175,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -184,7 +184,7 @@ describe("testing solo stacker below minimum", () => { { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -193,7 +193,7 @@ describe("testing solo stacker below minimum", () => { network, Accounts.FAUCET.stxAddress, 1_000_000_000_000_000 - faucetNonce * fee, - 0 + 0, ); // Verify that Faucet's STX are really unlocked by doing a transfer @@ -202,7 +202,7 @@ describe("testing solo stacker below minimum", () => { { amount: 1_000_000_000_000_000 - faucetNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -216,7 +216,7 @@ describe("testing solo stacker below minimum", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-extend.spec.ts b/tests/integration/pox/stacking/direct-stacking-extend.spec.ts index 3640285..533fcd1 100644 --- a/tests/integration/pox/stacking/direct-stacking-extend.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-extend.spec.ts @@ -36,7 +36,7 @@ describe("testing stack-extend functionality", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -68,13 +68,13 @@ describe("testing stack-extend functionality", () => { amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking transaction to confirm let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -87,7 +87,7 @@ describe("testing stack-extend functionality", () => { fee, nonce: aliceNonce++, }, - { cycles: 2 } + { cycles: 2 }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking extension transaction to confirm @@ -105,7 +105,7 @@ describe("testing stack-extend functionality", () => { network, 2, cycle + 1, // cycle + 1 because we are checking the next cycle, including rewards - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, )) as Record; expect(poxAddrInfo?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); @@ -123,7 +123,7 @@ describe("testing stack-extend functionality", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Alice's account info @@ -131,7 +131,7 @@ describe("testing stack-extend functionality", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -140,7 +140,7 @@ describe("testing stack-extend functionality", () => { { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -154,7 +154,7 @@ describe("testing stack-extend functionality", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-good-order.spec.ts b/tests/integration/pox/stacking/direct-stacking-good-order.spec.ts index fe7c2c5..b860642 100644 --- a/tests/integration/pox/stacking/direct-stacking-good-order.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-good-order.spec.ts @@ -57,7 +57,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 30_000_000_000_010, blockHeight, cycles } + { amount: 30_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -70,7 +70,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 20000000000100 } + { amount: 20000000000100 }, ); expect(response.error).toBeUndefined(); @@ -87,7 +87,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: aliceNonce++, }, - { amount: 50_000_000_000_001, blockHeight, cycles } + { amount: 50_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -107,7 +107,7 @@ describe("testing solo stacker increase without bug", () => { network, 2, 2, - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, )) as Record; // There is no bug here because total stack was equal to Bob's stacked amount when Bob called stack-increase. expect(cvToString(poxAddrInfo0["total-ustx"])).toBe("u50000000000110"); @@ -119,7 +119,7 @@ describe("testing solo stacker increase without bug", () => { network, 2, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, )) as Record; expect(poxAddrInfo1["total-ustx"]).toEqual(uintCV(50_000_000_000_001)); }); @@ -133,7 +133,7 @@ describe("testing solo stacker increase without bug", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2 + Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2, ); // Check Alice's account info @@ -141,7 +141,7 @@ describe("testing solo stacker increase without bug", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -150,7 +150,7 @@ describe("testing solo stacker increase without bug", () => { { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -159,7 +159,7 @@ describe("testing solo stacker increase without bug", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -168,7 +168,7 @@ describe("testing solo stacker increase without bug", () => { { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -182,7 +182,7 @@ describe("testing solo stacker increase without bug", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-increase-twice.spec.ts b/tests/integration/pox/stacking/direct-stacking-increase-twice.spec.ts index f1d4418..371c430 100644 --- a/tests/integration/pox/stacking/direct-stacking-increase-twice.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-increase-twice.spec.ts @@ -54,7 +54,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 30_000_000_000_010, blockHeight, cycles } + { amount: 30_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -67,7 +67,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 20_000_000_000_100 } + { amount: 20_000_000_000_100 }, ); expect(response.error).toBeUndefined(); @@ -80,7 +80,7 @@ describe("testing solo stacker increase without bug", () => { fee, nonce: bobNonce++, }, - { amount: 5_000_000_001_000 } + { amount: 5_000_000_001_000 }, ); expect(response.error).toBeUndefined(); @@ -95,7 +95,7 @@ describe("testing solo stacker increase without bug", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 55_000_000_001_110 - bobNonce * fee, - 55_000_000_001_110 + 55_000_000_001_110, ); }); @@ -108,7 +108,7 @@ describe("testing solo stacker increase without bug", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2 + Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2, ); // Check Bob's account info @@ -116,7 +116,7 @@ describe("testing solo stacker increase without bug", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -125,7 +125,7 @@ describe("testing solo stacker increase without bug", () => { { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -139,7 +139,7 @@ describe("testing solo stacker increase without bug", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-many-increase.spec.ts b/tests/integration/pox/stacking/direct-stacking-many-increase.spec.ts index 0919e2b..451ff83 100644 --- a/tests/integration/pox/stacking/direct-stacking-many-increase.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-many-increase.spec.ts @@ -60,14 +60,14 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); // Wait for Alice's stacking transaction to confirm let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -84,7 +84,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" amount: 80_000_000_000_000, blockHeight, cycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -102,7 +102,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" fee, nonce: aliceNonce++, }, - { amount: increaseAmount } + { amount: increaseAmount }, ); const bobIncrease = broadcastStackIncrease( @@ -113,7 +113,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" fee, nonce: bobNonce++, }, - { amount: increaseAmount } + { amount: increaseAmount }, ); // Wait for both stack-increase transactions to confirm @@ -127,7 +127,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" const [aliceBlock, aliceTx] = await waitForStacksTransaction( orchestrator, - aliceResponse.txid + aliceResponse.txid, ); expect(aliceTx.success).toBeTruthy(); @@ -136,13 +136,13 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" network, 2, 2, // the next cycle - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); const bobPoxAddressInfo = await readRewardCyclePoxAddressForAddress( network, 2, 2, // the next cycle - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, ); const aliceTotalUstx = alicePoxAddressInfo @@ -165,7 +165,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2 + Constants.DEVNET_DEFAULT_EPOCH_2_2 + 2, ); // Check Alice's account info @@ -173,7 +173,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -182,7 +182,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -191,7 +191,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -200,7 +200,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -214,7 +214,7 @@ describe("testing multiple stack-stx and stack-increase calls in the same block" await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/direct-stacking-with-bug.spec.ts b/tests/integration/pox/stacking/direct-stacking-with-bug.spec.ts index c263264..bd16c30 100644 --- a/tests/integration/pox/stacking/direct-stacking-with-bug.spec.ts +++ b/tests/integration/pox/stacking/direct-stacking-with-bug.spec.ts @@ -31,7 +31,7 @@ describe("testing solo stacker increase with bug", () => { }; orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -55,7 +55,7 @@ describe("testing solo stacker increase with bug", () => { // Faucet stacks 900m (1/4 of liquid suply) let response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.FAUCET, fee, nonce: 0 }, - { amount: 900_000_000_000_001, blockHeight, cycles } + { amount: 900_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -65,14 +65,14 @@ describe("testing solo stacker increase with bug", () => { // Bob stacks 80m response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_2, fee, nonce: 0 }, - { amount: 80_000_000_000_010, blockHeight, cycles } + { amount: 80_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); // Bob increases by 10m response = await broadcastStackIncrease( { poxVersion: 2, network, account: Accounts.WALLET_2, fee, nonce: 1 }, - { amount: 10000000000100 } + { amount: 10000000000100 }, ); expect(response.error).toBeUndefined(); // let Bobx's stacking confirm to enforce reward index 1 @@ -81,14 +81,14 @@ describe("testing solo stacker increase with bug", () => { // Chloe stacks 80m response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_3, fee, nonce: 0 }, - { amount: 80_000_000_001_000, blockHeight, cycles } + { amount: 80_000_000_001_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); // Chloe increases by 10m response = await broadcastStackIncrease( { poxVersion: 2, network, account: Accounts.WALLET_3, fee, nonce: 1 }, - { amount: 10_000_000_010_000 } + { amount: 10_000_000_010_000 }, ); expect(response.error).toBeUndefined(); await orchestrator.waitForStacksBlockIncludingTransaction(response.txid); @@ -106,7 +106,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(900_000_000_000_001)); @@ -115,7 +115,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, ); // HERE'S THE BUG: THIS SHOULD BE `u90000000000110` // expect(poxAddrInfo1["total-ustx"]).toEqual( @@ -128,7 +128,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.WALLET_3.stxAddress + Accounts.WALLET_3.stxAddress, ); // HERE'S THE BUG: THIS SHOULD BE `u90000000011000` // expect(poxAddrInfo2["total-ustx"]).toEqual(uintCV(90_000_000_011_000)); diff --git a/tests/integration/pox/stacking/epoch-gating-bug.spec.ts b/tests/integration/pox/stacking/epoch-gating-bug.spec.ts index 9fefcf6..de69318 100644 --- a/tests/integration/pox/stacking/epoch-gating-bug.spec.ts +++ b/tests/integration/pox/stacking/epoch-gating-bug.spec.ts @@ -32,7 +32,7 @@ describe("testing solo stacker increase with bug", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -45,7 +45,7 @@ describe("testing solo stacker increase with bug", () => { const network = new StacksTestnet({ url: orchestrator.getStacksNodeUrl() }); await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 1 + Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 1, ); const codeBody = `(define-read-only (check-unlock-height (address principal)) @@ -76,7 +76,7 @@ describe("testing solo stacker increase with bug", () => { // Faucet stacks 900m (1/4 of liquid suply) response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.FAUCET, fee, nonce: 0 }, - { amount: 900_000_000_000_001, blockHeight, cycles } + { amount: 900_000_000_000_001, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); @@ -86,14 +86,14 @@ describe("testing solo stacker increase with bug", () => { // Bob stacks 80m response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_2, fee, nonce: 0 }, - { amount: 80_000_000_000_010, blockHeight, cycles } + { amount: 80_000_000_000_010, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); // Bob increases by 10m response = await broadcastStackIncrease( { poxVersion: 2, network, account: Accounts.WALLET_2, fee, nonce: 1 }, - { amount: 10000000000100 } + { amount: 10000000000100 }, ); expect(response.error).toBeUndefined(); // let Bobx's stacking confirm to enforce reward index 1 @@ -102,14 +102,14 @@ describe("testing solo stacker increase with bug", () => { // Chloe stacks 80m response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_3, fee, nonce: 0 }, - { amount: 80_000_000_001_000, blockHeight, cycles } + { amount: 80_000_000_001_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); // Chloe increases by 10m response = await broadcastStackIncrease( { poxVersion: 2, network, account: Accounts.WALLET_3, fee, nonce: 1 }, - { amount: 10_000_000_010_000 } + { amount: 10_000_000_010_000 }, ); expect(response.error).toBeUndefined(); await orchestrator.waitForStacksBlockIncludingTransaction(response.txid); @@ -127,7 +127,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.FAUCET.stxAddress + Accounts.FAUCET.stxAddress, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(900_000_000_000_001)); @@ -136,7 +136,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.WALLET_2.stxAddress + Accounts.WALLET_2.stxAddress, ); // HERE'S THE BUG: THIS SHOULD BE `u90000000000110` // expect(poxAddrInfo1["total-ustx"]).toEqual( @@ -149,7 +149,7 @@ describe("testing solo stacker increase with bug", () => { network, 2, 2, - Accounts.WALLET_3.stxAddress + Accounts.WALLET_3.stxAddress, ); // HERE'S THE BUG: THIS SHOULD BE `u90000000011000` // expect(poxAddrInfo2["total-ustx"]).toEqual(uintCV(90_000_000_011_000)); @@ -179,7 +179,7 @@ describe("testing solo stacker increase with bug", () => { // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); // Verify that calling the clarity contract gives the same incorrect result diff --git a/tests/integration/pox/stacking/epoch_2_0.spec.ts b/tests/integration/pox/stacking/epoch_2_0.spec.ts index 2b369e4..94e1890 100644 --- a/tests/integration/pox/stacking/epoch_2_0.spec.ts +++ b/tests/integration/pox/stacking/epoch_2_0.spec.ts @@ -21,7 +21,7 @@ describe("testing stacking under epoch 2.0", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -60,7 +60,7 @@ describe("testing stacking under epoch 2.0", () => { let stackedByWallet1 = 25_000_000_000_000; let response = await broadcastStackSTX( { poxVersion: 1, network, account: Accounts.WALLET_1, fee, nonce: 0 }, - { amount: stackedByWallet1, blockHeight, cycles: 1 } + { amount: stackedByWallet1, blockHeight, cycles: 1 }, ); expect(response.error).toBeUndefined(); @@ -68,7 +68,7 @@ describe("testing stacking under epoch 2.0", () => { let stackedByWallet2 = 50_000_000_000_000; response = await broadcastStackSTX( { poxVersion: 1, network, account: Accounts.WALLET_2, fee, nonce: 0 }, - { amount: stackedByWallet2, blockHeight, cycles: 6 } + { amount: stackedByWallet2, blockHeight, cycles: 6 }, ); expect(response.error).toBeUndefined(); @@ -76,7 +76,7 @@ describe("testing stacking under epoch 2.0", () => { let stackedByWallet3 = 75_000_000_000_000; response = await broadcastStackSTX( { poxVersion: 1, network, account: Accounts.WALLET_3, fee, nonce: 0 }, - { amount: stackedByWallet3, blockHeight, cycles: 12 } + { amount: stackedByWallet3, blockHeight, cycles: 12 }, ); expect(response.error).toBeUndefined(); @@ -95,27 +95,27 @@ describe("testing stacking under epoch 2.0", () => { // WALLET_1 should have some tokens locked wallet1 = await getAccount(network, Accounts.WALLET_1.stxAddress); expect(wallet1.balance).toBe( - BigInt(genesisBalance - stackedByWallet1 - fee) + BigInt(genesisBalance - stackedByWallet1 - fee), ); expect(wallet1.locked).toBe(BigInt(stackedByWallet1)); // WALLET_2 should have some tokens locked wallet2 = await getAccount(network, Accounts.WALLET_2.stxAddress); expect(wallet2.balance).toBe( - BigInt(genesisBalance - stackedByWallet2 - fee) + BigInt(genesisBalance - stackedByWallet2 - fee), ); expect(wallet2.locked).toBe(BigInt(stackedByWallet2)); // WALLET_3 should have some tokens locked wallet3 = await getAccount(network, Accounts.WALLET_3.stxAddress); expect(wallet3.balance).toBe( - BigInt(genesisBalance - stackedByWallet3 - fee) + BigInt(genesisBalance - stackedByWallet3 - fee), ); expect(wallet3.locked).toBe(BigInt(stackedByWallet3)); // Wait for next PoX cycle (Bitcoin block #131) await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.pox_2_activation + 1 + timeline.pox_2_activation + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/pox/stacking/epoch_2_1.spec.ts b/tests/integration/pox/stacking/epoch_2_1.spec.ts index 13282f1..32ae56f 100644 --- a/tests/integration/pox/stacking/epoch_2_1.spec.ts +++ b/tests/integration/pox/stacking/epoch_2_1.spec.ts @@ -18,7 +18,7 @@ describe("testing stacking under epoch 2.1", () => { }; orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -37,7 +37,7 @@ describe("testing stacking under epoch 2.1", () => { let blockHeight = Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 1; let chainUpdate = await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - blockHeight + blockHeight, ); // Broadcast some STX stacking orders @@ -45,19 +45,19 @@ describe("testing stacking under epoch 2.1", () => { let cycles = 1; let response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_1, fee, nonce: 0 }, - { amount: 25_000_000_000_000, blockHeight, cycles } + { amount: 25_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_2, fee, nonce: 0 }, - { amount: 50_000_000_000_000, blockHeight, cycles } + { amount: 50_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); response = await broadcastStackSTX( { poxVersion: 2, network, account: Accounts.WALLET_3, fee, nonce: 0 }, - { amount: 75_000_000_000_000, blockHeight, cycles } + { amount: 75_000_000_000_000, blockHeight, cycles }, ); expect(response.error).toBeUndefined(); diff --git a/tests/integration/pox/stacking/pooled-stacking-switch-pools.spec.ts b/tests/integration/pox/stacking/pooled-stacking-switch-pools.spec.ts index b1077e6..e6ccad6 100644 --- a/tests/integration/pox/stacking/pooled-stacking-switch-pools.spec.ts +++ b/tests/integration/pox/stacking/pooled-stacking-switch-pools.spec.ts @@ -38,7 +38,7 @@ describe("testing pooled stacking under epoch 2.1", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -52,7 +52,7 @@ describe("testing pooled stacking under epoch 2.1", () => { // Wait for the pox-2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + Constants.DEVNET_DEFAULT_POX_2_ACTIVATION, ); // Alice delegates 95m STX to Chloe @@ -64,7 +64,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: 0, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -83,7 +83,7 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -96,7 +96,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: 1, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -114,7 +114,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -123,7 +123,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); }); @@ -149,7 +149,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: 2, }, - { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_2 } + { amount: 95_000_000_000_000, poolAddress: Accounts.WALLET_2 }, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -169,7 +169,7 @@ describe("testing pooled stacking under epoch 2.1", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_2, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -182,16 +182,16 @@ describe("testing pooled stacking under epoch 2.1", () => { fee: DEFAULT_FEE, nonce: 1, }, - { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_2, cycleId: 3 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - response.txid + response.txid, ); expect( - (block as StacksBlockMetadata).bitcoin_anchor_block_identifier.index + (block as StacksBlockMetadata).bitcoin_anchor_block_identifier.index, ).toBeLessThan(timeline.epoch_2_2); let poxInfo = await getPoxInfo(network); @@ -208,7 +208,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -239,7 +239,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -247,7 +247,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 3, - 1 + 1, ); expect(poxAddrInfo1?.["total-ustx"]).toBeUndefined(); }); diff --git a/tests/integration/pox/stacking/pooled-stacking.spec.ts b/tests/integration/pox/stacking/pooled-stacking.spec.ts index e703efa..88be6c4 100644 --- a/tests/integration/pox/stacking/pooled-stacking.spec.ts +++ b/tests/integration/pox/stacking/pooled-stacking.spec.ts @@ -45,7 +45,7 @@ describe("testing pooled stacking under epoch 2.1", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -71,7 +71,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee, nonce: aliceNonce++, }, - { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 90_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -84,7 +84,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee, nonce: bobNonce++, }, - { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 } + { amount: 50_000_000_000_000, poolAddress: Accounts.WALLET_3 }, ); expect(response.error).toBeUndefined(); @@ -103,13 +103,13 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -122,7 +122,7 @@ describe("testing pooled stacking under epoch 2.1", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 2 }, ); expect(response.error).toBeUndefined(); @@ -139,7 +139,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - Accounts.WALLET_1.stxAddress + Accounts.WALLET_1.stxAddress, ); expect(poxAddrInfo0).toBeNull(); @@ -148,7 +148,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo1?.["total-ustx"]).toEqual(uintCV(80_000_000_000_000)); }); @@ -171,7 +171,7 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 6, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); @@ -188,12 +188,12 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, cycleId: 2, rewardIndex: 0, // reward index 0 because we are the only stackers - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); @@ -211,7 +211,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 2, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(130_000_000_000_000)); @@ -238,7 +238,7 @@ describe("testing pooled stacking under epoch 2.1", () => { let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(ok true)"); @@ -247,7 +247,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - 50_000_000_000_000 - bobNonce * fee, - 50_000_000_000_000 + 50_000_000_000_000, ); }); @@ -269,13 +269,13 @@ describe("testing pooled stacking under epoch 2.1", () => { poolRewardAccount: Accounts.WALLET_3, startBurnHeight: Constants.DEVNET_DEFAULT_POX_2_ACTIVATION + 16, lockPeriodCycles: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(err 3)"); // ERR_STACKING_ALREADY_STACKED expect(tx.success).toBeFalsy(); @@ -298,13 +298,13 @@ describe("testing pooled stacking under epoch 2.1", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_3, extendByCount: 1, - } + }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.success).toBeTruthy(); let poxInfo = await getPoxInfo(network); @@ -323,7 +323,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 3, - 0 + 0, ); expect(poxAddrInfo0).toBeNull(); @@ -345,7 +345,7 @@ describe("testing pooled stacking under epoch 2.1", () => { stacker: Accounts.WALLET_1, poolRewardAccount: Accounts.WALLET_3, increaseByAmountUstx: 10000000000000, - } + }, ); expect(response.error).toBeUndefined(); @@ -358,13 +358,13 @@ describe("testing pooled stacking under epoch 2.1", () => { fee, nonce: chloeNonce++, }, - { poolRewardAccount: Accounts.WALLET_3, cycleId: 3 } + { poolRewardAccount: Accounts.WALLET_3, cycleId: 3 }, ); expect(response.error).toBeUndefined(); let [block, tx] = await waitForStacksTransaction( orchestrator, - response.txid + response.txid, ); expect(tx.result).toBe("(ok u0)"); expect(tx.success).toBeTruthy(); @@ -385,7 +385,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, 2, 3, - 0 + 0, ); expect(poxAddrInfo0?.["total-ustx"]).toEqual(uintCV(90_000_000_000_000)); @@ -425,7 +425,7 @@ describe("testing pooled stacking under epoch 2.1", () => { // Wait for 2.2 activation and unlock await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Check Bob's account info @@ -433,7 +433,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, Accounts.WALLET_2.stxAddress, 100_000_000_000_000 - bobNonce * fee, - 0 + 0, ); // Verify that Bob's STX are really unlocked by doing a transfer @@ -442,7 +442,7 @@ describe("testing pooled stacking under epoch 2.1", () => { { amount: 100_000_000_000_000 - bobNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); @@ -451,7 +451,7 @@ describe("testing pooled stacking under epoch 2.1", () => { network, Accounts.WALLET_1.stxAddress, 100_000_000_000_000 - aliceNonce * fee, - 0 + 0, ); // Verify that Alice's STX are really unlocked by doing a transfer @@ -460,7 +460,7 @@ describe("testing pooled stacking under epoch 2.1", () => { { amount: 100_000_000_000_000 - aliceNonce * fee, recipient: Accounts.WALLET_3.stxAddress, - } + }, ); await asyncExpectStacksTransactionSuccess(orchestrator, response.txid); }); @@ -474,7 +474,7 @@ describe("testing pooled stacking under epoch 2.1", () => { await waitForNextRewardPhase( network, orchestrator, - poxInfo.current_cycle.id + 1 + poxInfo.current_cycle.id + 1, ); poxInfo = await getPoxInfo(network); diff --git a/tests/integration/traits/trait-parameter-20-20.spec.ts b/tests/integration/traits/trait-parameter-20-20.spec.ts index 246ba46..1188a81 100644 --- a/tests/integration/traits/trait-parameter-20-20.spec.ts +++ b/tests/integration/traits/trait-parameter-20-20.spec.ts @@ -66,7 +66,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -85,7 +85,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -110,7 +110,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -129,7 +129,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -139,7 +139,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -149,7 +149,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -161,12 +161,12 @@ describe("trait user and trait implementer both deployed in 2.0", () => { network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); @@ -178,25 +178,25 @@ describe("trait user and trait implementer both deployed in 2.0", () => { // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network).catch((e: Error) => - errorToCV(e) + errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // call public function as readonly output = await callReadOnlyTestTraitCallFoo(network, { a: 2 }).catch( - (e: Error) => errorToCV(e) + (e: Error) => errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // Call the public function @@ -204,7 +204,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { network, Accounts.WALLET_1, 1, - { a: 2 } + { a: 2 }, ); expect(response.error).toEqual("transaction rejected"); }); @@ -215,7 +215,7 @@ describe("trait user and trait implementer both deployed in 2.0", () => { }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -231,12 +231,12 @@ describe("trait user and trait implementer both deployed in 2.0", () => { network, Accounts.WALLET_1, 1, // use nonce again - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-20-21.spec.ts b/tests/integration/traits/trait-parameter-20-21.spec.ts index f2377e3..f3bb2b6 100644 --- a/tests/integration/traits/trait-parameter-20-21.spec.ts +++ b/tests/integration/traits/trait-parameter-20-21.spec.ts @@ -66,7 +66,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -85,7 +85,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -110,7 +110,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -129,14 +129,14 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); ({ response, transaction } = await deployContract( @@ -144,7 +144,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -154,7 +154,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -166,12 +166,12 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); @@ -183,25 +183,25 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network).catch((e: Error) => - errorToCV(e) + errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // call public function as readonly output = await callReadOnlyTestTraitCallFoo(network, { a: 2 }).catch( - (e: Error) => errorToCV(e) + (e: Error) => errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // Call the public function @@ -209,7 +209,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => network, Accounts.WALLET_1, 1, - { a: 2 } + { a: 2 }, ); expect(response.error).toEqual("transaction rejected"); }); @@ -220,7 +220,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -236,12 +236,12 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.1", () => network, Accounts.WALLET_1, 1, // use nonce again - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-20-22.spec.ts b/tests/integration/traits/trait-parameter-20-22.spec.ts index c611e80..66298d8 100644 --- a/tests/integration/traits/trait-parameter-20-22.spec.ts +++ b/tests/integration/traits/trait-parameter-20-22.spec.ts @@ -63,7 +63,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -82,7 +82,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -107,7 +107,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -126,14 +126,14 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); ({ response, transaction } = await deployContract( @@ -141,7 +141,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -150,20 +150,20 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network).catch((e: Error) => - errorToCV(e) + errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // call public function as readonly output = await callReadOnlyTestTraitCallFoo(network, { a: 2 }).catch( - (e: Error) => errorToCV(e) + (e: Error) => errorToCV(e), ); expect(cvToString(output), cvToString(output)).toContain( - "Unchecked(TypeValueError(TraitReferenceType" + "Unchecked(TypeValueError(TraitReferenceType", ); // Call the public function @@ -171,7 +171,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => network, Accounts.WALLET_1, 0, - { a: 2 } + { a: 2 }, )); expect(response.error).toEqual("transaction rejected"); }); @@ -182,7 +182,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -198,12 +198,12 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.2", () => network, Accounts.WALLET_1, 0, // use nonce again - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-20-23.spec.ts b/tests/integration/traits/trait-parameter-20-23.spec.ts index 4f2d172..b8f13cb 100644 --- a/tests/integration/traits/trait-parameter-20-23.spec.ts +++ b/tests/integration/traits/trait-parameter-20-23.spec.ts @@ -64,7 +64,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -83,7 +83,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -108,7 +108,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -127,14 +127,14 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -142,7 +142,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -152,7 +152,7 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -164,12 +164,12 @@ describe("trait user deployed in 2.0, trait implementer deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-21-20.spec.ts b/tests/integration/traits/trait-parameter-21-20.spec.ts index 1f32499..b0c9123 100644 --- a/tests/integration/traits/trait-parameter-21-20.spec.ts +++ b/tests/integration/traits/trait-parameter-21-20.spec.ts @@ -65,7 +65,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -128,14 +128,14 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); ({ response, transaction } = await deployContract( @@ -143,7 +143,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -153,7 +153,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -165,12 +165,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); @@ -182,13 +182,13 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -200,12 +200,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => network, Accounts.WALLET_1, 1, - { a: 2 } + { a: 2 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u2)"); }); @@ -216,7 +216,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -232,12 +232,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.1", () => network, Accounts.WALLET_1, 2, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-21-21.spec.ts b/tests/integration/traits/trait-parameter-21-21.spec.ts index 2665225..e121389 100644 --- a/tests/integration/traits/trait-parameter-21-21.spec.ts +++ b/tests/integration/traits/trait-parameter-21-21.spec.ts @@ -65,7 +65,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); let { response, transaction } = await deployContract( @@ -131,7 +131,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -141,7 +141,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -151,7 +151,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -163,12 +163,12 @@ describe("trait implementer and trait user both deployed in 2.1", () => { network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); @@ -180,13 +180,13 @@ describe("trait implementer and trait user both deployed in 2.1", () => { // Wait for the 2.2 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -198,12 +198,12 @@ describe("trait implementer and trait user both deployed in 2.1", () => { network, Accounts.WALLET_1, 1, - { a: 2 } + { a: 2 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u2)"); }); @@ -214,7 +214,7 @@ describe("trait implementer and trait user both deployed in 2.1", () => { }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -230,12 +230,12 @@ describe("trait implementer and trait user both deployed in 2.1", () => { network, Accounts.WALLET_1, 2, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-21-22.spec.ts b/tests/integration/traits/trait-parameter-21-22.spec.ts index a1eb3bd..0a08e7c 100644 --- a/tests/integration/traits/trait-parameter-21-22.spec.ts +++ b/tests/integration/traits/trait-parameter-21-22.spec.ts @@ -62,7 +62,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -81,7 +81,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -106,7 +106,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -120,7 +120,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); let { response, transaction } = await deployContract( @@ -128,14 +128,14 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); ({ response, transaction } = await deployContract( @@ -143,7 +143,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -163,12 +163,12 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => network, Accounts.WALLET_1, 0, - { a: 2 } + { a: 2 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u2)"); }); @@ -179,7 +179,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -195,12 +195,12 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.2", () => network, Accounts.WALLET_1, 1, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-21-23.spec.ts b/tests/integration/traits/trait-parameter-21-23.spec.ts index 92843e9..ea18e2b 100644 --- a/tests/integration/traits/trait-parameter-21-23.spec.ts +++ b/tests/integration/traits/trait-parameter-21-23.spec.ts @@ -65,7 +65,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); let { response, transaction } = await deployContract( @@ -131,14 +131,14 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -146,7 +146,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -156,7 +156,7 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -168,12 +168,12 @@ describe("trait user deployed in 2.1, trait implementer deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-22-20.spec.ts b/tests/integration/traits/trait-parameter-22-20.spec.ts index 3d94d7e..22aba80 100644 --- a/tests/integration/traits/trait-parameter-22-20.spec.ts +++ b/tests/integration/traits/trait-parameter-22-20.spec.ts @@ -66,7 +66,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -85,7 +85,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -110,7 +110,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -129,14 +129,14 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); ({ response, transaction } = await deployContract( @@ -144,7 +144,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -154,7 +154,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -166,12 +166,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => network, Accounts.WALLET_1, 0, - { a: 2 } + { a: 2 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u2)"); }); @@ -182,7 +182,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -198,12 +198,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.2", () => network, Accounts.WALLET_1, 1, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-22-21.spec.ts b/tests/integration/traits/trait-parameter-22-21.spec.ts index d2d4733..9161fe1 100644 --- a/tests/integration/traits/trait-parameter-22-21.spec.ts +++ b/tests/integration/traits/trait-parameter-22-21.spec.ts @@ -62,7 +62,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -81,7 +81,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -106,7 +106,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -120,7 +120,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); let { response, transaction } = await deployContract( @@ -128,14 +128,14 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + 2 + timeline.epoch_2_2 + 2, ); ({ response, transaction } = await deployContract( @@ -143,7 +143,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -163,12 +163,12 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => network, Accounts.WALLET_1, 0, - { a: 2 } + { a: 2 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u2)"); }); @@ -179,7 +179,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -195,12 +195,12 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.2", () => network, Accounts.WALLET_1, 1, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-22-22.spec.ts b/tests/integration/traits/trait-parameter-22-22.spec.ts index beed543..4092702 100644 --- a/tests/integration/traits/trait-parameter-22-22.spec.ts +++ b/tests/integration/traits/trait-parameter-22-22.spec.ts @@ -62,7 +62,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -81,7 +81,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -106,7 +106,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -120,7 +120,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); let { response, transaction } = await deployContract( @@ -128,7 +128,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -138,7 +138,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -158,12 +158,12 @@ describe("trait implementer and trait user both deployed in 2.2", () => { network, Accounts.WALLET_1, 0, - { a: 2 } + { a: 2 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u2)"); }); @@ -174,7 +174,7 @@ describe("trait implementer and trait user both deployed in 2.2", () => { }); // Wait for the 2.3 activation, then check again await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + 2 + timeline.epoch_2_3 + 2, ); // Call the readonly function @@ -190,12 +190,12 @@ describe("trait implementer and trait user both deployed in 2.2", () => { network, Accounts.WALLET_1, 1, - { a: 3 } + { a: 3 }, ); expect(response.error).toBeUndefined(); let [_, tx] = await waitForStacksTransaction( orchestrator, - transaction.txid() + transaction.txid(), ); expect(tx.result).toEqual("(ok u3)"); }); diff --git a/tests/integration/traits/trait-parameter-22-23.spec.ts b/tests/integration/traits/trait-parameter-22-23.spec.ts index 12a8e73..dcea365 100644 --- a/tests/integration/traits/trait-parameter-22-23.spec.ts +++ b/tests/integration/traits/trait-parameter-22-23.spec.ts @@ -65,7 +65,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => // Wait for the 2.2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); let { response, transaction } = await deployContract( @@ -131,14 +131,14 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -146,7 +146,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -156,7 +156,7 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -168,12 +168,12 @@ describe("trait user deployed in 2.2, trait implementer deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-23-20.spec.ts b/tests/integration/traits/trait-parameter-23-20.spec.ts index 94c1619..c3acd74 100644 --- a/tests/integration/traits/trait-parameter-23-20.spec.ts +++ b/tests/integration/traits/trait-parameter-23-20.spec.ts @@ -65,7 +65,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -128,14 +128,14 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -143,7 +143,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -153,7 +153,7 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -165,12 +165,12 @@ describe("trait implementer deployed in 2.0, trait user deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-23-21.spec.ts b/tests/integration/traits/trait-parameter-23-21.spec.ts index bf37428..e3ab374 100644 --- a/tests/integration/traits/trait-parameter-23-21.spec.ts +++ b/tests/integration/traits/trait-parameter-23-21.spec.ts @@ -65,7 +65,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => // Wait for the 2.1 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_1 + timeline.epoch_2_1, ); let { response, transaction } = await deployContract( @@ -131,14 +131,14 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -146,7 +146,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -156,7 +156,7 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -168,12 +168,12 @@ describe("trait implementer deployed in 2.1, trait user deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-23-22.spec.ts b/tests/integration/traits/trait-parameter-23-22.spec.ts index 9488e63..7dd8703 100644 --- a/tests/integration/traits/trait-parameter-23-22.spec.ts +++ b/tests/integration/traits/trait-parameter-23-22.spec.ts @@ -65,7 +65,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => // Wait for the 2.2 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_2 + timeline.epoch_2_2, ); let { response, transaction } = await deployContract( @@ -131,14 +131,14 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => Accounts.DEPLOYER, 0, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); ({ response, transaction } = await deployContract( @@ -146,7 +146,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => Accounts.DEPLOYER, 1, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -156,7 +156,7 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -168,12 +168,12 @@ describe("trait implementer deployed in 2.2, trait user deployed in 2.3", () => network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/trait-parameter-23-23.spec.ts b/tests/integration/traits/trait-parameter-23-23.spec.ts index 602b817..5faeb67 100644 --- a/tests/integration/traits/trait-parameter-23-23.spec.ts +++ b/tests/integration/traits/trait-parameter-23-23.spec.ts @@ -65,7 +65,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { const callReadOnlyTestTraitCallFoo = ( network: StacksNetwork, - { a }: { a: number } + { a }: { a: number }, ) => { return callReadOnlyFunction({ contractName: "test-trait", @@ -84,7 +84,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { network: StacksNetwork, sender: Account, nonce: number, - { a }: { a: number } + { a }: { a: number }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -109,7 +109,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -123,7 +123,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { // Wait for the 2.3 activation await orchestrator.waitForStacksBlockAnchoredOnBitcoinBlockOfHeight( - timeline.epoch_2_3 + timeline.epoch_2_3, ); let { response, transaction } = await deployContract( @@ -131,7 +131,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -141,7 +141,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { Accounts.DEPLOYER, 1, "impl-trait", - codeBodyImplTrait + codeBodyImplTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -151,7 +151,7 @@ describe("trait user and trait implementer both deployed in 2.3", () => { // Call the readonly function let output = await callReadOnlyTestTraitFooArg(network); expect(output, cvToString(output)).toEqual( - contractPrincipalCV(contractAddress, "impl-trait") + contractPrincipalCV(contractAddress, "impl-trait"), ); // call public function as readonly @@ -163,12 +163,12 @@ describe("trait user and trait implementer both deployed in 2.3", () => { network, Accounts.WALLET_1, 0, - { a: 1 } + { a: 1 }, )); expect(response.error).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok u1)"); }); diff --git a/tests/integration/traits/traits-across-contracts.spec.ts b/tests/integration/traits/traits-across-contracts.spec.ts index fb116a9..3862b52 100644 --- a/tests/integration/traits/traits-across-contracts.spec.ts +++ b/tests/integration/traits/traits-across-contracts.spec.ts @@ -67,7 +67,7 @@ describe("traits across contracts", () => { network: StacksNetwork, sender: Account, nonce: number, - { traitImplName }: { traitImplName: string } + { traitImplName }: { traitImplName: string }, ) => { let callTxOptions: SignedContractCallOptions = { senderKey: sender.secretKey, @@ -91,7 +91,7 @@ describe("traits across contracts", () => { beforeAll(() => { orchestrator = buildDevnetNetworkOrchestrator( getNetworkIdFromEnv(), - timeline + timeline, ); orchestrator.start(); }); @@ -110,7 +110,7 @@ describe("traits across contracts", () => { Accounts.DEPLOYER, 0, "test-trait", - codeBodyTestTrait + codeBodyTestTrait, ); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -120,7 +120,7 @@ describe("traits across contracts", () => { Accounts.DEPLOYER, 1, "test-trait-2", - codeBodyTestTrait + codeBodyTestTrait, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -130,7 +130,7 @@ describe("traits across contracts", () => { Accounts.DEPLOYER, 2, "meta-contract", - codeBodyMetaContract + codeBodyMetaContract, )); expect(response.error).toBeUndefined(); await asyncExpectStacksTransactionSuccess(orchestrator, transaction.txid()); @@ -142,16 +142,16 @@ describe("traits across contracts", () => { network, Accounts.WALLET_1, 0, - { traitImplName: "test-trait" } + { traitImplName: "test-trait" }, )); // assert (ok true) expect( response.error, - JSON.stringify(response.reason_data) + JSON.stringify(response.reason) + JSON.stringify(response.reason_data) + JSON.stringify(response.reason), ).toBeUndefined(); let [_, tx] = await asyncExpectStacksTransactionSuccess( orchestrator, - transaction.txid() + transaction.txid(), ); expect((tx as StacksTransactionMetadata).result).toEqual("(ok true)"); @@ -159,12 +159,12 @@ describe("traits across contracts", () => { network, Accounts.WALLET_1, 1, - { traitImplName: "test-trait-2" } + { traitImplName: "test-trait-2" }, )); expect(response.error).toBe("transaction rejected"); expect(response.reason).toBe("BadFunctionArgument"); expect( - (response as BadFunctionArgumentRejection).reason_data?.message + (response as BadFunctionArgumentRejection).reason_data?.message, ).toBe('BadTraitImplementation("meta-trait", "call-foo")'); }); }); diff --git a/tests/testnet/checks.spec.ts b/tests/testnet/checks.spec.ts index ce3e6db..2552c22 100644 --- a/tests/testnet/checks.spec.ts +++ b/tests/testnet/checks.spec.ts @@ -14,8 +14,8 @@ const printPoxAddrInfo = (infoList: Record[]) => { let btcAddr = poxAddressToBtcAddress(info["pox-addr"], "testnet"); console.log( `Pox Address: ${btcAddr}, Stacker: ${cvToString( - info["stacker"] - )}, Amount: ${cvToString(info["total-ustx"])}` + info["stacker"], + )}, Amount: ${cvToString(info["total-ustx"])}`, ); }); }; @@ -30,15 +30,15 @@ describe("stack-increase", async () => { let aliceInfo = await callReadOnlystackerInfo( network, 3, - Accounts.WALLET_1 + Accounts.WALLET_1, ); console.log( "Alice", Accounts.WALLET_1.stxAddress, - Accounts.WALLET_1.btcAddress + Accounts.WALLET_1.btcAddress, ); console.log( - `https://mempool.space/testnet/address/${Accounts.WALLET_1.btcAddress}` + `https://mempool.space/testnet/address/${Accounts.WALLET_1.btcAddress}`, ); console.log(alice); console.log(cvToString(aliceInfo)); @@ -48,10 +48,10 @@ describe("stack-increase", async () => { console.log( "Bob", Accounts.WALLET_2.stxAddress, - Accounts.WALLET_2.btcAddress + Accounts.WALLET_2.btcAddress, ); console.log( - `https://mempool.space/testnet/address/${Accounts.WALLET_2.btcAddress}` + `https://mempool.space/testnet/address/${Accounts.WALLET_2.btcAddress}`, ); console.log(bob); console.log(cvToString(bobInfo)); @@ -60,15 +60,15 @@ describe("stack-increase", async () => { let chloeInfo = await callReadOnlystackerInfo( network, 3, - Accounts.WALLET_3 + Accounts.WALLET_3, ); console.log( "Chloe", Accounts.WALLET_3.stxAddress, - Accounts.WALLET_3.btcAddress + Accounts.WALLET_3.btcAddress, ); console.log( - `https://mempool.space/testnet/address/${Accounts.WALLET_3.btcAddress}` + `https://mempool.space/testnet/address/${Accounts.WALLET_3.btcAddress}`, ); console.log(chloe); console.log(cvToString(chloeInfo)); @@ -77,15 +77,15 @@ describe("stack-increase", async () => { let deployerInfo = await callReadOnlystackerInfo( network, 3, - Accounts.DEPLOYER + Accounts.DEPLOYER, ); console.log( "Deployer", Accounts.DEPLOYER.stxAddress, - Accounts.DEPLOYER.btcAddress + Accounts.DEPLOYER.btcAddress, ); console.log( - `https://mempool.space/testnet/address/${Accounts.DEPLOYER.btcAddress}` + `https://mempool.space/testnet/address/${Accounts.DEPLOYER.btcAddress}`, ); console.log(deployer); console.log(cvToString(deployerInfo)); @@ -95,10 +95,10 @@ describe("stack-increase", async () => { console.log( "Faucet", Accounts.FAUCET.stxAddress, - Accounts.FAUCET.btcAddress + Accounts.FAUCET.btcAddress, ); console.log( - `https://mempool.space/testnet/address/${Accounts.FAUCET.btcAddress}` + `https://mempool.space/testnet/address/${Accounts.FAUCET.btcAddress}`, ); console.log(faucet); console.log(cvToString(faucetInfo)); @@ -110,7 +110,7 @@ describe("stack-increase", async () => { let poxAddrs = await readRewardCyclePoxAddressList( network, 3, - poxInfo.current_cycle.id + poxInfo.current_cycle.id, ); console.log("current cycle poxAddrs:"); if (poxAddrs) { @@ -122,7 +122,7 @@ describe("stack-increase", async () => { poxAddrs = await readRewardCyclePoxAddressList( network, 3, - poxInfo.next_cycle.id + poxInfo.next_cycle.id, ); console.log("next cycle poxAddrs:"); if (poxAddrs) { diff --git a/tests/testnet/next-cycle-2.spec.ts b/tests/testnet/next-cycle-2.spec.ts index b6a2a73..06939f5 100644 --- a/tests/testnet/next-cycle-2.spec.ts +++ b/tests/testnet/next-cycle-2.spec.ts @@ -34,7 +34,7 @@ describe("stack-increase", async () => { stacker: Accounts.DEPLOYER, poolRewardAccount: Accounts.FAUCET, increaseByAmountUstx: 100_000_000_000_000, - } + }, ); console.log("Faucet increases deployer's stack: ", response); expect(response.error).toBeUndefined(); @@ -52,7 +52,7 @@ describe("stack-increase", async () => { stacker: Accounts.DEPLOYER, poolRewardAccount: Accounts.FAUCET, extendByCount: 6, - } + }, ); console.log("Faucet extends deployer's stack: ", response); expect(response.error).toBeUndefined(); diff --git a/tests/testnet/next-cycle.spec.ts b/tests/testnet/next-cycle.spec.ts index cae678b..bae5681 100644 --- a/tests/testnet/next-cycle.spec.ts +++ b/tests/testnet/next-cycle.spec.ts @@ -43,7 +43,7 @@ describe("stack-increase", async () => { fee, nonce: bobNonce++, }, - { cycles: 5 } + { cycles: 5 }, ); console.log("Bob extends 5 cycles response: ", response); expect(response.error).toBeUndefined(); @@ -57,7 +57,7 @@ describe("stack-increase", async () => { fee, nonce: chloeNonce++, }, - { amount: 81_000_000_000_000 } + { amount: 81_000_000_000_000 }, ); console.log("Chloe increases 81M response: ", response); expect(response.error).toBeUndefined(); @@ -88,7 +88,7 @@ describe("stack-increase", async () => { poolRewardAccount: Accounts.FAUCET, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); console.log("Faucet tries to stack Alice's 50m STX response: ", response); expect(response.error).toBeUndefined(); @@ -113,7 +113,7 @@ describe("stack-increase", async () => { fee, nonce: deployerNonce++, }, - { amount: 300_000_000_000_000, poolAddress: Accounts.FAUCET } + { amount: 300_000_000_000_000, poolAddress: Accounts.FAUCET }, ); console.log("Deployer re-delegates 300m to faucet pool: ", response); expect(response.error).toBeUndefined(); @@ -131,7 +131,7 @@ describe("stack-increase", async () => { stacker: Accounts.DEPLOYER, poolRewardAccount: Accounts.FAUCET, increaseByAmountUstx: 100_000_000_000_000, - } + }, ); console.log("Faucet increases deployer's stack: ", response); expect(response.error).toBeUndefined(); @@ -149,7 +149,7 @@ describe("stack-increase", async () => { stacker: Accounts.DEPLOYER, poolRewardAccount: Accounts.FAUCET, extendByCount: 6, - } + }, ); console.log("Faucet extends deployer's stack: ", response); expect(response.error).toBeUndefined(); diff --git a/tests/testnet/setup.spec.ts b/tests/testnet/setup.spec.ts index 4780e2a..2e92e19 100644 --- a/tests/testnet/setup.spec.ts +++ b/tests/testnet/setup.spec.ts @@ -42,7 +42,7 @@ describe("stack-increase", async () => { fee, nonce: aliceNonce++, }, - { amount: 75_000_000_000_000, blockHeight, cycles: 3 } + { amount: 75_000_000_000_000, blockHeight, cycles: 3 }, ); console.log("Alice stacks 75m response: ", response); expect(response.error).toBeUndefined(); @@ -56,7 +56,7 @@ describe("stack-increase", async () => { fee, nonce: aliceNonce++, }, - { amount: 50_000_000_000_000, poolAddress: Accounts.FAUCET } + { amount: 50_000_000_000_000, poolAddress: Accounts.FAUCET }, ); console.log("Alice delegates 50m response: ", response); expect(response.error).toBeUndefined(); @@ -76,7 +76,7 @@ describe("stack-increase", async () => { poolRewardAccount: Accounts.FAUCET, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); console.log("Faucet tries to stack Alice's 50m STX response: ", response); expect(response.error).toBeUndefined(); @@ -92,11 +92,11 @@ describe("stack-increase", async () => { fee: fee, nonce: faucetNonce++, }, - { poolRewardAccount: Accounts.FAUCET, cycleId: poxInfo.next_cycle.id } + { poolRewardAccount: Accounts.FAUCET, cycleId: poxInfo.next_cycle.id }, ); console.log( "Faucet tries to commit 50m for next cycle response: ", - response + response, ); expect(response.error).toBeUndefined(); @@ -109,7 +109,7 @@ describe("stack-increase", async () => { fee, nonce: bobNonce++, }, - { amount: 800_000_000_000_000, blockHeight, cycles: 1 } + { amount: 800_000_000_000_000, blockHeight, cycles: 1 }, ); console.log("Bob stacks 800M response: ", response); expect(response.error).toBeUndefined(); @@ -123,7 +123,7 @@ describe("stack-increase", async () => { fee, nonce: chloeNonce++, }, - { amount: 100_000_000_000_000, blockHeight, cycles: 1 } + { amount: 100_000_000_000_000, blockHeight, cycles: 1 }, ); console.log("Chloe stacks 100M response: ", response); expect(response.error).toBeUndefined(); @@ -137,7 +137,7 @@ describe("stack-increase", async () => { fee, nonce: chloeNonce++, }, - { amount: 20_000_000_000_000 } + { amount: 20_000_000_000_000 }, ); console.log("Chloe increases 20M response: ", response); expect(response.error).toBeUndefined(); @@ -151,7 +151,7 @@ describe("stack-increase", async () => { fee, nonce: deployerNonce++, }, - { amount: 200_000_000_000_000, poolAddress: Accounts.FAUCET } + { amount: 200_000_000_000_000, poolAddress: Accounts.FAUCET }, ); console.log("Deployer delegates 200m to faucet pool: ", response); expect(response.error).toBeUndefined(); @@ -171,7 +171,7 @@ describe("stack-increase", async () => { poolRewardAccount: Accounts.FAUCET, startBurnHeight: blockHeight, lockPeriodCycles: 1, - } + }, ); console.log("Faucet stacks deployers's 200m STX: ", response); expect(response.error).toBeUndefined(); @@ -185,7 +185,7 @@ describe("stack-increase", async () => { fee: fee, nonce: faucetNonce++, }, - { poolRewardAccount: Accounts.FAUCET, cycleId: poxInfo.next_cycle.id } + { poolRewardAccount: Accounts.FAUCET, cycleId: poxInfo.next_cycle.id }, ); console.log("Faucet commits for next cycle: ", response); expect(response.error).toBeUndefined();