Skip to content

Commit dd5a8b0

Browse files
wileyjwileyj
committed
Revert "Merge remote-tracking branch 'origin/develop' into feat/cleanup"
This reverts commit 011e98a, reversing changes made to e203764.
1 parent 30211b5 commit dd5a8b0

File tree

140 files changed

+4941
-12311
lines changed

Some content is hidden

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

140 files changed

+4941
-12311
lines changed

‎.env

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,6 @@ PG_PORT=5490
33
PG_USER=postgres
44
PG_PASSWORD=postgres
55
PG_DATABASE=stacks_blockchain_api
6-
PG_SCHEMA=public
7-
PG_SSL=false
8-
9-
# The connection URI below can be used in place of the PG variables above,
10-
# but if enabled it must be defined without others or omitted.
11-
# PG_CONNECTION_URI=
12-
13-
# Enable to have stacks-node events streamed to a file while the application is running
14-
# STACKS_EXPORT_EVENTS_FILE=/tmp/stacks-events.tsv
156

167
STACKS_CORE_EVENT_PORT=3700
178
STACKS_CORE_EVENT_HOST=127.0.0.1

‎.github/workflows/gh-pages.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@ jobs:
1313
- uses: actions/checkout@v2
1414

1515
- name: Use Node.js
16-
uses: actions/setup-node@v2
16+
uses: actions/setup-node@v1
1717
with:
18-
node-version: '14'
19-
check-latest: true
18+
node-version: '14.x'
2019

2120
- name: Install client deps
2221
run: npm install

‎.github/workflows/stacks-blockchain-api.yml

Lines changed: 15 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -36,27 +36,12 @@ jobs:
3636
- uses: actions/checkout@v2
3737

3838
- name: Use Node.js
39-
uses: actions/setup-node@v2
39+
uses: actions/setup-node@v1
4040
with:
41-
node-version: '14'
42-
check-latest: true
43-
44-
- name: Cache node modules
45-
uses: actions/cache@v2
46-
env:
47-
cache-name: cache-node-modules
48-
with:
49-
path: |
50-
~/.npm
51-
node_modules
52-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
53-
restore-keys: |
54-
${{ runner.os }}-build-${{ env.cache-name }}-
55-
${{ runner.os }}-build-
56-
${{ runner.os }}-
41+
node-version: '14.x'
5742

5843
- name: Install deps
59-
run: npm install --audit=false
44+
run: npm install
6045

6146
- name: Lint ESLint
6247
run: npm run lint:eslint
@@ -73,27 +58,12 @@ jobs:
7358
- uses: actions/checkout@v2
7459

7560
- name: Use Node.js
76-
uses: actions/setup-node@v2
77-
with:
78-
node-version: '14'
79-
check-latest: true
80-
81-
- name: Cache node modules
82-
uses: actions/cache@v2
83-
env:
84-
cache-name: cache-node-modules
61+
uses: actions/setup-node@v1
8562
with:
86-
path: |
87-
~/.npm
88-
node_modules
89-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
90-
restore-keys: |
91-
${{ runner.os }}-build-${{ env.cache-name }}-
92-
${{ runner.os }}-build-
93-
${{ runner.os }}-
63+
node-version: '14.x'
9464

9565
- name: Install deps
96-
run: npm install --audit=false
66+
run: npm install
9767

9868
- name: Build schema & docs
9969
run: npm run build
@@ -116,27 +86,12 @@ jobs:
11686
- uses: actions/checkout@v2
11787

11888
- name: Use Node.js
119-
uses: actions/setup-node@v2
89+
uses: actions/setup-node@v1
12090
with:
121-
node-version: '14'
122-
check-latest: true
123-
124-
- name: Cache node modules
125-
uses: actions/cache@v2
126-
env:
127-
cache-name: cache-node-modules
128-
with:
129-
path: |
130-
~/.npm
131-
node_modules
132-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
133-
restore-keys: |
134-
${{ runner.os }}-build-${{ env.cache-name }}-
135-
${{ runner.os }}-build-
136-
${{ runner.os }}-
91+
node-version: '14.x'
13792

13893
- name: Install deps
139-
run: npm install --audit=false
94+
run: npm install
14095

14196
- name: Setup env vars
14297
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV
@@ -168,27 +123,12 @@ jobs:
168123
- uses: actions/checkout@v2
169124

170125
- name: Use Node.js
171-
uses: actions/setup-node@v2
172-
with:
173-
node-version: '14'
174-
check-latest: true
175-
176-
- name: Cache node modules
177-
uses: actions/cache@v2
178-
env:
179-
cache-name: cache-node-modules
126+
uses: actions/setup-node@v1
180127
with:
181-
path: |
182-
~/.npm
183-
node_modules
184-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
185-
restore-keys: |
186-
${{ runner.os }}-build-${{ env.cache-name }}-
187-
${{ runner.os }}-build-
188-
${{ runner.os }}-
128+
node-version: '14.x'
189129

190130
- name: Install deps
191-
run: npm install --audit=false
131+
run: npm install
192132

193133
- name: Setup env vars
194134
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV
@@ -220,27 +160,12 @@ jobs:
220160
- uses: actions/checkout@v2
221161

