Skip to content

Commit

Permalink
bump npm packages (#14614)
Browse files Browse the repository at this point in the history
* bump npm packages

* prettier
  • Loading branch information
RensR authored Oct 3, 2024
1 parent 8f90746 commit 0dba7fb
Show file tree
Hide file tree
Showing 10 changed files with 288 additions and 388 deletions.
24 changes: 12 additions & 12 deletions contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,25 +42,25 @@
"@ethersproject/contracts": "~5.7.0",
"@ethersproject/providers": "~5.7.2",
"@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
"@nomicfoundation/hardhat-ethers": "^3.0.6",
"@nomicfoundation/hardhat-network-helpers": "^1.0.11",
"@nomicfoundation/hardhat-verify": "^2.0.9",
"@nomicfoundation/hardhat-ethers": "^3.0.8",
"@nomicfoundation/hardhat-network-helpers": "^1.0.12",
"@nomicfoundation/hardhat-verify": "^2.0.11",
"@typechain/ethers-v5": "^7.2.0",
"@typechain/hardhat": "^7.0.0",
"@types/cbor": "~5.0.1",
"@types/chai": "^4.3.17",
"@types/chai": "^4.3.20",
"@types/debug": "^4.1.12",
"@types/deep-equal-in-any-order": "^1.0.3",
"@types/mocha": "^10.0.7",
"@types/node": "^20.14.15",
"@types/mocha": "^10.0.8",
"@types/node": "^20.16.10",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"abi-to-sol": "^0.6.6",
"cbor": "^5.2.0",
"chai": "^4.5.0",
"debug": "^4.3.6",
"debug": "^4.3.7",
"deep-equal-in-any-order": "^2.0.6",
"eslint": "^8.57.0",
"eslint": "^8.57.1",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-prettier": "^5.2.1",
"ethers": "~5.7.2",
Expand All @@ -69,19 +69,19 @@
"hardhat-ignore-warnings": "^0.2.6",
"moment": "^2.30.1",
"prettier": "^3.3.3",
"prettier-plugin-solidity": "^1.3.1",
"solhint": "^5.0.1",
"prettier-plugin-solidity": "^1.4.1",
"solhint": "^5.0.3",
"solhint-plugin-chainlink-solidity": "git+https://github.com/smartcontractkit/chainlink-solhint-rules.git#v1.2.1",
"solhint-plugin-prettier": "^0.1.0",
"ts-node": "^10.9.2",
"typechain": "^8.2.1",
"typescript": "^5.5.4"
"typescript": "^5.6.2"
},
"dependencies": {
"@arbitrum/nitro-contracts": "1.1.1",
"@arbitrum/token-bridge-contracts": "1.1.2",
"@changesets/changelog-github": "^0.5.0",
"@changesets/cli": "~2.27.7",
"@changesets/cli": "~2.27.8",
"@eth-optimism/contracts": "0.6.0",
"@openzeppelin/contracts": "4.9.3",
"@openzeppelin/contracts-upgradeable": "4.9.3",
Expand Down
606 changes: 268 additions & 338 deletions contracts/pnpm-lock.yaml

Large diffs are not rendered by default.

6 changes: 1 addition & 5 deletions contracts/src/v0.8/functions/dev/v1_X/ocr/OCR2Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ abstract contract OCR2Base is ConfirmedOwner, OCR2Abstract {
*/

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/functions/v1_0_0/ocr/OCR2Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,7 @@ abstract contract OCR2Base is ConfirmedOwner, OCR2Abstract {
*/

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/functions/v1_1_0/ocr/OCR2Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,7 @@ abstract contract OCR2Base is ConfirmedOwner, OCR2Abstract {
*/

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/functions/v1_3_0/ocr/OCR2Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,7 @@ abstract contract OCR2Base is ConfirmedOwner, OCR2Abstract {
*/

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/keystone/OCR3Capability.sol
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,7 @@ contract OCR3Capability is ConfirmedOwner, OCR2Abstract {
*/

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/liquiditymanager/ocr/OCR3Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,7 @@ abstract contract OCR3Base is OwnerIsCreator, OCR3Abstract {
}

// Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 numSigners,
uint256 numTransmitters,
uint256 f
) {
modifier checkConfigValid(uint256 numSigners, uint256 numTransmitters, uint256 f) {
if (numSigners > MAX_NUM_ORACLES) revert InvalidConfig("too many signers");
if (f == 0) revert InvalidConfig("f must be positive");
if (numSigners != numTransmitters) revert InvalidConfig("oracle addresses out of registration");
Expand Down
6 changes: 1 addition & 5 deletions contracts/src/v0.8/shared/ocr2/OCR2Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,7 @@ abstract contract OCR2Base is OwnerIsCreator, OCR2Abstract {
address[] internal s_transmitters;

/// @dev Reverts transaction if config args are invalid
modifier checkConfigValid(
uint256 _numSigners,
uint256 _numTransmitters,
uint256 _f
) {
modifier checkConfigValid(uint256 _numSigners, uint256 _numTransmitters, uint256 _f) {
require(_numSigners <= MAX_NUM_ORACLES, "too many signers");
require(_f > 0, "f must be positive");
require(_numSigners == _numTransmitters, "oracle addresses out of registration");
Expand Down
4 changes: 1 addition & 3 deletions contracts/src/v0.8/shared/test/testhelpers/GasConsumer.sol
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ contract GasConsumer {
// While loop that operates indefinitely, written in yul to ensure better granularity over exactly how much gas is spent
for {
// Loop will run forever since 0 < 1
} lt(0, 1) {

} {
} lt(0, 1) {} {
// If 100 gas is remaining, then exit the loop by returning. 100 was determined by manual binary search to be
// the minimal amount of gas needed but less than the cost of another loop
if lt(gas(), 100) {
Expand Down

0 comments on commit 0dba7fb

Please sign in to comment.