From 5b8892b2455e6c12f1f95ec1ce8fa42993960f13 Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Fri, 2 Aug 2024 11:50:12 +0200 Subject: [PATCH 1/2] feat: clarity 3 support --- Clarinet.toml | 4 +- contracts/counter.clar | 2 +- deployments/default.devnet-plan.yaml | 6 +- deployments/default.simnet-plan.yaml | 4 +- package-lock.json | 163 ++------------------------- package.json | 2 +- settings/Devnet.toml | 16 +-- tests/counter.test.ts | 18 +-- 8 files changed, 36 insertions(+), 179 deletions(-) diff --git a/Clarinet.toml b/Clarinet.toml index 0343f19..ca0758c 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -8,8 +8,8 @@ requirements = [] [contracts.counter] path = 'contracts/counter.clar' -clarity_version = 2 -epoch = 2.5 +epoch = 3.0 +clarity_version = 3 [repl.analysis] passes = ['check_checker'] diff --git a/contracts/counter.clar b/contracts/counter.clar index cd41294..b9dcec1 100644 --- a/contracts/counter.clar +++ b/contracts/counter.clar @@ -13,7 +13,7 @@ (define-read-only (get-count-at-block (block uint)) (ok (at-block - (unwrap! (get-block-info? id-header-hash block) ERR_BLOCK_NOT_FOUND) + (unwrap! (get-stacks-block-info? id-header-hash block) ERR_BLOCK_NOT_FOUND) (var-get count) )) ) diff --git a/deployments/default.devnet-plan.yaml b/deployments/default.devnet-plan.yaml index 424a21c..59fb312 100644 --- a/deployments/default.devnet-plan.yaml +++ b/deployments/default.devnet-plan.yaml @@ -11,8 +11,8 @@ plan: - contract-publish: contract-name: counter expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10760 + cost: 10830 path: contracts/counter.clar anchor-block-only: true - clarity-version: 2 - epoch: "2.5" + clarity-version: 3 + epoch: "3.0" diff --git a/deployments/default.simnet-plan.yaml b/deployments/default.simnet-plan.yaml index beb91c2..9b72a2e 100644 --- a/deployments/default.simnet-plan.yaml +++ b/deployments/default.simnet-plan.yaml @@ -53,7 +53,7 @@ plan: contract-name: counter emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/counter.clar - clarity-version: 2 + clarity-version: 3 - emulated-contract-call: contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.counter emulated-sender: ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5 @@ -65,4 +65,4 @@ plan: mstx-amount: 2222222 cost: 1000 anchor-block-only: true - epoch: "2.5" + epoch: "3.0" diff --git a/package-lock.json b/package-lock.json index 5699d09..1d7a388 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@hirosystems/clarinet-sdk": "^2.7.0", + "@hirosystems/clarinet-sdk": "^2.8.0", "@stacks/transactions": "^6.8.1", "chokidar-cli": "^3.0.0", "typescript": "^5.3.3", @@ -387,15 +387,12 @@ } }, "node_modules/@hirosystems/clarinet-sdk": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@hirosystems/clarinet-sdk/-/clarinet-sdk-2.7.0.tgz", - "integrity": "sha512-JF2l5l3XM/q/GzkQDSlPYQp1KRDgNqcfvArEEtukJHdT8G7OMzjo1mUFK1/qbDitTgWXdSL8f6dg+YZ1DQaCCA==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@hirosystems/clarinet-sdk/-/clarinet-sdk-2.8.0.tgz", + "integrity": "sha512-/xxct6Q+TB+WoD/Qc/Y4Oq4vgLybs4EmBWdqmVl7P9ocUxt39qTXpWHUg/AdprCtWHTe4WywmrNAiMHbf6Bc9w==", "license": "GPL-3.0", "dependencies": { - "@hirosystems/clarinet-sdk-wasm": "^2.7.0", - "@stacks/encryption": "^6.13.0", - "@stacks/network": "^6.13.0", - "@stacks/stacking": "^6.13.0", + "@hirosystems/clarinet-sdk-wasm": "^2.8.0", "@stacks/transactions": "^6.13.0", "kolorist": "^1.8.0", "prompts": "^2.4.2", @@ -403,16 +400,16 @@ "yargs": "^17.7.2" }, "bin": { - "clarinet-sdk": "dist/cjs/bin/index.js" + "clarinet-sdk": "dist/cjs/node/src/bin/index.js" }, "engines": { "node": ">=18.0.0" } }, "node_modules/@hirosystems/clarinet-sdk-wasm": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/@hirosystems/clarinet-sdk-wasm/-/clarinet-sdk-wasm-2.7.0.tgz", - "integrity": "sha512-Uz4/fx7rGC6hkR+Th44p+damQNvWX+WgwJliStL/WShdI/q7SLtYLkz3EGMLX0f/xv7hZ8H6X5fyE3Ca+RFt2Q==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/@hirosystems/clarinet-sdk-wasm/-/clarinet-sdk-wasm-2.8.0.tgz", + "integrity": "sha512-Lkr7YHzirierK50fTKTtVpXUvvUfPT+U70bDzB+13oK3NUtWG18zq6JNQ5A2NLWniU/szPJ4M9C63ba7+U091Q==", "license": "GPL-3.0" }, "node_modules/@jest/schemas": { @@ -665,31 +662,6 @@ "win32" ] }, - "node_modules/@scure/base": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.7.tgz", - "integrity": "sha512-PPNYBslrLNNUQ/Yad37MHYsNQtK67EhWb6WtSvNLLPo7SdVZgkUjD6Dg+5On7zNwmskf8OX7I7Nx5oN+MIWE0g==", - "license": "MIT", - "funding": { - "url": "https://paulmillr.com/funding/" - } - }, - "node_modules/@scure/bip39": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.1.0.tgz", - "integrity": "sha512-pwrPOS16VeTKg98dYXQyIjJEcWfz7/1YJIwxUEPFfQPtc86Ym/1sVgQ2RLoD43AazMk2l/unK4ITySSpW2+82w==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT", - "dependencies": { - "@noble/hashes": "~1.1.1", - "@scure/base": "~1.1.0" - } - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -706,23 +678,6 @@ "@types/node": "^18.0.4" } }, - "node_modules/@stacks/encryption": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/@stacks/encryption/-/encryption-6.16.0.tgz", - "integrity": "sha512-RfCtUts+fWKgL9X9VF4Ob+r7uSNApawnpq+flUJHehzzw3vEEPbkXQnJmXKS0Y9pz74YZqOegExbQIvcRPUkyw==", - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.1.5", - "@noble/secp256k1": "1.7.1", - "@scure/bip39": "1.1.0", - "@stacks/common": "^6.16.0", - "@types/node": "^18.0.4", - "base64-js": "^1.5.1", - "bs58": "^5.0.0", - "ripemd160-min": "^0.0.6", - "varuint-bitcoin": "^1.1.2" - } - }, "node_modules/@stacks/network": { "version": "6.16.0", "resolved": "https://registry.npmjs.org/@stacks/network/-/network-6.16.0.tgz", @@ -733,40 +688,6 @@ "cross-fetch": "^3.1.5" } }, - "node_modules/@stacks/stacking": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/@stacks/stacking/-/stacking-6.16.0.tgz", - "integrity": "sha512-FjhKYyaCu/KytP/khWB9KhNOOrZdqM56xn9yxvZCR6McGSZ+hBeLud1E2WugIOzRX0muZbygCz9c1GBTz+pLiA==", - "license": "MIT", - "dependencies": { - "@noble/hashes": "1.1.5", - "@scure/base": "1.1.1", - "@stacks/common": "^6.16.0", - "@stacks/encryption": "^6.16.0", - "@stacks/network": "^6.16.0", - "@stacks/stacks-blockchain-api-types": "^0.61.0", - "@stacks/transactions": "^6.16.0", - "bs58": "^5.0.0" - } - }, - "node_modules/@stacks/stacking/node_modules/@scure/base": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz", - "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==", - "funding": [ - { - "type": "individual", - "url": "https://paulmillr.com/funding/" - } - ], - "license": "MIT" - }, - "node_modules/@stacks/stacks-blockchain-api-types": { - "version": "0.61.0", - "resolved": "https://registry.npmjs.org/@stacks/stacks-blockchain-api-types/-/stacks-blockchain-api-types-0.61.0.tgz", - "integrity": "sha512-yPOfTUboo5eA9BZL/hqMcM71GstrFs9YWzOrJFPeP4cOO1wgYvAcckgBRbgiE3NqeX0A7SLZLDAXLZbATuRq9w==", - "license": "ISC" - }, "node_modules/@stacks/transactions": { "version": "6.16.0", "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.16.0.tgz", @@ -947,26 +868,6 @@ "integrity": "sha512-FuwxlW4H5kh37X/oW59pwTzzTKRzfrrQwhmyspRM7swOEZcHtDZSCt45U6oKgtuFE+WYPblePMVIPR4RZrh/hw==", "license": "MIT" }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/binary-extensions": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", @@ -991,15 +892,6 @@ "node": ">=8" } }, - "node_modules/bs58": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/bs58/-/bs58-5.0.0.tgz", - "integrity": "sha512-r+ihvQJvahgYT50JD05dyJNKlmmSlMoOGwn1lCcEzanPglg7TxYjioQUYehQ9mAR/+hOSd2jRc/Z2y5UxBymvQ==", - "license": "MIT", - "dependencies": { - "base-x": "^4.0.0" - } - }, "node_modules/c32check": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/c32check/-/c32check-2.0.0.tgz", @@ -1984,14 +1876,6 @@ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "license": "ISC" }, - "node_modules/ripemd160-min": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/ripemd160-min/-/ripemd160-min-0.0.6.tgz", - "integrity": "sha512-+GcJgQivhs6S9qvLogusiTcS9kQUfgR75whKuy5jIhuiOfQuJ8fjqxV6EGD5duH1Y/FawFUMtMhyeq3Fbnib8A==", - "engines": { - "node": ">=8" - } - }, "node_modules/rollup": { "version": "4.18.0", "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz", @@ -2027,26 +1911,6 @@ "fsevents": "~2.3.2" } }, - "node_modules/safe-buffer": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/set-blocking": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", @@ -2245,15 +2109,6 @@ "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", "license": "MIT" }, - "node_modules/varuint-bitcoin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz", - "integrity": "sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==", - "license": "MIT", - "dependencies": { - "safe-buffer": "^5.1.1" - } - }, "node_modules/vite": { "version": "5.3.3", "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz", diff --git a/package.json b/package.json index 2c0507e..f920ff8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "author": "", "license": "ISC", "dependencies": { - "@hirosystems/clarinet-sdk": "^2.7.0", + "@hirosystems/clarinet-sdk": "^2.8.0", "@stacks/transactions": "^6.8.1", "chokidar-cli": "^3.0.0", "typescript": "^5.3.3", diff --git a/settings/Devnet.toml b/settings/Devnet.toml index 10ca3e1..8519957 100644 --- a/settings/Devnet.toml +++ b/settings/Devnet.toml @@ -75,11 +75,15 @@ balance = 100_000_000_000_000 [devnet] disable_stacks_explorer = false disable_stacks_api = false -bitcoin_controller_block_time = 6000 -# stacks_node_image_url = "localhost:5001/stacks-node:local" -# stacks_signer_image_url = "localhost:5001/stacks-signer:local" -# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-2.5" -# stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-2.5" +bitcoin_controller_block_time = 6_000 + +epoch_3_0 = 144 + +stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-3.0" +stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-3.0" + + +# use_docker_gateway_routing = true # disable_bitcoin_explorer = true # working_dir = "tmp/devnet" @@ -102,7 +106,6 @@ bitcoin_controller_block_time = 6000 # bitcoin_node_image_url = "quay.io/hirosystems/bitcoind:devnet-v2" # stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-with-signer-beta4" # stacks_signer_image_url = "quay.io/hirosystems/stacks-node:devnet-with-signer-beta4" -# stacks_api_image_url = "hirosystems/stacks-blockchain-api:7.9.0-nakamoto.1" # stacks_explorer_image_url = "hirosystems/explorer:latest" # bitcoin_explorer_image_url = "quay.io/hirosystems/bitcoin-explorer:devnet" # postgres_image_url = "postgres:14" @@ -113,7 +116,6 @@ bitcoin_controller_block_time = 6000 # epoch_2_2 = 104 # epoch_2_3 = 105 # epoch_2_4 = 106 -# epoch_3_0 = 124 # Send some stacking orders [[devnet.pox_stacking_orders]] diff --git a/tests/counter.test.ts b/tests/counter.test.ts index 37d029a..d27516f 100644 --- a/tests/counter.test.ts +++ b/tests/counter.test.ts @@ -26,7 +26,7 @@ describe("test get counter", () => { "counter", "get-count", [], - address1 + address1, ); expect(result).toHaveClarityType(ClarityType.UInt); @@ -46,7 +46,7 @@ describe("test ", () => { "counter", "increment", [], - address1 + address1, ); expect(result).toBeOk(Cl.bool(true)); @@ -59,7 +59,7 @@ describe("test ", () => { "counter", "increment", [], - address1 + address1, ); expect(events.length).toBe(1); const transferEvent = events[0]; @@ -98,7 +98,7 @@ describe("test ", () => { "counter", "decrement", [], - address1 + address1, ); expect(result).toBeErr(Cl.uint(1001)); }); @@ -110,7 +110,7 @@ describe("test ", () => { "counter", "add", [Cl.uint(3)], - address1 + address1, ); expect(result).toBeOk(Cl.bool(true)); @@ -123,7 +123,7 @@ describe("test ", () => { "counter", "add", [Cl.uint(3)], - address1 + address1, ); expect(events.length).toBe(1); @@ -141,7 +141,7 @@ describe("test ", () => { "counter", "add", [Cl.uint(1)], - address1 + address1, ); expect(result).toBeErr(Cl.uint(1002)); }); @@ -158,14 +158,14 @@ describe("test get counter at block height", () => { "counter", "get-count-at-block", [height1], - address1 + address1, ); expect(atBlock1.result).toBeOk(Cl.uint(initialCount)); const atBlock2 = simnet.callReadOnlyFn( "counter", "get-count-at-block", [height2], - address1 + address1, ); expect(atBlock2.result).toBeOk(Cl.uint(initialCount + 1)); }); From 7e0bd7e9f7ce31d663192a885bd1aff173d097cf Mon Sep 17 00:00:00 2001 From: Hugo Caillard <911307+hugocaillard@users.noreply.github.com> Date: Mon, 16 Sep 2024 17:46:56 +0200 Subject: [PATCH 2/2] --wip-- [skip ci] --- Clarinet.toml | 9 +- contracts/counter.clar | 12 +- deployments/default.devnet-plan.yaml | 12 +- deployments/default.simnet-plan.yaml | 11 -- package-lock.json | 216 +++++++++++++-------------- settings/Devnet.toml | 67 ++++----- tests/counter.test.ts | 1 + 7 files changed, 145 insertions(+), 183 deletions(-) diff --git a/Clarinet.toml b/Clarinet.toml index ca0758c..2416d53 100644 --- a/Clarinet.toml +++ b/Clarinet.toml @@ -4,12 +4,11 @@ description = '' authors = [] telemetry = false cache_dir = './.cache' -requirements = [] -[contracts.counter] -path = 'contracts/counter.clar' -epoch = 3.0 -clarity_version = 3 +# [contracts.counter] +# path = 'contracts/counter.clar' +# clarity_version = 3 +# epoch = 3.0 [repl.analysis] passes = ['check_checker'] diff --git a/contracts/counter.clar b/contracts/counter.clar index b9dcec1..1fda57d 100644 --- a/contracts/counter.clar +++ b/contracts/counter.clar @@ -11,12 +11,12 @@ (var-get count) ) -(define-read-only (get-count-at-block (block uint)) - (ok (at-block - (unwrap! (get-stacks-block-info? id-header-hash block) ERR_BLOCK_NOT_FOUND) - (var-get count) - )) -) +;; (define-read-only (get-count-at-block (block uint)) +;; (ok (at-block +;; (unwrap! (get-stacks-block-info? id-header-hash block) ERR_BLOCK_NOT_FOUND) +;; (var-get count) +;; )) +;; ) (define-public (increment) (begin diff --git a/deployments/default.devnet-plan.yaml b/deployments/default.devnet-plan.yaml index 59fb312..abfa45a 100644 --- a/deployments/default.devnet-plan.yaml +++ b/deployments/default.devnet-plan.yaml @@ -5,14 +5,4 @@ network: devnet stacks-node: "http://localhost:20443" bitcoin-node: "http://devnet:devnet@localhost:18443" plan: - batches: - - id: 0 - transactions: - - contract-publish: - contract-name: counter - expected-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM - cost: 10830 - path: contracts/counter.clar - anchor-block-only: true - clarity-version: 3 - epoch: "3.0" + batches: [] diff --git a/deployments/default.simnet-plan.yaml b/deployments/default.simnet-plan.yaml index 9b72a2e..9e22555 100644 --- a/deployments/default.simnet-plan.yaml +++ b/deployments/default.simnet-plan.yaml @@ -54,15 +54,4 @@ plan: emulated-sender: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM path: contracts/counter.clar clarity-version: 3 - - emulated-contract-call: - contract-id: ST1PQHQKV0RJXZFY1DGX8MNSNYVE3VGZJSRTPGZGM.counter - emulated-sender: ST1SJ3DTE5DN7X54YDH5D64R3BCB6A2AG2ZQ8YPD5 - method: increment - parameters: [] - - stx-transfer: - expected-sender: ST3PF13W7Z0RRM42A8VZRVFQ75SV1K26RXEP8YGKJ - recipient: ST3NBRSFKX28FQ2ZJ1MAKX58HKHSDGNV5N7R21XCP - mstx-amount: 2222222 - cost: 1000 - anchor-block-only: true epoch: "3.0" diff --git a/package-lock.json b/package-lock.json index 1d7a388..36113fc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -425,9 +425,9 @@ } }, "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", "license": "MIT" }, "node_modules/@noble/hashes": { @@ -455,9 +455,9 @@ "license": "MIT" }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.18.0.tgz", - "integrity": "sha512-Tya6xypR10giZV1XzxmH5wr25VcZSncG0pZIjfePT0OVBvqNEurzValetGNarVrGiq66EBVAFn15iYX4w6FKgQ==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.20.0.tgz", + "integrity": "sha512-TSpWzflCc4VGAUJZlPpgAJE1+V60MePDQnBd7PPkpuEmOy8i87aL6tinFGKBFKuEDikYpig72QzdT3QPYIi+oA==", "cpu": [ "arm" ], @@ -468,9 +468,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.18.0.tgz", - "integrity": "sha512-avCea0RAP03lTsDhEyfy+hpfr85KfyTctMADqHVhLAF3MlIkq83CP8UfAHUssgXTYd+6er6PaAhx/QGv4L1EiA==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.20.0.tgz", + "integrity": "sha512-u00Ro/nok7oGzVuh/FMYfNoGqxU5CPWz1mxV85S2w9LxHR8OoMQBuSk+3BKVIDYgkpeOET5yXkx90OYFc+ytpQ==", "cpu": [ "arm64" ], @@ -481,9 +481,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.18.0.tgz", - "integrity": "sha512-IWfdwU7KDSm07Ty0PuA/W2JYoZ4iTj3TUQjkVsO/6U+4I1jN5lcR71ZEvRh52sDOERdnNhhHU57UITXz5jC1/w==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.20.0.tgz", + "integrity": "sha512-uFVfvzvsdGtlSLuL0ZlvPJvl6ZmrH4CBwLGEFPe7hUmf7htGAN+aXo43R/V6LATyxlKVC/m6UsLb7jbG+LG39Q==", "cpu": [ "arm64" ], @@ -494,9 +494,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.18.0.tgz", - "integrity": "sha512-n2LMsUz7Ynu7DoQrSQkBf8iNrjOGyPLrdSg802vk6XT3FtsgX6JbE8IHRvposskFm9SNxzkLYGSq9QdpLYpRNA==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.20.0.tgz", + "integrity": "sha512-xbrMDdlev53vNXexEa6l0LffojxhqDTBeL+VUxuuIXys4x6xyvbKq5XqTXBCEUA8ty8iEJblHvFaWRJTk/icAQ==", "cpu": [ "x64" ], @@ -507,9 +507,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.18.0.tgz", - "integrity": "sha512-C/zbRYRXFjWvz9Z4haRxcTdnkPt1BtCkz+7RtBSuNmKzMzp3ZxdM28Mpccn6pt28/UWUCTXa+b0Mx1k3g6NOMA==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.20.0.tgz", + "integrity": "sha512-jMYvxZwGmoHFBTbr12Xc6wOdc2xA5tF5F2q6t7Rcfab68TT0n+r7dgawD4qhPEvasDsVpQi+MgDzj2faOLsZjA==", "cpu": [ "arm" ], @@ -520,9 +520,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.18.0.tgz", - "integrity": "sha512-l3m9ewPgjQSXrUMHg93vt0hYCGnrMOcUpTz6FLtbwljo2HluS4zTXFy2571YQbisTnfTKPZ01u/ukJdQTLGh9A==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.20.0.tgz", + "integrity": "sha512-1asSTl4HKuIHIB1GcdFHNNZhxAYEdqML/MW4QmPS4G0ivbEcBr1JKlFLKsIRqjSwOBkdItn3/ZDlyvZ/N6KPlw==", "cpu": [ "arm" ], @@ -533,9 +533,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.18.0.tgz", - "integrity": "sha512-rJ5D47d8WD7J+7STKdCUAgmQk49xuFrRi9pZkWoRD1UeSMakbcepWXPF8ycChBoAqs1pb2wzvbY6Q33WmN2ftw==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.20.0.tgz", + "integrity": "sha512-COBb8Bkx56KldOYJfMf6wKeYJrtJ9vEgBRAOkfw6Ens0tnmzPqvlpjZiLgkhg6cA3DGzCmLmmd319pmHvKWWlQ==", "cpu": [ "arm64" ], @@ -546,9 +546,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.18.0.tgz", - "integrity": "sha512-be6Yx37b24ZwxQ+wOQXXLZqpq4jTckJhtGlWGZs68TgdKXJgw54lUUoFYrg6Zs/kjzAQwEwYbp8JxZVzZLRepQ==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.20.0.tgz", + "integrity": "sha512-+it+mBSyMslVQa8wSPvBx53fYuZK/oLTu5RJoXogjk6x7Q7sz1GNRsXWjn6SwyJm8E/oMjNVwPhmNdIjwP135Q==", "cpu": [ "arm64" ], @@ -559,9 +559,9 @@ ] }, "node_modules/@rollup/rollup-linux-powerpc64le-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.18.0.tgz", - "integrity": "sha512-hNVMQK+qrA9Todu9+wqrXOHxFiD5YmdEi3paj6vP02Kx1hjd2LLYR2eaN7DsEshg09+9uzWi2W18MJDlG0cxJA==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.20.0.tgz", + "integrity": "sha512-yAMvqhPfGKsAxHN8I4+jE0CpLWD8cv4z7CK7BMmhjDuz606Q2tFKkWRY8bHR9JQXYcoLfopo5TTqzxgPUjUMfw==", "cpu": [ "ppc64" ], @@ -572,9 +572,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.18.0.tgz", - "integrity": "sha512-ROCM7i+m1NfdrsmvwSzoxp9HFtmKGHEqu5NNDiZWQtXLA8S5HBCkVvKAxJ8U+CVctHwV2Gb5VUaK7UAkzhDjlg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.20.0.tgz", + "integrity": "sha512-qmuxFpfmi/2SUkAw95TtNq/w/I7Gpjurx609OOOV7U4vhvUhBcftcmXwl3rqAek+ADBwSjIC4IVNLiszoj3dPA==", "cpu": [ "riscv64" ], @@ -585,9 +585,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.18.0.tgz", - "integrity": "sha512-0UyyRHyDN42QL+NbqevXIIUnKA47A+45WyasO+y2bGJ1mhQrfrtXUpTxCOrfxCR4esV3/RLYyucGVPiUsO8xjg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.20.0.tgz", + "integrity": "sha512-I0BtGXddHSHjV1mqTNkgUZLnS3WtsqebAXv11D5BZE/gfw5KoyXSAXVqyJximQXNvNzUo4GKlCK/dIwXlz+jlg==", "cpu": [ "s390x" ], @@ -598,9 +598,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.18.0.tgz", - "integrity": "sha512-xuglR2rBVHA5UsI8h8UbX4VJ470PtGCf5Vpswh7p2ukaqBGFTnsfzxUBetoWBWymHMxbIG0Cmx7Y9qDZzr648w==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.20.0.tgz", + "integrity": "sha512-y+eoL2I3iphUg9tN9GB6ku1FA8kOfmF4oUEWhztDJ4KXJy1agk/9+pejOuZkNFhRwHAOxMsBPLbXPd6mJiCwew==", "cpu": [ "x64" ], @@ -611,9 +611,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.18.0.tgz", - "integrity": "sha512-LKaqQL9osY/ir2geuLVvRRs+utWUNilzdE90TpyoX0eNqPzWjRm14oMEE+YLve4k/NAqCdPkGYDaDF5Sw+xBfg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.20.0.tgz", + "integrity": "sha512-hM3nhW40kBNYUkZb/r9k2FKK+/MnKglX7UYd4ZUy5DJs8/sMsIbqWK2piZtVGE3kcXVNj3B2IrUYROJMMCikNg==", "cpu": [ "x64" ], @@ -624,9 +624,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.18.0.tgz", - "integrity": "sha512-7J6TkZQFGo9qBKH0pk2cEVSRhJbL6MtfWxth7Y5YmZs57Pi+4x6c2dStAUvaQkHQLnEQv1jzBUW43GvZW8OFqA==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.20.0.tgz", + "integrity": "sha512-psegMvP+Ik/Bg7QRJbv8w8PAytPA7Uo8fpFjXyCRHWm6Nt42L+JtoqH8eDQ5hRP7/XW2UiIriy1Z46jf0Oa1kA==", "cpu": [ "arm64" ], @@ -637,9 +637,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.18.0.tgz", - "integrity": "sha512-Txjh+IxBPbkUB9+SXZMpv+b/vnTEtFyfWZgJ6iyCmt2tdx0OF5WhFowLmnh8ENGNpfUlUZkdI//4IEmhwPieNg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.20.0.tgz", + "integrity": "sha512-GabekH3w4lgAJpVxkk7hUzUf2hICSQO0a/BLFA11/RMxQT92MabKAqyubzDZmMOC/hcJNlc+rrypzNzYl4Dx7A==", "cpu": [ "ia32" ], @@ -650,9 +650,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.18.0.tgz", - "integrity": "sha512-UOo5FdvOL0+eIVTgS4tIdbW+TtnBLWg1YBCcU2KWM7nuNwRz9bksDX1bekJJCpu25N1DVWaCwnT39dVQxzqS8g==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.20.0.tgz", + "integrity": "sha512-aJ1EJSuTdGnM6qbVC4B5DSmozPTqIag9fSzXRNNo+humQLG89XpPgdt16Ia56ORD7s+H8Pmyx44uczDQ0yDzpg==", "cpu": [ "x64" ], @@ -689,9 +689,9 @@ } }, "node_modules/@stacks/transactions": { - "version": "6.16.0", - "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.16.0.tgz", - "integrity": "sha512-Jg639oYjRkGPDGtcVTRIuuEksa8CYTgmkLdKnDwHhce8WYDWcofVjhdk/sU9vaLKJ9EDOTnX773T8yBR95uXrw==", + "version": "6.16.1", + "resolved": "https://registry.npmjs.org/@stacks/transactions/-/transactions-6.16.1.tgz", + "integrity": "sha512-yCtUM+8IN0QJbnnlFhY1wBW7Q30Cxje3Zmy8DgqdBoM/EPPWadez/8wNWFANVAMyUZeQ9V/FY+8MAw4E+pCReA==", "license": "MIT", "dependencies": { "@noble/hashes": "1.1.5", @@ -718,9 +718,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.39", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.39.tgz", - "integrity": "sha512-nPwTRDKUctxw3di5b4TfT3I0sWDiWoPQCZjXhvdkINntwr8lcoVCKsTgnXeRubKIlfnV+eN/HYk6Jb40tbcEAQ==", + "version": "18.19.43", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.43.tgz", + "integrity": "sha512-Mw/YlgXnyJdEwLoFv2dpuJaDFriX+Pc+0qOBJ57jC1H6cDxIj2xc5yUrdtArDVG0m+KV6622a4p2tenEqB3C/g==", "license": "MIT", "dependencies": { "undici-types": "~5.26.4" @@ -924,9 +924,9 @@ } }, "node_modules/chai": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", - "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", + "integrity": "sha512-RITGBfijLkBddZvnn8jdqoTypxvqbOLYQkGGxXzeFjVHvudaPw0HNFD9x928/eUwYWd2dPCugVqspGALTZZQKw==", "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", @@ -935,7 +935,7 @@ "get-func-name": "^2.0.2", "loupe": "^2.3.6", "pathval": "^1.1.1", - "type-detect": "^4.0.8" + "type-detect": "^4.1.0" }, "engines": { "node": ">=4" @@ -1175,9 +1175,9 @@ } }, "node_modules/debug": { - "version": "4.3.5", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", - "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -1542,12 +1542,12 @@ } }, "node_modules/magic-string": { - "version": "0.30.10", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz", - "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==", + "version": "0.30.11", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.11.tgz", + "integrity": "sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==", "license": "MIT", "dependencies": { - "@jridgewell/sourcemap-codec": "^1.4.15" + "@jridgewell/sourcemap-codec": "^1.5.0" } }, "node_modules/merge-stream": { @@ -1789,9 +1789,9 @@ } }, "node_modules/postcss": { - "version": "8.4.39", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.39.tgz", - "integrity": "sha512-0vzE+lAiG7hZl1/9I8yzKLx3aR9Xbof3fBHKunvMfOCYAtMhrsnccJY2iTURb9EZd5+pLuiNV9/c/GZJOHsgIw==", + "version": "8.4.41", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", + "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", "funding": [ { "type": "opencollective", @@ -1877,9 +1877,9 @@ "license": "ISC" }, "node_modules/rollup": { - "version": "4.18.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz", - "integrity": "sha512-QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==", + "version": "4.20.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.20.0.tgz", + "integrity": "sha512-6rbWBChcnSGzIlXeIdNIZTopKYad8ZG8ajhl78lGRLsI2rX8IkaotQhVas2Ma+GPxJav19wrSzvRvuiv0YKzWw==", "license": "MIT", "dependencies": { "@types/estree": "1.0.5" @@ -1892,22 +1892,22 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.18.0", - "@rollup/rollup-android-arm64": "4.18.0", - "@rollup/rollup-darwin-arm64": "4.18.0", - "@rollup/rollup-darwin-x64": "4.18.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.18.0", - "@rollup/rollup-linux-arm-musleabihf": "4.18.0", - "@rollup/rollup-linux-arm64-gnu": "4.18.0", - "@rollup/rollup-linux-arm64-musl": "4.18.0", - "@rollup/rollup-linux-powerpc64le-gnu": "4.18.0", - "@rollup/rollup-linux-riscv64-gnu": "4.18.0", - "@rollup/rollup-linux-s390x-gnu": "4.18.0", - "@rollup/rollup-linux-x64-gnu": "4.18.0", - "@rollup/rollup-linux-x64-musl": "4.18.0", - "@rollup/rollup-win32-arm64-msvc": "4.18.0", - "@rollup/rollup-win32-ia32-msvc": "4.18.0", - "@rollup/rollup-win32-x64-msvc": "4.18.0", + "@rollup/rollup-android-arm-eabi": "4.20.0", + "@rollup/rollup-android-arm64": "4.20.0", + "@rollup/rollup-darwin-arm64": "4.20.0", + "@rollup/rollup-darwin-x64": "4.20.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.20.0", + "@rollup/rollup-linux-arm-musleabihf": "4.20.0", + "@rollup/rollup-linux-arm64-gnu": "4.20.0", + "@rollup/rollup-linux-arm64-musl": "4.20.0", + "@rollup/rollup-linux-powerpc64le-gnu": "4.20.0", + "@rollup/rollup-linux-riscv64-gnu": "4.20.0", + "@rollup/rollup-linux-s390x-gnu": "4.20.0", + "@rollup/rollup-linux-x64-gnu": "4.20.0", + "@rollup/rollup-linux-x64-musl": "4.20.0", + "@rollup/rollup-win32-arm64-msvc": "4.20.0", + "@rollup/rollup-win32-ia32-msvc": "4.20.0", + "@rollup/rollup-win32-x64-msvc": "4.20.0", "fsevents": "~2.3.2" } }, @@ -2034,9 +2034,9 @@ } }, "node_modules/tinybench": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz", - "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", "license": "MIT" }, "node_modules/tinypool": { @@ -2076,18 +2076,18 @@ "license": "MIT" }, "node_modules/type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", + "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/typescript": { - "version": "5.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.3.tgz", - "integrity": "sha512-/hreyEujaB0w76zKo6717l3L0o/qEUtRgdvUBvlkhoWeOVMjMuHNHk0BRBzikzuGDqNmPQbg5ifMEqsHLiIUcQ==", + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz", + "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -2098,9 +2098,9 @@ } }, "node_modules/ufo": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", - "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", + "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", "license": "MIT" }, "node_modules/undici-types": { @@ -2110,9 +2110,9 @@ "license": "MIT" }, "node_modules/vite": { - "version": "5.3.3", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz", - "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==", + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz", + "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==", "license": "MIT", "dependencies": { "esbuild": "^0.21.3", @@ -2299,9 +2299,9 @@ "license": "ISC" }, "node_modules/why-is-node-running": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", - "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", "license": "MIT", "dependencies": { "siginfo": "^2.0.0", diff --git a/settings/Devnet.toml b/settings/Devnet.toml index 8519957..fac19b2 100644 --- a/settings/Devnet.toml +++ b/settings/Devnet.toml @@ -73,56 +73,39 @@ balance = 100_000_000_000_000 # btc_address: mjSrB3wS4xab3kYqFktwBzfTdPg367ZJ2d [devnet] -disable_stacks_explorer = false -disable_stacks_api = false -bitcoin_controller_block_time = 6_000 +disable_stacks_explorer = true +disable_bitcoin_explorer = true +disable_stacks_api = true +bitcoin_controller_block_time = 20_000 +# stacks_node_next_initiative_delay = 2_000 epoch_3_0 = 144 -stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-3.0" -stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-3.0" - - -# use_docker_gateway_routing = true - -# disable_bitcoin_explorer = true -# working_dir = "tmp/devnet" -# faucet_derivation_path = "m/44'/5757'/0'/0/0" -# orchestrator_port = 20445 -# bitcoin_node_p2p_port = 18444 -# bitcoin_node_rpc_port = 18443 -# bitcoin_node_username = "devnet" -# bitcoin_node_password = "devnet" -# stacks_node_rpc_port = 20443 -# stacks_node_p2p_port = 20444 -# stacks_api_port = 3999 -# stacks_api_events_port = 3700 -# bitcoin_explorer_port = 8001 -# stacks_explorer_port = 8000 -# postgres_port = 5432 -# postgres_username = "postgres" -# postgres_password = "postgres" -# postgres_database = "postgres" -# bitcoin_node_image_url = "quay.io/hirosystems/bitcoind:devnet-v2" -# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-with-signer-beta4" -# stacks_signer_image_url = "quay.io/hirosystems/stacks-node:devnet-with-signer-beta4" -# stacks_explorer_image_url = "hirosystems/explorer:latest" -# bitcoin_explorer_image_url = "quay.io/hirosystems/bitcoin-explorer:devnet" -# postgres_image_url = "postgres:14" -# epoch_2_0 = 100 -# epoch_2_05 = 101 -# epoch_2_1 = 102 -# pox_2_activation = 103 -# epoch_2_2 = 104 -# epoch_2_3 = 105 -# epoch_2_4 = 106 +# docker_platform = "linux/arm64" + +# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-3.0-preview" +# bitcoin_node_image_url = "localhost:5001/bitcoind:local-arm" +stacks_node_image_url = "localhost:5001/stacks-node:local" +stacks_signer_image_url = "localhost:5001/stacks-signer:local" +# stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-3.0-preview" +# stacks_node_image_url = "quay.io/hirosystems/stacks-node:devnet-3.0" +# stacks_signer_image_url = "quay.io/hirosystems/stacks-signer:devnet-3.0" + +stacks_node_env_vars = ["BLOCKSTACK_DEBUG=1", "STACKS_LOG_JSON=1"] +# stacks_node_env_vars = [] + +stacks_signers_keys = [ + "7287ba251d44a4d3fd9276c88ce34c5c52a038955511cccaf77e61068649c17801", + "530d9f61984c888536871c6573073bdfc0058896dc1adfe9a6a10dfacadc209101", +] +stacks_signers_env_vars = ["BLOCKSTACK_DEBUG=1"] # Send some stacking orders [[devnet.pox_stacking_orders]] start_at_cycle = 1 duration = 10 wallet = "wallet_1" -slots = 2 +slots = 4 btc_address = "mr1iPkD9N3RJZZxXRk7xF9d36gffa6exNC" auto_extend = true @@ -130,7 +113,7 @@ auto_extend = true start_at_cycle = 1 duration = 10 wallet = "wallet_2" -slots = 2 +slots = 4 btc_address = "muYdXKmX9bByAueDe6KFfHd5Ff1gdN9ErG" auto_extend = true diff --git a/tests/counter.test.ts b/tests/counter.test.ts index d27516f..3435cbf 100644 --- a/tests/counter.test.ts +++ b/tests/counter.test.ts @@ -12,6 +12,7 @@ describe("the chain reset between tests", () => { it("advances 20 blocks", () => { expect(simnet.blockHeight).toBe(initialHeight); simnet.mineEmptyBlocks(20); + expect(simnet.blockHeight).toBe(initialHeight + 20); });