Skip to content

Commit

Permalink
fix ganache dependency resolution (#10917)
Browse files Browse the repository at this point in the history 
* fix & cleanup

* fixed resolved field in lock file
  • Loading branch information
@soloseng
soloseng authored Jan 30, 2024
1 parent 134cdd3 commit 749956e
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 32 deletions.
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
"typescript": "^5.3.3"
},
"resolutions": {
"ganache": "npm:@soloseng/[email protected]beta.1",
"ganache": "npm:@celo/[email protected]unofficial.0",
"bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2",
"blind-threshold-bls": "npm:@celo/[email protected]",
"@types/bn.js": "4.11.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/celotool/src/lib/generate_utils.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import fs from 'fs'
import { merge, range, repeat } from 'lodash'
import { tmpdir } from 'os'
import path from 'path'
import * as rlp from 'rlp' // TODO(soloseng): update?
import * as rlp from 'rlp'
import { MyceloGenesisConfig } from 'src/lib/interfaces/mycelo-genesis-config'
import { CurrencyPair } from 'src/lib/k8s-oracle/base'
import * as ecc from 'tiny-secp256k1'
Expand Down
2 changes: 0 additions & 2 deletions packages/protocol/contracts/common/UsingPrecompiles.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ contract UsingPrecompiles {
* @param index Index of requested validator in the validator set.
* @return Address of validator at the requested index.
*/
// TODO: (soloseng) add to precompiles
function validatorSignerAddressFromCurrentSet(uint256 index) public view returns (address) {
bytes memory out;
bool success;
Expand Down Expand Up @@ -135,7 +134,6 @@ contract UsingPrecompiles {
* @notice Gets the size of the current elected validator set.
* @return Size of the current elected validator set.
*/
// TODO:(soloseng) add to precompiles.
function numberValidatorsInCurrentSet() public view returns (uint256) {
bytes memory out;
bool success;
Expand Down
70 changes: 42 additions & 28 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4529,7 +4529,7 @@
dependencies:
"@trufflesuite/spinnies" "^0.1.1"

"@trufflesuite/bigint-buffer@1.1.10":
"@trufflesuite/bigint-buffer@*":
version "1.1.10"
resolved "https://registry.yarnpkg.com/@trufflesuite/bigint-buffer/-/bigint-buffer-1.1.10.tgz#a1d9ca22d3cad1a138b78baaf15543637a3e1692"
integrity sha512-pYIQC5EcMmID74t26GCC67946mgTJFiLXOT/BYozgrd4UEY2JHEGLhWi9cMiQCt5BSqFEvKkCHNnoj82SRjiEw==
Expand Down Expand Up @@ -10878,10 +10878,10 @@ functions-have-names@^1.2.2, functions-have-names@^1.2.3:
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==

[email protected], ganache@^7.4.0, "ganache@npm:@celo/[email protected]", "ganache@npm:@soloseng/[email protected]":
version "7.8.0-beta.1"
resolved "https://registry.yarnpkg.com/@soloseng/ganache/-/ganache-7.8.0-beta.1.tgz#168d3c2f1ea05c350e972f227872d4a4b15e5f9e"
integrity sha512-ptjs631aKpxG7xexDDyxh5NevKQaUcSfm3/Aeh0smJ/3xQgNrJ+st6CVYVbVbhGkgNcq9NIvCCaIgt0L64GOCA==
[email protected], ganache@^7.4.0, "ganache@npm:@celo/[email protected]":
version "7.8.0-unofficial.0"
resolved "https://registry.yarnpkg.com/@celo/ganache/-/ganache-7.8.0-unofficial.0.tgz#7930a68ea8df36c7862425a164b44e3e89cb3d0f"
integrity sha512-csobquRjvgG/0mzw6NRB4ga+idPq7yQKLISNbxn2JSS/nCkGCTKn4yvTJqhmZ1dzwL2U3qHmGer2qXlxFQgbdg==
dependencies:
"@trufflesuite/bigint-buffer" "1.1.10"
"@trufflesuite/uws-js-unofficial" "20.10.0-unofficial.2"
Expand Down Expand Up @@ -13706,22 +13706,22 @@ jws@^4.0.0:
jwa "^2.0.0"
safe-buffer "^5.0.1"

keccak@3.0.1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff"
integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==
keccak@*:
version "3.0.4"
resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d"
integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q==
dependencies:
node-addon-api "^2.0.0"
node-gyp-build "^4.2.0"
readable-stream "^3.6.0"

[email protected].2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0"
integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==
[email protected].1:
version "3.0.1"
resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff"
integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==
dependencies:
node-addon-api "^2.0.0"
node-gyp-build "^4.2.0"
readable-stream "^3.6.0"

keccak@^1.0.2:
version "1.4.0"
Expand Down Expand Up @@ -14045,6 +14045,15 @@ level@^8.0.0:
browser-level "^1.0.1"
classic-level "^1.2.0"

leveldown@*:
version "6.1.1"
resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.1.tgz#0f0e480fa88fd807abf94c33cb7e40966ea4b5ce"
integrity sha512-88c+E+Eizn4CkQOBHwqlCJaTNEjGpaEIikn1S+cINc5E9HEvJ77bqY4JY/HxT5u0caWqsc3P3DcFIKBI1vHt+A==
dependencies:
abstract-leveldown "^7.2.0"
napi-macros "~2.0.0"
node-gyp-build "^4.3.0"

[email protected], leveldown@^5.4.0:
version "5.6.0"
resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-5.6.0.tgz#16ba937bb2991c6094e13ac5a6898ee66d3eee98"
Expand All @@ -14054,15 +14063,6 @@ [email protected], leveldown@^5.4.0:
napi-macros "~2.0.0"
node-gyp-build "~4.1.0"

[email protected]:
version "6.1.0"
resolved "https://registry.yarnpkg.com/leveldown/-/leveldown-6.1.0.tgz#7ab1297706f70c657d1a72b31b40323aa612b9ee"
integrity sha512-8C7oJDT44JXxh04aSSsfcMI8YiaGRhOFI9/pMEL7nWJLVsWajDPTRxsSHTM2WcTVY5nXM+SuRHzPPi0GbnDX+w==
dependencies:
abstract-leveldown "^7.2.0"
napi-macros "~2.0.0"
node-gyp-build "^4.3.0"

[email protected], levelup@^4.3.2:
version "4.4.0"
resolved "https://registry.yarnpkg.com/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6"
Expand Down Expand Up @@ -15459,6 +15459,11 @@ node-addon-api@^4.2.0:
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.3.0.tgz#52a1a0b475193e0928e98e0426a0d1254782b77f"
integrity sha512-73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==

node-addon-api@^5.0.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-5.1.0.tgz#49da1ca055e109a23d537e9de43c09cca21eb762"
integrity sha512-eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==

node-domexception@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/node-domexception/-/node-domexception-1.0.0.tgz#6888db46a1f71c0b76b3f7555016b63fe64766e5"
Expand Down Expand Up @@ -18285,13 +18290,13 @@ scryptsy@^2.1.0:
resolved "https://registry.yarnpkg.com/scryptsy/-/scryptsy-2.1.0.tgz#8d1e8d0c025b58fdd25b6fa9a0dc905ee8faa790"
integrity sha512-1CdSqHQowJBnMAFyPEBRfqag/YP9OF394FV+4YREIJX4ljD7OxvQRDayyoyyCk+senRjSkP6VnUNQmVQqB6g7w==

secp256k1@4.0.3, secp256k1@^4.0.0, secp256k1@^4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
secp256k1@*:
version "5.0.0"
resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-5.0.0.tgz#be6f0c8c7722e2481e9773336d351de8cddd12f7"
integrity sha512-TKWX8xvoGHrxVdqbYeZM9w+izTF4b9z3NhSaDkdn81btvuh+ivbIMGT/zQvDtTFWhRlThpoz6LEYTr7n8A5GcA==
dependencies:
elliptic "^6.5.4"
node-addon-api "^2.0.0"
node-addon-api "^5.0.0"
node-gyp-build "^4.2.0"

secp256k1@^3.0.1:
Expand All @@ -18308,6 +18313,15 @@ secp256k1@^3.0.1:
nan "^2.14.0"
safe-buffer "^5.1.2"

secp256k1@^4.0.0, secp256k1@^4.0.1:
version "4.0.3"
resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
dependencies:
elliptic "^6.5.4"
node-addon-api "^2.0.0"
node-gyp-build "^4.2.0"

[email protected]:
version "2.2.0"
resolved "https://registry.yarnpkg.com/seed-random/-/seed-random-2.2.0.tgz#2a9b19e250a817099231a5b99a4daf80b7fbed54"
Expand Down

0 comments on commit 749956e

Please sign in to comment.