Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump version to 1.5 #1263

Merged
merged 10 commits into from
Aug 9, 2024
Merged

bump version to 1.5 #1263

merged 10 commits into from
Aug 9, 2024

Conversation

RensR
Copy link
Collaborator

@RensR RensR commented Aug 6, 2024

Copy link
Contributor

github-actions bot commented Aug 6, 2024

LCOV of commit d395e13 during Solidity Foundry #7139

Summary coverage rate:
  lines......: 98.7% (1882 of 1907 lines)
  functions..: 96.4% (347 of 360 functions)
  branches...: 90.6% (797 of 880 branches)

Files changed coverage rate: n/a

RensR added 3 commits August 7, 2024 11:03
# Conflicts:
#	contracts/gas-snapshots/ccip.gas-snapshot
#	core/gethwrappers/ccip/generated/burn_from_mint_token_pool/burn_from_mint_token_pool.go
#	core/gethwrappers/ccip/generated/burn_mint_token_pool/burn_mint_token_pool.go
#	core/gethwrappers/ccip/generated/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go
#	core/gethwrappers/ccip/generated/burn_with_from_mint_token_pool/burn_with_from_mint_token_pool.go
#	core/gethwrappers/ccip/generated/evm_2_evm_multi_offramp/evm_2_evm_multi_offramp.go
#	core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go
#	core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go
#	core/gethwrappers/ccip/generated/lock_release_token_pool_and_proxy/lock_release_token_pool_and_proxy.go
#	core/gethwrappers/ccip/generated/usdc_token_pool/usdc_token_pool.go
#	core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
# Conflicts:
#	contracts/gas-snapshots/ccip.gas-snapshot
#	contracts/src/v0.8/ccip/libraries/Pool.sol
#	contracts/src/v0.8/ccip/offRamp/EVM2EVMMultiOffRamp.sol
#	contracts/src/v0.8/ccip/offRamp/EVM2EVMOffRamp.sol
#	contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAbstract.sol
#	contracts/src/v0.8/ccip/pools/BurnMintTokenPoolAndProxy.sol
#	contracts/src/v0.8/ccip/pools/LockReleaseTokenPoolAndProxy.sol
#	contracts/src/v0.8/ccip/pools/USDC/USDCTokenPool.sol
#	contracts/src/v0.8/ccip/test/helpers/BurnMintMultiTokenPool.sol
#	core/gethwrappers/ccip/generated/burn_from_mint_token_pool/burn_from_mint_token_pool.go
#	core/gethwrappers/ccip/generated/burn_mint_token_pool/burn_mint_token_pool.go
#	core/gethwrappers/ccip/generated/burn_mint_token_pool_and_proxy/burn_mint_token_pool_and_proxy.go
#	core/gethwrappers/ccip/generated/burn_with_from_mint_token_pool/burn_with_from_mint_token_pool.go
#	core/gethwrappers/ccip/generated/evm_2_evm_multi_offramp/evm_2_evm_multi_offramp.go
#	core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go
#	core/gethwrappers/ccip/generated/lock_release_token_pool/lock_release_token_pool.go
#	core/gethwrappers/ccip/generated/lock_release_token_pool_and_proxy/lock_release_token_pool_and_proxy.go
#	core/gethwrappers/ccip/generated/usdc_token_pool/usdc_token_pool.go
#	core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
RensR added 2 commits August 9, 2024 12:27
# Conflicts:
#	core/gethwrappers/ccip/generated/evm_2_evm_offramp/evm_2_evm_offramp.go
#	core/gethwrappers/ccip/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@RensR RensR marked this pull request as ready for review August 9, 2024 10:31
@RensR RensR requested review from makramkd, elatoskinas, RayXpub and a team as code owners August 9, 2024 10:31
@@ -33,7 +33,6 @@ contract EVM2EVMMultiOffRamp is ITypeAndVersion, MultiOCR3Base {
using ERC165Checker for address;
using EnumerableMapAddresses for EnumerableMapAddresses.AddressToAddressMap;

error AlreadyExecuted(uint64 sourceChainSelector, uint64 sequenceNumber);
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused

@@ -17,7 +17,7 @@ const (
V1_1_0 = "1.1.0"
V1_2_0 = "1.2.0"
V1_4_0 = "1.4.0"
V1_5_0 = "1.5.0-dev"
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means the offchain code is NOT compatible with -dev contract anymore, which is what we want

@cl-sonarqube-production
Copy link

@RensR RensR merged commit a097381 into ccip-develop Aug 9, 2024
111 checks passed
@RensR RensR deleted the 1.5-final-release branch August 9, 2024 11:12
dhaidashenko pushed a commit that referenced this pull request Sep 2, 2024
Final release of all 1.5 contracts - don't merge before the other PRs
are all in


TODO
- #1258
- #1256
- #1273

---------

Co-authored-by: app-token-issuer-infra-releng[bot] <120227048+app-token-issuer-infra-releng[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants