Skip to content

Commit bdd695b

Browse files
CharlieC3CharlieC3
authored
Merge pull request #22 from hirosystems/fix/clarity4
fix: recognize clarity version 4
2 parents 03b9e37 + 9ec0685 commit bdd695b

File tree

2 files changed

+30
-28
lines changed

2 files changed

+30
-28
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ on:
1313

1414
jobs:
1515
cancel-previous-runs:
16-
runs-on: ubuntu-22.04
16+
runs-on: ubuntu-latest
1717
steps:
1818
- name: Cancel Previous Runs
1919
uses: styfle/[email protected]
2020
with:
2121
access_token: ${{ github.token }}
2222

2323
build_linux-x64-musl:
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v3
2727
- uses: dtolnay/rust-toolchain@stable
@@ -32,7 +32,7 @@ jobs:
3232
node-version: '16'
3333
- uses: Swatinem/rust-cache@v2
3434
- name: Download x86_64-linux-musl-cross toolchain
35-
run: curl -O -C - https://musl.cc/x86_64-linux-musl-cross.tgz
35+
run: curl -O -L -C - https://github.com/musl-cc/musl.cc/releases/download/v0.0.1/x86_64-linux-musl-cross.tgz
3636
- name: Install x86_64-linux-musl-cross toolchain
3737
run: tar xf x86_64-linux-musl-cross.tgz
3838
- name: Configure linux-x64-musl cross compile
@@ -49,14 +49,14 @@ jobs:
4949
run: npm i
5050
- name: Build
5151
run: npm run build:cargo
52-
- uses: actions/upload-artifact@v3
52+
- uses: actions/upload-artifact@v4
5353
with:
5454
name: linux-x64-musl
5555
path: native/linux-x64-musl.node
5656
if-no-files-found: error
5757

5858
build_linux-arm64-musl:
59-
runs-on: ubuntu-22.04
59+
runs-on: ubuntu-latest
6060
steps:
6161
- uses: actions/checkout@v3
6262
- uses: dtolnay/rust-toolchain@stable
@@ -67,7 +67,7 @@ jobs:
6767
node-version: '16'
6868
- uses: Swatinem/rust-cache@v2
6969
- name: Download aarch64-linux-musl-cross toolchain
70-
run: curl -O -C - https://musl.cc/aarch64-linux-musl-cross.tgz
70+
run: curl -O -L -C - https://github.com/musl-cc/musl.cc/releases/download/v0.0.1/aarch64-linux-musl-cross.tgz
7171
- name: Install aarch64-linux-musl-cross toolchain
7272
run: tar xf aarch64-linux-musl-cross.tgz
7373
- name: Configure linux-arm64-musl cross compile
@@ -84,14 +84,14 @@ jobs:
8484
run: npm i
8585
- name: Build
8686
run: npm run build:cargo
87-
- uses: actions/upload-artifact@v3
87+
- uses: actions/upload-artifact@v4
8888
with:
8989
name: linux-arm64-musl
9090
path: native/linux-arm64-musl.node
9191
if-no-files-found: error
9292

9393
build_linux-x64-glibc:
94-
runs-on: ubuntu-22.04
94+
runs-on: ubuntu-latest
9595
container:
9696
image: rust:buster
9797
steps:
@@ -107,14 +107,14 @@ jobs:
107107
run: npm i
108108
- name: Build
109109
run: npm run build:cargo
110-
- uses: actions/upload-artifact@v3
110+
- uses: actions/upload-artifact@v4
111111
with:
112112
name: linux-x64-glibc
113113
path: native/linux-x64-glibc.node
114114
if-no-files-found: error
115115

116116
build_linux-arm64-glibc:
117-
runs-on: ubuntu-22.04
117+
runs-on: ubuntu-latest
118118
container:
119119
image: rust:buster
120120
steps:
@@ -141,7 +141,7 @@ jobs:
141141
run: npm i
142142
- name: Build
143143
run: npm run build:cargo
144-
- uses: actions/upload-artifact@v3
144+
- uses: actions/upload-artifact@v4
145145
with:
146146
name: linux-arm64-glibc
147147
path: native/linux-arm64-glibc.node
@@ -162,7 +162,7 @@ jobs:
162162
run: npm i
163163
- name: Build
164164
run: npm run build:cargo
165-
- uses: actions/upload-artifact@v3
165+
- uses: actions/upload-artifact@v4
166166
with:
167167
name: win32-x64
168168
path: native/win32-x64.node
@@ -184,7 +184,7 @@ jobs:
184184
run: npm i
185185
- name: Build
186186
run: npm run build:cargo
187-
- uses: actions/upload-artifact@v3
187+
- uses: actions/upload-artifact@v4
188188
with:
189189
name: darwin-x64
190190
path: native/darwin-x64.node
@@ -210,19 +210,19 @@ jobs:
210210
run: npm i
211211
- name: Build
212212
run: npm run build:cargo
213-
- uses: actions/upload-artifact@v3
213+
- uses: actions/upload-artifact@v4
214214
with:
215215
name: darwin-arm64
216216
path: native/darwin-arm64.node
217217
if-no-files-found: error
218218

