Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/smartcontractkit/chainlink
Browse files Browse the repository at this point in the history
… into BCFR-944-multinode-extraction
  • Loading branch information
DylanTinianov committed Dec 20, 2024
2 parents d50a541 + 28d2549 commit 9c21619
Show file tree
Hide file tree
Showing 456 changed files with 9,446 additions and 3,125 deletions.
5 changes: 5 additions & 0 deletions .changeset/eighty-geckos-switch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

Reduce PriceMin on Avalanche to 1 gwei #nops
5 changes: 5 additions & 0 deletions .changeset/large-fishes-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Fix logic for mapping affected files in CI that affects golangci-lint execution
5 changes: 5 additions & 0 deletions .changeset/mean-ravens-stare.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": patch
---

#internal add versioned geth wrappers for keystone prod contracts
5 changes: 5 additions & 0 deletions .changeset/metal-houses-approve.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Added TxExpirationRebroadcast feature and config for Solana TXM. #added
5 changes: 5 additions & 0 deletions .changeset/wild-cats-think.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"chainlink": minor
---

Added the `EVM.Transactions.Enabled` config to enable or disable the transaction manager. #added
34 changes: 22 additions & 12 deletions .github/scripts/map-affected-files-to-modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,35 @@ echo "Found modules: $modules"
declare -A unique_modules

for path_to_file in $changed_files; do
echo "Resolving a module affected by a file: '$path_to_file'"
echo "Resolving a module affected by a file: '$path_to_file'"
# the flag that indicates if the path matches any module
is_path_in_modules=false
for module in $modules; do
echo "Validating against module: '$module'"

# if no slash in the path, it is the root
# (i.e. `main.go`, `.gitignore` vs `core/main.go`)
if [[ ! $path_to_file =~ \/ ]]; then
echo "File '$path_to_file' mapped to the "root" module."
unique_modules["."]="."
break
# if a module's name matches with a file path
# add it, to the affected modules array, skipping the root (`.`)
elif [[ $module != "." && $path_to_file =~ ^$module* ]]; then
echo "File '$path_to_file' mapped the module '$module'"
if [[ $module != "." && $path_to_file =~ ^$module* ]]; then
echo -e "File '$path_to_file' mapped to the module '$module'\n"
unique_modules["$module"]="$module"
is_path_in_modules=true
break
fi
done
done
done
# if no matched module default to root module
if [[ $is_path_in_modules == false ]]; then
echo "File '$path_to_file' did not match any module, defaulting to root '.'"
unique_modules["."]="."
is_path_in_modules=false
fi
is_path_in_modules=false
done

# if the path is empty (for any reason), it will not get to the loop,
# so if the unique_modules array is empty, default to the root module
if [[ ${#unique_modules[@]} -eq 0 ]]; then
echo "No files were changed, defaulting to the root module '.'"
unique_modules["."]="."
fi

# Convert keys (module names) of the associative array to an indexed array
affected_modules=("${!unique_modules[@]}")
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-core-partial.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Core Unit Tests
name: Experimental Test Optimization

on:
push:
Expand Down
5 changes: 2 additions & 3 deletions ccip/config/evm/Avalanche_Fuji.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ RPCBlockQueryDelay = 2
NoNewFinalizedHeadsThreshold = '1m'

[GasEstimator]
PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '25 gwei'
PriceMin = '1 gwei'
PriceDefault = '1 gwei'

[GasEstimator.BlockHistory]
BlockHistorySize = 24
Expand Down
5 changes: 2 additions & 3 deletions ccip/config/evm/Avalanche_Mainnet.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,8 @@ RPCBlockQueryDelay = 2
NoNewFinalizedHeadsThreshold = '1m'

[GasEstimator]
PriceDefault = '25 gwei'
PriceMax = '115792089237316195423570985008687907853269984665.640564039457584007913129639935 tether'
PriceMin = '25 gwei'
PriceMin = '1 gwei'
PriceDefault = '1 gwei'

[GasEstimator.BlockHistory]
# Average block time of 2s
Expand Down
5 changes: 5 additions & 0 deletions contracts/.changeset/new-elephants-behave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@chainlink/contracts': patch
---

fix test naming
10 changes: 10 additions & 0 deletions contracts/.changeset/tame-cycles-ring.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@chainlink/contracts': patch
---

enable via-ir in CCIP compilation


PR issue: CCIP-4656

Solidity Review issue: CCIP-3966
10 changes: 10 additions & 0 deletions contracts/.changeset/violet-lamps-pump.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
'@chainlink/contracts': patch
---

Create a new version of the ERC165Checker library which checks for sufficient gas before making an external call to prevent message delivery issues. #bugfix


PR issue: CCIP-4659

Solidity Review issue: CCIP-3966
13 changes: 12 additions & 1 deletion contracts/foundry.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,23 @@ multiline_func_header = "params_first"
sort_imports = true
single_line_statement_blocks = "preserve"

# This profile should be used for testing CCIP locally and in CI.
[profile.ccip]
solc_version = '0.8.24'
solc_version = '0.8.26'
src = 'src/v0.8/ccip'
test = 'src/v0.8/ccip/test'
evm_version = 'paris'
optimizer_runs = 500

# This profile should be used prior to any release to ensure the tests are passing with via-ir enabled. Enabling via-ir
# locally or in CI will slow down the compilation process, so it is not recommended to use it for everyday development.
[profile.ccip-viair]
solc_version = '0.8.26'
src = 'src/v0.8/ccip'
test = 'src/v0.8/ccip/test'
evm_version = 'paris'
optimizer_runs = 800
via_ir = true

[profile.functions]
solc_version = '0.8.19'
Expand Down
Loading

0 comments on commit 9c21619

Please sign in to comment.