Replace vendored secp256k1 v3 for secp256k1 v4

Author: alcuadrado

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "packages/ethereum-cryptography/secp256k1-node"]
-	path = packages/ethereum-cryptography/secp256k1-node
-	url = https://github.com/cryptocoinjs/secp256k1-node.git
 [submodule "packages/ethereum-cryptography/scryptsy"]
 	path = packages/ethereum-cryptography/scryptsy
 	url = https://github.com/cryptocoinjs/scryptsy.git

packages/ethereum-cryptography/elliptic-secp256k1-config/README.md

@@ -51,7 +51,6 @@
   "browser": {
     "./scrypt.js": "./pure/scrypt.js",
     "./ripemd160.js": "./pure/ripemd160.js",
-    "./secp256k1.js": "./pure/secp256k1.js",
     "./sha256.js": "./pure/sha256.js",
     "./hdkey.js": "./pure/hdkey.js",
     "./blake2b.js": "./pure/blake2b.js",
@@ -60,9 +59,9 @@
   "sideEffects": false,
   "scripts": {
     "prepare": "npm run build",
-    "build": "npm-run-all build:tsc elliptic-secp256k1:build elliptic-secp256k1:copy scryptsy-without-crypto:build scryptsy-without-crypto:copy hdkey-without-crypto:build hdkey-without-crypto:copy bip39-without-wordlists:build bip39-without-wordlists:copy",
+    "build": "npm-run-all build:tsc scryptsy-without-crypto:build scryptsy-without-crypto:copy hdkey-without-crypto:build hdkey-without-crypto:copy bip39-without-wordlists:build bip39-without-wordlists:copy",
     "build:tsc": "tsc --project tsconfig.prod.json",
-    "test": "npm-run-all elliptic-secp256k1:build scryptsy-without-crypto:build hdkey-without-crypto:build bip39-without-wordlists:build test:node",
+    "test": "npm-run-all scryptsy-without-crypto:build hdkey-without-crypto:build bip39-without-wordlists:build test:node",
     "test:node": "mocha",
     "clean": "rimraf vendor test-builds pure shims scryptsy-without-crypto-build hdkey-without-crypto-build bip39-without-wordlists-build '*.js' '*.js.map' '*.d.ts' '*.d.ts.map' 'src/**/*.js'",
     "lint": "tslint --project tsconfig.json",
@@ -74,8 +73,6 @@
     "browser-tests:test-browserify": "karma start --single-run --browsers ChromeHeadless test/karma.browserify.conf.js",
     "browser-tests:test-webpack": "karma start --single-run --browsers ChromeHeadless test/karma.webpack.conf.js",
     "browser-tests:test-rollup": "karma start --single-run --browsers ChromeHeadless test/karma.rollup.conf.js",
-    "elliptic-secp256k1:build": "rollup -c elliptic-secp256k1-config/rollup.config.js",
-    "elliptic-secp256k1:copy": "mkdir -p vendor && cp src/vendor/elliptic-secp256k1.js ./vendor",
     "scryptsy-without-crypto:build": "bash -x scripts/build-scryptsy-without-crypto.sh",
     "scryptsy-without-crypto:copy": "mkdir -p vendor && cp src/vendor/scryptsy-without-crypto.js ./vendor",
     "hdkey-without-crypto:build": "bash -x scripts/build-hdkey-without-crypto.sh",
@@ -117,20 +114,18 @@
   },
   "dependencies": {
     "@types/pbkdf2": "^3.0.0",
-    "@types/secp256k1": "3.5.0",
-    "bip66": "^1.1.5",
-    "blakejs": "^1.1.0",
-    "bn.js": "^4.11.8",
-    "browserify-aes": "^1.2.0",
+    "@types/secp256k1": "^4.0.1",
     "bs58check": "^2.1.2",
+    "safe-buffer": "^5.1.2",
     "create-hash": "^1.2.0",
+    "pbkdf2": "^3.0.17",
     "create-hmac": "^1.1.7",
-    "elliptic": "^6.4.1",
+    "blakejs": "^1.1.0",
+    "browserify-aes": "^1.2.0",
     "hash.js": "^1.1.7",
     "keccak": "^3.0.0",
-    "pbkdf2": "^3.0.17",
     "randombytes": "^2.1.0",
-    "safe-buffer": "^5.1.2",
+    "secp256k1": "^4.0.1",
     "setimmediate": "^1.0.5"
   }
 }

packages/ethereum-cryptography/elliptic-secp256k1-config/rollup.config.js

@@ -3,11 +3,6 @@ set -e
 echo "Building tests with TypeScript"
 npx tsc --project tsconfig.json
 
-echo "Building elliptic shim"
-npm run elliptic-secp256k1:build
-mkdir -p test-builds/tsc/src/vendor
-cp src/vendor/elliptic-secp256k1.js test-builds/tsc/src/vendor
-
 echo "Building scryptsy-without-crypto"
 npm run scryptsy-without-crypto:build
 mkdir -p test-builds/tsc/src/vendor

packages/ethereum-cryptography/package.json

@@ -1,33 +1 @@
-import * as secp256k1Pure from "./pure/secp256k1";
-
-let secp256k1Module: typeof secp256k1Pure;
-
-try {
-  // tslint:disable-next-line no-implicit-dependencies
-  secp256k1Module = require("ethereum-cryptography-native/secp256k1");
-} catch {
-  secp256k1Module = require("./pure/secp256k1");
-}
-
-export const privateKeyVerify = secp256k1Module.privateKeyVerify;
-export const privateKeyExport = secp256k1Module.privateKeyExport;
-export const privateKeyImport = secp256k1Module.privateKeyImport;
-export const privateKeyNegate = secp256k1Module.privateKeyNegate;
-export const privateKeyModInverse = secp256k1Module.privateKeyModInverse;
-export const privateKeyTweakAdd = secp256k1Module.privateKeyTweakAdd;
-export const privateKeyTweakMul = secp256k1Module.privateKeyTweakMul;
-export const publicKeyCreate = secp256k1Module.publicKeyCreate;
-export const publicKeyConvert = secp256k1Module.publicKeyConvert;
-export const publicKeyVerify = secp256k1Module.publicKeyVerify;
-export const publicKeyTweakAdd = secp256k1Module.publicKeyTweakAdd;
-export const publicKeyTweakMul = secp256k1Module.publicKeyTweakMul;
-export const publicKeyCombine = secp256k1Module.publicKeyCombine;
-export const signatureNormalize = secp256k1Module.signatureNormalize;
-export const signatureExport = secp256k1Module.signatureExport;
-export const signatureImport = secp256k1Module.signatureImport;
-export const signatureImportLax = secp256k1Module.signatureImportLax;
-export const sign = secp256k1Module.sign;
-export const verify = secp256k1Module.verify;
-export const recover = secp256k1Module.recover;
-export const ecdh = secp256k1Module.ecdh;
-export const ecdhUnsafe = secp256k1Module.ecdhUnsafe;
+export * from "secp256k1";

packages/ethereum-cryptography/scripts/build-browser-tests.sh

@@ -1,4 +1,4 @@
-import { publicKeyConvert, recover, sign } from "../../src/secp256k1";
+import { ecdsaRecover, ecdsaSign, publicKeyConvert } from "../../src/secp256k1";
 import { createTests } from "../test-vectors/secp256k1";
 
-createTests(sign, recover, publicKeyConvert);
+createTests(ecdsaSign, ecdsaRecover, publicKeyConvert);