Skip to content

Commit

Permalink
Merge pull request #61 from OffchainLabs/merge-main-develop
Browse files Browse the repository at this point in the history
chore: merge main into develop
  • Loading branch information
gzeoneth authored Oct 2, 2023
2 parents 2f5f1fc + 09436d3 commit 2dd6d79
Show file tree
Hide file tree
Showing 5 changed files with 800 additions and 828 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/contract-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Setup nodejs
uses: actions/setup-node@v2
with:
node-version: '16'
node-version: '18'
cache: 'yarn'
cache-dependency-path: '**/yarn.lock'

Expand Down
1 change: 1 addition & 0 deletions hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import '@nomiclabs/hardhat-etherscan'
import '@typechain/hardhat'
import 'solidity-coverage'
import 'hardhat-gas-reporter'
import 'hardhat-ignore-warnings'

const solidity = {
compilers: [
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,18 @@
"eslint-plugin-prettier": "^4.0.0",
"ethereum-waffle": "^3.4.0",
"ethers": "^5.5.2",
"hardhat": "^2.6.6",
"hardhat-deploy": "^0.11.4",
"hardhat-gas-reporter": "^1.0.8",
"hardhat": "^2.17.2",
"hardhat-deploy": "^0.11.37",
"hardhat-gas-reporter": "^1.0.9",
"hardhat-ignore-warnings": "^0.2.9",
"postinstall-postinstall": "^2.1.0",
"prettier": "^2.5.1",
"prettier-plugin-solidity": "^1.0.0-beta.19",
"solhint": "^3.3.7",
"solhint-plugin-prettier": "^0.0.5",
"solidity-coverage": "^0.7.20",
"tslint": "^6.1.3",
"solidity-coverage": "^0.8.4",
"ts-node": "^10.4.0",
"tslint": "^6.1.3",
"typechain": "^8.0.0",
"typescript": "^4.5.4"
},
Expand Down
3 changes: 2 additions & 1 deletion src/mocks/Simple.sol
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,8 @@ contract Simple {
uint256 before = gasleft();
// The inner call may revert, but we still want to return the amount of gas used,
// so we ignore the result of this call.
(to.staticcall{gas: before - 10000}(input));
// solc-ignore-next-line unused-call-retval
to.staticcall{gas: before - 10000}(input);
return before - gasleft();
}
}
Loading

0 comments on commit 2dd6d79

Please sign in to comment.