Skip to content

Commit 5ae0e96

Browse files
authored
Merge pull request #1811 from hirosystems/nakamoto
release to master
2 parents 3acbb85 + 2b89b32 commit 5ae0e96

File tree

198 files changed

+17347
-33740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+17347
-33740
lines changed

.env

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@ STACKS_NODE_TYPE=L1
122122
# Override the default file path for the proxy cache control file
123123
# STACKS_API_PROXY_CACHE_CONTROL_FILE=/path/to/.proxy-cache-control.json
124124

125+
# Enable Rosetta endpoints.
126+
# STACKS_API_ENABLE_ROSETTA=1
127+
125128
# Enable FT metadata processing for Rosetta operations display. Disabled by default.
126129
# STACKS_API_ENABLE_FT_METADATA=1
127130

@@ -155,12 +158,15 @@ STACKS_NODE_TYPE=L1
155158
# STACKS_ADDRESS_CACHE_SIZE=10000
156159

157160
# Specify a URL to redirect from /doc. If this URL is not provided, server renders local documentation
158-
# of openapi.yaml for test / development NODE_ENV.
161+
# of openapi.yaml for test / development NODE_ENV.
159162
# For production, /doc is not served if this env var is not provided.
160-
# API_DOCS_URL="https://docs.hiro.so/api"
163+
# API_DOCS_URL="https://docs.hiro.so/api"
161164

162-
# For use while syncing. Places the API into an "Initial Block Download(IBD)" mode,
163-
# forcing it to stop any redundant processing until the node is fully synced up to its peers.
164-
# Some examples of processing that are avoided are:
165+
# For use while syncing. Places the API into an "Initial Block Download(IBD)" mode,
166+
# forcing it to stop any redundant processing until the node is fully synced up to its peers.
167+
# Some examples of processing that are avoided are:
165168
# REFRESH MATERIALIZED VIEW SQLs that are extremely CPU intensive on the PG instance, Mempool messages, etc.,
166169
# IBD_MODE_UNTIL_BLOCK=
170+
171+
# Folder with events to be imported by the event-replay.
172+
STACKS_EVENTS_DIR=./eventssds

.github/workflows/ci.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
- master
77
- develop
88
- beta
9+
- nakamoto
910
tags-ignore:
1011
- "**"
1112
paths-ignore:
@@ -519,24 +520,24 @@ jobs:
519520
flag-name: run-${{ github.job }}
520521
parallel: true
521522

522-
test-2_4:
523+
test-2_5:
523524
strategy:
524525
fail-fast: false
525526
matrix:
526527
suite:
527528
[
528529
block-zero-handling,
529530
faucet-stx,
530-
pox-3-btc-address-formats,
531-
pox-3-delegate-aggregation,
532-
pox-3-delegate-stacking,
533-
pox-3-delegate-revoked-stacking,
534-
pox-3-stack-extend-increase,
535-
pox-3-rosetta-btc-addr-types,
536-
pox-3-rosetta-cycle-phases,
537-
pox-3-rosetta-segwit,
538-
pox-3-burnchain-stack-stx,
539-
pox-3-burnchain-delegate-stx,
531+
pox-4-btc-address-formats,
532+
pox-4-delegate-aggregation,
533+
pox-4-delegate-stacking,
534+
pox-4-delegate-revoked-stacking,
535+
pox-4-stack-extend-increase,
536+
pox-4-rosetta-btc-addr-types,
537+
pox-4-rosetta-cycle-phases,
538+
pox-4-rosetta-segwit,
539+
pox-4-burnchain-stack-stx,
540+
pox-4-burnchain-delegate-stx,
540541
]
541542
runs-on: ubuntu-latest
542543
steps:
@@ -574,7 +575,7 @@ jobs:
574575
npm run devenv:logs-krypton -- --no-color &> docker-compose-logs.txt &
575576
576577
- name: Run tests
577-
run: npm run test:2.4 -- --testPathPattern "${{ matrix.suite }}"
578+
run: npm run test:2.5 -- --testPathPattern "${{ matrix.suite }}"
578579

579580
- name: Print integration environment logs
580581
run: cat docker-compose-logs.txt
@@ -854,7 +855,7 @@ jobs:
854855
- lint
855856
- lint-docs
856857
- test
857-
- test-2_4
858+
- test-2_5
858859
- test-bns
859860
- test-rosetta
860861
- test-rosetta-cli-construction

