Skip to content

Commit

Permalink
Merge branch 'develop' into BCI-2702-Apply-LimitMultiplier-to-gas-lim…
Browse files Browse the repository at this point in the history
…it-in-all-gas-estimators
  • Loading branch information
silaslenihan committed Mar 25, 2024
2 parents d37b71f + 7dc21d9 commit da7d128
Show file tree
Hide file tree
Showing 151 changed files with 494 additions and 6,306 deletions.
12 changes: 12 additions & 0 deletions .changeset/afraid-baboons-nail.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
"chainlink": patch
---

VerboseLogging is now turned on by default.

You may disable if this results in excessive log volume. Disable like so:

```
[Pipeline]
VerboseLogging = false
```
2 changes: 1 addition & 1 deletion .changeset/wicked-suits-watch.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
"chainlink": minor
---

Applied LimitMultiplier to chainSpecificGasLimit in all gas estimators.
Extracted Gas Limit Multiplier from gas estimators to WrappedEvmEstimator.
2 changes: 0 additions & 2 deletions .github/workflows/solidity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ jobs:
- '.github/workflows/solidity.yml'
- '.github/workflows/solidity-foundry.yml'
old_sol:
- 'contracts/src/v0.4/**/*'
- 'contracts/src/v0.5/**/*'
- 'contracts/src/v0.6/**/*'
- 'contracts/src/v0.7/**/*'
Expand Down
4 changes: 2 additions & 2 deletions charts/chainlink-cluster/devspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,8 +208,8 @@ deployments:
runAsUser: 999
runAsGroup: 999
version: v1.12.0
wsrpc-port: 8546
httprpc-port: 8544
wsRpcPort: 8546
httpRpcPort: 8544
chains:
- networkId: 1337
- networkId: 2337
Expand Down
4 changes: 2 additions & 2 deletions charts/chainlink-cluster/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ geth:
runAsUser: 999
runAsGroup: 999
version: v1.12.0
wsrpc-port: 8546
httprpc-port: 8544
wsRpcPort: 8546
httpRpcPort: 8544
blocktime: 1
chains:
- networkId: 1337
Expand Down
4 changes: 1 addition & 3 deletions codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ github_checks:
annotations: false

ignore:
- 'contracts/src/v0.4'
- 'contracts/src/v0.5'
- 'contracts/src/v0.8' # Disabled due to solidity-coverage not reporting coverage
- 'contracts/' # Disabled due to solidity-coverage not reporting coverage
- 'core/internal'
- 'core/scripts'
5 changes: 5 additions & 0 deletions contracts/.changeset/young-crabs-sing.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@chainlink/contracts": minor
---

removed 0.4 and 0.5 contracts
2 changes: 0 additions & 2 deletions contracts/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ node_modules
solc
LinkToken.json
typechain
src/v0.4
src/v0.5
src/v0.6
src/v0.7
**/vendor
Expand Down
10 changes: 2 additions & 8 deletions contracts/.solcover.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
module.exports = {
skipFiles: [
'v0.4/',
'v0.5/',
'v0.6/tests',
'v0.6/interfaces',
'v0.6/vendor',
'v0.7/tests',
'v0.7/interfaces',
'v0.7/vendor',
'v0.6/',
'v0.7/',
'v0.8/mocks',
'v0.8/interfaces',
'v0.8/vendor',
Expand Down
4 changes: 0 additions & 4 deletions contracts/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,10 @@ $ npm install @chainlink/contracts --save
```sh
@chainlink/contracts
├── src # Solidity contracts
│ ├── v0.4
│ ├── v0.5
│ ├── v0.6
│ ├── v0.7
│ └── v0.8
└── abi # ABI json output
├── v0.4
├── v0.5
├── v0.6
├── v0.7
└── v0.8
Expand Down
8 changes: 0 additions & 8 deletions contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ let config = {
},
solidity: {
compilers: [
{
version: '0.4.24',
settings: COMPILER_SETTINGS,
},
{
version: '0.5.0',
settings: COMPILER_SETTINGS,
},
{
version: '0.6.6',
settings: COMPILER_SETTINGS,
Expand Down
2 changes: 1 addition & 1 deletion contracts/scripts/prepublish_generate_abi_folder
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ SCRIPTPATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; cd .. && pwd -P )"
TARGET="abi"

# For each version directory in src, copy the json files to the correct location
versions=( v0.4 v0.5 v0.6 v0.7 v0.8 )
versions=( v0.6 v0.7 v0.8 )
for version in "${versions[@]}"
do
rm -rf $SCRIPTPATH/$TARGET/$version
Expand Down
Loading

0 comments on commit da7d128

Please sign in to comment.