222162
- name: Use Node.js
223-
uses: actions/setup-node@v2
224-
with:
225-
node-version: '14'
226-
check-latest: true
227-
228-
- name: Cache node modules
229-
uses: actions/cache@v2
230-
env:
231-
cache-name: cache-node-modules
163+
uses: actions/setup-node@v1
232164
with:
233-
path: |
234-
~/.npm
235-
node_modules
236-
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
237-
restore-keys: |
238-
${{ runner.os }}-build-${{ env.cache-name }}-
239-
${{ runner.os }}-build-
240-
${{ runner.os }}-
165+
node-version: '14.x'
241166

242167
- name: Install deps
243-
run: npm install --audit=false
168+
run: npm install
244169

245170
- name: Setup env vars
246171
run: echo "STACKS_CORE_EVENT_HOST=http://0.0.0.0" >> $GITHUB_ENV

‎.gitpod.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM blockstack/stacks-blockchain:2.0.11.2.0-stretch as corenode
1+
FROM blockstack/stacks-blockchain:latest-stretch as corenode
22

33
FROM gitpod/workspace-postgres
44

‎.prettierignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,2 @@
11
src/schemas/*
22
src/migrations/*
3-
src/tests-rosetta/
4-
src/tests-rosetta-cli/
5-
src/tests-bns/

‎.vscode/launch.json

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -66,32 +66,6 @@
6666
"TS_NODE_SKIP_IGNORE": "true"
6767
}
6868
},
69-
{
70-
"type": "node",
71-
"request": "launch",
72-
"name": "Launch: export-events",
73-
"runtimeArgs": ["-r", "ts-node/register/transpile-only", "-r", "tsconfig-paths/register"],
74-
"args": ["${workspaceFolder}/src/index.ts", "export-events", "--file", "/tmp/test-events-export.csv", "--overwrite-file"],
75-
"outputCapture": "std",
76-
"internalConsoleOptions": "openOnSessionStart",
77-
"env": {
78-
"NODE_ENV": "development",
79-
"TS_NODE_SKIP_IGNORE": "true"
80-
}
81-
},
82-
{
83-
"type": "node",
84-
"request": "launch",
85-
"name": "Launch: import-events",
86-
"runtimeArgs": ["-r", "ts-node/register/transpile-only", "-r", "tsconfig-paths/register"],
87-
"args": ["${workspaceFolder}/src/index.ts", "import-events", "--file", "/tmp/test-events-export.csv", "--wipe-db"],
88-
"outputCapture": "std",
89-
"internalConsoleOptions": "openOnSessionStart",
90-
"env": {
91-
"NODE_ENV": "development",
92-
"TS_NODE_SKIP_IGNORE": "true"
93-
}
94-
},
9569
{
9670
"type": "node",
9771
"request": "launch",
@@ -156,14 +130,6 @@
156130
"NODE_ENV": "development",
157131
"TS_NODE_SKIP_IGNORE": "true"
158132
}
159-
},
160-
{
161-
"type": "node",
162-
"request": "launch",
163-
"name": "docs: generate-types",
164-
"runtimeArgs": ["-r", "ts-node/register/transpile-only"],
165-
"cwd": "${workspaceFolder}/docs",
166-
"args": ["${workspaceFolder}/docs/scripts/generate-types.ts"]
167133
}
168134
]
169135
}

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"prep-openapi": "rimraf ./.tmp && rimraf ./src/generated && swagger-cli bundle --dereference -o ./.tmp/openapi-temp.json ../docs/openapi.yaml && shx sed -i '^.*\\$schema.*$' '' ./.tmp/openapi-temp.json > ./.tmp/openapi.json",
3131
"generate-openapi": "npm run prep-openapi && openapi-generator-cli generate --skip-validate-spec -g typescript-fetch --additional-properties=withInterfaces=true,typescriptThreePlus=true,supportsES6=true,legacyDiscriminatorBehavior=false,enumPropertyNaming=original,modelPropertyNaming=original -i ./.tmp/openapi.json -o ./src/generated > ./.tmp/gen.log",
3232
"openapi-generator-version": "openapi-generator-cli version-manager list",
33-
"generate:docs": "npm run generate-openapi && typedoc src/**/*.ts"
33+
"generate:docs": "typedoc"
3434
},
3535
"prettier": "@stacks/prettier-config",
3636
"files": [

‎client/tsconfig.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
},
1515
"include": ["./src/**/*.ts"],
1616
"typedocOptions": {
17+
"inputFiles": ["./src"],
18+
"mode": "file",
1719
"out": "../docs/.tmp/client"
1820
}
1921
}

‎docs/api/address/get-address-single-transaction-with-transfers.example.json

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

‎docs/api/address/get-address-transactions-with-transfers.example.json

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
"burn_block_time": 1613009951,
1919
"burn_block_time_iso": "2021-02-11T02:19:11.000Z",
2020
"canonical": true,
21-
"is_unanchored": false,
22-
"microblock_hash": "0x590a1bb1d7bcbeafce0a9fc8f8a69e369486192d14687fe95fbe4dc1c71d49df",
23-
"microblock_sequence": 5,
24-
"microblock_canonical": true,
2521
"tx_index": 1,
2622
"tx_result": {
2723
"hex": "0x0703",
@@ -84,10 +80,6 @@
8480
"burn_block_time": 1611968237,
8581
"burn_block_time_iso": "2021-01-30T00:57:17.000Z",
8682
"canonical": true,
87-
"is_unanchored": false,
88-
"microblock_hash": "",
89-
"microblock_sequence": 2147483647,
90-
"microblock_canonical": true,
9183
"tx_index": 2,
9284
"tx_result": {
9385
"hex": "0x0703",

0 commit comments

Comments
 (0)