219219
test_linux-arm64-glibc:
220-
runs-on: ubuntu-22.04
220+
runs-on: ubuntu-latest
221221
needs:
222222
- build_linux-arm64-glibc
223223
steps:
224224
- uses: actions/checkout@v3
225-
- uses: actions/download-artifact@v3
225+
- uses: actions/download-artifact@v4
226226
with:
227227
name: linux-arm64-glibc
228228
path: native
@@ -244,12 +244,12 @@ jobs:
244244
npm run test:js
245245
246246
test_linux-arm64-musl:
247-
runs-on: ubuntu-22.04
247+
runs-on: ubuntu-latest
248248
needs:
249249
- build_linux-arm64-musl
250250
steps:
251251
- uses: actions/checkout@v3
252-
- uses: actions/download-artifact@v3
252+
- uses: actions/download-artifact@v4
253253
with:
254254
name: linux-arm64-musl
255255
path: native
@@ -269,14 +269,14 @@ jobs:
269269
npm run test:js
270270
271271
test_linux-x64-glibc:
272-
runs-on: ubuntu-22.04
272+
runs-on: ubuntu-latest
273273
container:
274274
image: node:16-bullseye
275275
needs:
276276
- build_linux-x64-glibc
277277
steps:
278278
- uses: actions/checkout@v3
279-
- uses: actions/download-artifact@v3
279+
- uses: actions/download-artifact@v4
280280
with:
281281
name: linux-x64-glibc
282282
path: native
@@ -291,14 +291,14 @@ jobs:
291291
run: npm i && npm test
292292

293293
test_linux-x64-musl:
294-
runs-on: ubuntu-22.04
294+
runs-on: ubuntu-latest
295295
container:
296296
image: node:16-alpine
297297
needs:
298298
- build_linux-x64-musl
299299
steps:
300300
- uses: actions/checkout@v3
301-
- uses: actions/download-artifact@v3
301+
- uses: actions/download-artifact@v4
302302
with:
303303
name: linux-x64-musl
304304
path: native
@@ -318,7 +318,7 @@ jobs:
318318
- build_win-x64
319319
steps:
320320
- uses: actions/checkout@v3
321-
- uses: actions/download-artifact@v3
321+
- uses: actions/download-artifact@v4
322322
with:
323323
name: win32-x64
324324
path: native
@@ -339,7 +339,7 @@ jobs:
339339
- build_darwin-x64
340340
steps:
341341
- uses: actions/checkout@v3
342-
- uses: actions/download-artifact@v3
342+
- uses: actions/download-artifact@v4
343343
with:
344344
name: darwin-x64
345345
path: native
@@ -354,12 +354,12 @@ jobs:
354354
run: npm i && npm test
355355

356356
npm-package:
357-
runs-on: ubuntu-22.04
357+
runs-on: ubuntu-latest
358358
needs:
359359
- build_linux-x64-musl
360360
- build_linux-arm64-musl
361361
- build_linux-x64-glibc
362-
- build_linux-arm64-glibc
362+
# - build_linux-arm64-glibc
363363
- build_win-x64
364364
- build_darwin-arm64
365365
env:
@@ -372,7 +372,7 @@ jobs:
372372
node-version: '16'
373373
registry-url: https://registry.npmjs.org
374374
always-auth: true
375-
- uses: actions/download-artifact@v3
375+
- uses: actions/download-artifact@v4
376376
with:
377377
path: native
378378
- name: Position downloaded artifacts
@@ -391,7 +391,7 @@ jobs:
391391
run: |
392392
npm pack
393393
mv "stacks-encoding-native-js-$NPM_PACKAGE_VERSION.tgz" "stacks-encoding-native-js.tgz"
394-
- uses: actions/upload-artifact@v3
394+
- uses: actions/upload-artifact@v4
395395
with:
396396
name: stacks-encoding-native-js.tgz
397397
path: stacks-encoding-native-js.tgz

‎src/stacks_tx/deserialize.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ impl ClarityVersion {
332332
x if x == ClarityVersion::Clarity1 as u8 => Some(ClarityVersion::Clarity1),
333333
x if x == ClarityVersion::Clarity2 as u8 => Some(ClarityVersion::Clarity2),
334334
x if x == ClarityVersion::Clarity3 as u8 => Some(ClarityVersion::Clarity3),
335+
x if x == ClarityVersion::Clarity4 as u8 => Some(ClarityVersion::Clarity4),
335336
_ => None,
336337
}
337338
}
@@ -681,6 +682,7 @@ pub enum ClarityVersion {
681682
Clarity1 = 1,
682683
Clarity2 = 2,
683684
Clarity3 = 3,
685+
Clarity4 = 4,
684686
}
685687

686688
#[repr(u8)]

0 commit comments

Comments
 (0)