Skip to content

Commit

Permalink
Merge pull request #119 from bitcoinjs/wip/update-sys
Browse files Browse the repository at this point in the history
Bump secp256k1-sys
  • Loading branch information
junderw authored Jun 29, 2023
2 parents 0c6b84f + 05675e6 commit fb0287d
Show file tree
Hide file tree
Showing 15 changed files with 226 additions and 105 deletions.
10 changes: 10 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,15 @@ module.exports = {
"@typescript-eslint/explicit-module-boundary-types": ["error"],
},
},
{
files: ["tests/*.js", "benches/fixtures.js"],
parser: "@babel/eslint-parser",
parserOptions: {
requireConfigFile: false,
babelOptions: {
plugins: ["@babel/plugin-syntax-import-assertions"],
},
},
},
],
};
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
pull_request:

env:
NODE_VERSION: 14.0.0
NODE_VERSION: 18.16.1

jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- master

env:
NODE_VERSION: 14.0.0
NODE_VERSION: 18.16.1

jobs:
publish-react-app:
Expand Down
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@
name = "secp256k1-wasm"
version = "0.0.0"
authors = ["Kirill Fomichev <[email protected]>"]
edition = "2018"
edition = "2021"
description = "A Rust library for building tiny-secp256k1 WASM."
rust-version = "1.50"
license = "MIT"
publish = false

[lib]
crate-type = ["cdylib"]

[dependencies]
# `[patch.crates-io]` is not working :(
# This commit is where secp256k1-sys version changed to 0.4.1
secp256k1-sys = { version = "0.4.1", default-features = false, features=["recovery"], git = "https://github.com/rust-bitcoin/rust-secp256k1", rev = "455ee57ba4051bb2cfea5f5f675378170fb42c7f" }
[dependencies.secp256k1-sys]
version = "=0.8.1"
default-features = false
features=[
"recovery",
"lowmemory"
]

[profile.release]
lto = true
Expand Down
8 changes: 4 additions & 4 deletions benches/fixtures.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import * as crypto from "crypto";
import * as tiny_secp256k1 from "../lib/index.js";
import _fecdsa from "../tests/fixtures/ecdsa.json";
import _fpoints from "../tests/fixtures/points.json";
import _fprivates from "../tests/fixtures/privates.json";
import _fschnorr from "../tests/fixtures/schnorr.json";
import _fecdsa from "../tests/fixtures/ecdsa.json" assert { type: "json" };
import _fpoints from "../tests/fixtures/points.json" assert { type: "json" };
import _fprivates from "../tests/fixtures/privates.json" assert { type: "json" };
import _fschnorr from "../tests/fixtures/schnorr.json" assert { type: "json" };
import { parseBip340Vector } from "../tests/schnorr.js";

const randPubKey = () =>
Expand Down
139 changes: 127 additions & 12 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tiny-secp256k1",
"version": "2.2.2",
"version": "2.2.3",
"description": "A tiny secp256k1 JS",
"homepage": "https://github.com/bitcoinjs/tiny-secp256k1#readme",
"bugs": {
Expand Down Expand Up @@ -36,6 +36,8 @@
"uint8array-tools": "0.0.7"
},
"devDependencies": {
"@babel/eslint-parser": "^7.22.5",
"@babel/plugin-syntax-import-assertions": "^7.22.5",
"@types/node": "^14.14.35",
"@typescript-eslint/eslint-plugin": "^4.18.0",
"@typescript-eslint/parser": "^4.18.0",
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.58.0
1.70.0
Loading

0 comments on commit fb0287d

Please sign in to comment.