.github/workflows/netlify.yml

Lines changed: 0 additions & 58 deletions
This file was deleted.

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v16
1+
v18

.releaserc

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"branches": [
3+
"master",
4+
{
5+
"name": "beta",
6+
"channel": "beta",
7+
"prerelease": true
8+
},
9+
{
10+
"name": "nakamoto",
11+
"channel": "nakamoto",
12+
"prerelease": true
13+
}
14+
],
15+
"plugins": [
16+
[
17+
"@semantic-release/commit-analyzer",
18+
{
19+
"preset": "conventionalcommits"
20+
}
21+
],
22+
[
23+
"@semantic-release/release-notes-generator",
24+
{
25+
"preset": "conventionalcommits"
26+
}
27+
],
28+
[
29+
"@semantic-release/exec",
30+
{
31+
"execCwd": "client",
32+
"prepareCmd": "npm ci"
33+
}
34+
],
35+
[
36+
"@semantic-release/npm",
37+
{
38+
"pkgRoot": "./docs"
39+
}
40+
],
41+
[
42+
"@semantic-release/npm",
43+
{
44+
"pkgRoot": "./client"
45+
}
46+
],
47+
"@semantic-release/github",
48+
"@semantic-release/changelog",
49+
"@semantic-release/git"
50+
]
51+
}

.vscode/launch.json

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,26 @@
4848
},
4949
"killBehavior": "polite",
5050
},
51+
{
52+
"type": "node",
53+
"request": "launch",
54+
"name": "Launch: w/ postgres",
55+
"skipFiles": [
56+
"<node_internals>/**"
57+
],
58+
"runtimeArgs": ["-r", "ts-node/register/transpile-only", "-r", "tsconfig-paths/register"],
59+
"args": ["${workspaceFolder}/src/index.ts"],
60+
"outputCapture": "std",
61+
"internalConsoleOptions": "openOnSessionStart",
62+
"preLaunchTask": "deploy:pg",
63+
"postDebugTask": "stop:pg",
64+
"env": {
65+
"STACKS_CHAIN_ID": "0x80000000",
66+
"NODE_ENV": "development",
67+
"TS_NODE_SKIP_IGNORE": "true"
68+
},
69+
"killBehavior": "polite",
70+
},
5171
{
5272
"type": "node",
5373
"request": "launch",
@@ -296,14 +316,14 @@
296316
{
297317
"type": "node",
298318
"request": "launch",
299-
"name": "Jest: 2.4",
319+
"name": "Jest: 2.5",
300320
"program": "${workspaceFolder}/node_modules/.bin/jest",
301321
"args": [
302322
"--testTimeout=3600000",
303323
"--runInBand",
304324
"--no-cache",
305325
"--config",
306-
"${workspaceRoot}/tests/jest.config.2.4.js"
326+
"${workspaceRoot}/tests/jest.config.2.5.js",
307327
],
308328
"outputCapture": "std",
309329
"console": "integratedTerminal",

.vscode/tasks.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,29 @@
4444
},
4545
"presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "dedicated", "clear": false }
4646
},
47+
{
48+
"label": "deploy:pg",
49+
"type": "shell",
50+
"command": "docker compose -f docker/docker-compose.dev.postgres.yml up --force-recreate -V",
51+
"isBackground": true,
52+
"problemMatcher": [{
53+
"pattern": [{ "regexp": ".", "file": 1, "location": 2, "message": 3 }],
54+
"background": { "activeOnStart": true, "beginsPattern": ".", "endsPattern": "." }
55+
}],
56+
"presentation": { "echo": true, "reveal": "always", "focus": false, "panel": "dedicated", "clear": false }
57+
},
58+
{
59+
"label": "stop:pg",
60+
"type": "shell",
61+
"command": "docker compose -f docker/docker-compose.dev.postgres.yml down -v -t 0",
62+
"presentation": {
63+
"echo": true,
64+
"reveal": "silent",
65+
"focus": false,
66+
"panel": "shared",
67+
"clear": false
68+
}
69+
},
4770
{
4871
"label": "deploy:subnets",
4972
"type": "shell",

0 commit comments

Comments
 (0)