bump foundry, go, npm deps + use abi/bin from chainlink (#1519)

* bump foundry & forge fmt

* bump solhint

* bump deps

* replace local abi/bin code with reference

* lint

Author: RensR

chains/evm/.gas-snapshot

@@ -67,7 +67,7 @@ ERC20LockBox_withdraw:test_Withdraw_MultipleWithdrawals() (gas: 145285)
 ERC20LockBox_withdraw:test_Withdraw_PartialAmount() (gas: 115190)
 ERC20LockBox_withdraw:test_Withdraw_ToDifferentRecipients() (gas: 132506)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_fallbackToWethTransfer() (gas: 98062)
-EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 50412)
+EtherSenderReceiverTest_ccipReceive:test_ccipReceive_happyPath() (gas: 48412)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongToken() (gas: 18116)
 EtherSenderReceiverTest_ccipReceive:test_ccipReceive_wrongTokenAmount() (gas: 16341)
 EtherSenderReceiverTest_ccipSend:test_ccipSend_feeToken() (gas: 147126)
@@ -386,7 +386,7 @@ OffRamp_trialExecute:test_trialExecute_SenderIsNotGasEstimator_CallWithExactGasR
 OffRamp_trialExecute:test_trialExecute_TokenHandlingErrorIsCaught() (gas: 188502)
 OffRamp_trialExecute:test_trialExecute_TokenPoolIsNotAContract() (gas: 294938)
 OnRampOverSuperchainInterop_extractGasLimit:test_extractGasLimit() (gas: 12289)
-OnRampOverSuperchainInterop_forwardFromRouter:test_forwardFromRouter_SingleBasicMessage() (gas: 253692)
+OnRampOverSuperchainInterop_forwardFromRouter:test_forwardFromRouter_SingleBasicMessage() (gas: 251192)
 OnRampOverSuperchainInterop_forwardFromRouter:test_forwardFromRouter_ThreeConsecutiveMessages() (gas: 391849)
 OnRampOverSuperchainInterop_hashInteropMessage:test_hashInteropMessage_BasicMessageHash() (gas: 23770)
 OnRampOverSuperchainInterop_hashInteropMessage:test_hashInteropMessage_SameMessageProducesSameHash() (gas: 12410)
@@ -408,7 +408,7 @@ OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessCustomExtraArgs() (gas: 15
 OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessEmptyExtraArgs() (gas: 154789)
 OnRamp_forwardFromRouter:test_ForwardFromRouterSuccessLegacyExtraArgs() (gas: 157224)
 OnRamp_forwardFromRouter:test_ForwardFromRouter_ConfigurableSourceRouter() (gas: 148332)
-OnRamp_forwardFromRouter:test_ForwardFromRouter_EVM_WithTokenTransfer() (gas: 241455)
+OnRamp_forwardFromRouter:test_ForwardFromRouter_EVM_WithTokenTransfer() (gas: 238955)
 OnRamp_forwardFromRouter:test_ForwardFromRouter_SVM_WithTokenTransfer() (gas: 222800)
 OnRamp_forwardFromRouter:test_ShouldIncrementNonceOnlyOnOrdered() (gas: 221549)
 OnRamp_forwardFromRouter:test_ShouldIncrementSeqNumAndNonce() (gas: 248020)
@@ -469,7 +469,7 @@ Router_ccipSend:test_ccipSend_nativeFeeOneTokenSuccess_gas() (gas: 231150)
 Router_constructor:test_Constructor() (gas: 13407)
 Router_getArmProxy:test_getArmProxy() (gas: 10647)
 Router_getFee:test_GetFeeSupportedChain() (gas: 53618)
-Router_recoverTokens:test_RecoverTokens() (gas: 54449)
+Router_recoverTokens:test_RecoverTokens() (gas: 52449)
 Router_routeMessage:test_routeMessage_AutoExec() (gas: 42281)
 Router_routeMessage:test_routeMessage_ExecutionEvent() (gas: 158277)
 Router_routeMessage:test_routeMessage_ManualExec() (gas: 35322)

chains/evm/GNUmakefile

@@ -10,7 +10,7 @@ snapshot-diff: ## Make a snapshot for a specific product.
 
 .PHONY: foundry
 foundry: ## Install foundry.
-	foundryup --install v1.3.5
+	foundryup --install v1.5.1
 
 # it may be necessary to install libusb on your machine as a dependency for this script to work
 .PHONY: foundry-zksync

chains/evm/contracts/DonIDClaimer.sol

@@ -85,7 +85,10 @@ contract DonIDClaimer is ITypeAndVersion, Ownable2StepMsgSender {
   /// @param senderAddress The address to be added or removed as an authorized deployer
   /// @param allowed Boolean indicating whether the address is authorized (true) or revoked (false)
   /// @dev Can only be called by an existing authorized deployer
-  function setAuthorizedDeployer(address senderAddress, bool allowed) external onlyOwner {
+  function setAuthorizedDeployer(
+    address senderAddress,
+    bool allowed
+  ) external onlyOwner {
     if (senderAddress == address(0)) revert ZeroAddressNotAllowed();
 
     if (allowed) {

chains/evm/contracts/FeeQuoter.sol

@@ -9,9 +9,12 @@ import {Client} from "./libraries/Client.sol";
 import {Internal} from "./libraries/Internal.sol";
 import {Pool} from "./libraries/Pool.sol";
 import {USDPriceWith18Decimals} from "./libraries/USDPriceWith18Decimals.sol";
-import {KeystoneFeedsPermissionHandler} from "@chainlink/contracts/src/v0.8/keystone/KeystoneFeedsPermissionHandler.sol";
-import {KeystoneFeedDefaultMetadataLib} from
-  "@chainlink/contracts/src/v0.8/keystone/lib/KeystoneFeedDefaultMetadataLib.sol";
+import {
+  KeystoneFeedsPermissionHandler
+} from "@chainlink/contracts/src/v0.8/keystone/KeystoneFeedsPermissionHandler.sol";
+import {
+  KeystoneFeedDefaultMetadataLib
+} from "@chainlink/contracts/src/v0.8/keystone/lib/KeystoneFeedDefaultMetadataLib.sol";
 import {AuthorizedCallers} from "@chainlink/contracts/src/v0.8/shared/access/AuthorizedCallers.sol";
 import {AggregatorV3Interface} from "@chainlink/contracts/src/v0.8/shared/interfaces/AggregatorV3Interface.sol";
 
@@ -436,7 +439,10 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
   /// @param feeTokensToRemove The addresses of the tokens which are no longer considered feeTokens.
   /// @param feeTokensToAdd The addresses of the tokens which are now considered fee tokens.
   /// and can be used to calculate fees.
-  function _applyFeeTokensUpdates(address[] memory feeTokensToRemove, address[] memory feeTokensToAdd) private {
+  function _applyFeeTokensUpdates(
+    address[] memory feeTokensToRemove,
+    address[] memory feeTokensToAdd
+  ) private {
     for (uint256 i = 0; i < feeTokensToRemove.length; ++i) {
       if (s_feeTokens.remove(feeTokensToRemove[i])) {
         emit FeeTokenRemoved(feeTokensToRemove[i]);
@@ -515,7 +521,10 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
   /// @dev This function is called to process incoming price feed data.
   /// @param metadata Arbitrary metadata associated with the report (not used in this implementation).
   /// @param report Encoded report containing an array of `ReceivedCCIPFeedReport` structs.
-  function onReport(bytes calldata metadata, bytes calldata report) external {
+  function onReport(
+    bytes calldata metadata,
+    bytes calldata report
+  ) external {
     (bytes10 workflowName, address workflowOwner, bytes2 reportName) = metadata._extractMetadataInfo();
 
     _validateReportPermission(msg.sender, workflowOwner, workflowName, reportName);
@@ -633,10 +642,11 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
     // Total USD fee is in 36 decimals, feeTokenPrice is in 18 decimals USD for 1e18 smallest token denominations.
     // The result is the fee in the feeTokens smallest denominations (e.g. wei for ETH).
     // uint112(packedGasPrice) = executionGasPrice
-    return (
-      totalDestChainGas * uint112(packedGasPrice) * destChainConfig.gasMultiplierWeiPerEth + premiumFeeUSDWei
-        + dataAvailabilityCostUSD36Decimals
-    ) / feeTokenPrice;
+    return (totalDestChainGas
+        * uint112(packedGasPrice)
+        * destChainConfig.gasMultiplierWeiPerEth
+        + premiumFeeUSDWei
+        + dataAvailabilityCostUSD36Decimals) / feeTokenPrice;
   }
 
   /// @notice Sets the fee configuration for a token.
@@ -843,7 +853,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
 
       for (uint256 j = 0; j < tokenTransferFeeConfigArg.tokenTransferFeeConfigs.length; ++j) {
         TokenTransferFeeConfig memory tokenTransferFeeConfig =
-          tokenTransferFeeConfigArg.tokenTransferFeeConfigs[j].tokenTransferFeeConfig;
+        tokenTransferFeeConfigArg.tokenTransferFeeConfigs[j].tokenTransferFeeConfig;
         address token = tokenTransferFeeConfigArg.tokenTransferFeeConfigs[j].token;
 
         if (tokenTransferFeeConfig.minFeeUSDCents >= tokenTransferFeeConfig.maxFeeUSDCents) {
@@ -1039,12 +1049,14 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
         || destChainConfig.chainFamilySelector == Internal.CHAIN_FAMILY_SELECTOR_APTOS
         || destChainConfig.chainFamilySelector == Internal.CHAIN_FAMILY_SELECTOR_TVM
     ) {
-      gasLimit = _parseGenericExtraArgsFromBytes(
+      gasLimit =
+      _parseGenericExtraArgsFromBytes(
         message.extraArgs,
         destChainConfig.defaultTxGasLimit,
         destChainConfig.maxPerMsgGasLimit,
         destChainConfig.enforceOutOfOrder
-      ).gasLimit;
+      )
+      .gasLimit;
 
       _validateDestFamilyAddress(destChainConfig.chainFamilySelector, message.receiver, gasLimit);
     } else if (destChainConfig.chainFamilySelector == Internal.CHAIN_FAMILY_SELECTOR_SUI) {
@@ -1072,8 +1084,8 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
         // The messaging accounts needed for CCIP receiver on SUI are:
         // message receiver,
         // plus remaining accounts specified in Sui extraArgs. Each account is 32 bytes.
-        suiExpandedDataLength +=
-          ((receiverObjectIdsLength + Client.SUI_MESSAGING_ACCOUNTS_OVERHEAD) * Client.SUI_ACCOUNT_BYTE_SIZE);
+        suiExpandedDataLength += ((receiverObjectIdsLength + Client.SUI_MESSAGING_ACCOUNTS_OVERHEAD)
+            * Client.SUI_ACCOUNT_BYTE_SIZE);
       }
 
       if (numberOfTokens > 0 && suiExtraArgsV1.tokenReceiver == bytes32(0)) {
@@ -1128,8 +1140,8 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
         // The messaging accounts needed for CCIP receiver on SVM are:
         // message receiver, offRamp PDA signer,
         // plus remaining accounts specified in SVM extraArgs. Each account is 32 bytes.
-        svmExpandedDataLength +=
-          ((accountsLength + Client.SVM_MESSAGING_ACCOUNTS_OVERHEAD) * Client.SVM_ACCOUNT_BYTE_SIZE);
+        svmExpandedDataLength += ((accountsLength + Client.SVM_MESSAGING_ACCOUNTS_OVERHEAD)
+            * Client.SVM_ACCOUNT_BYTE_SIZE);
       }
 
       if (numberOfTokens > 0 && svmExtraArgsV1.tokenReceiver == bytes32(0)) {
@@ -1229,7 +1241,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
         true,
         abi.encode(
           _parseSuiExtraArgsFromBytes(extraArgs, destChainConfig.maxPerMsgGasLimit, destChainConfig.enforceOutOfOrder)
-            .tokenReceiver
+          .tokenReceiver
         )
       );
     }
@@ -1242,7 +1254,7 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
         true,
         abi.encode(
           _parseSVMExtraArgsFromBytes(extraArgs, destChainConfig.maxPerMsgGasLimit, destChainConfig.enforceOutOfOrder)
-            .tokenReceiver
+          .tokenReceiver
         )
       );
     }
@@ -1322,13 +1334,11 @@ contract FeeQuoter is AuthorizedCallers, IFeeQuoter, ITypeAndVersion, IReceiver,
       if (
         destChainSelector == 0 || destChainConfig.defaultTxGasLimit == 0
           || destChainConfig.defaultTxGasLimit > destChainConfig.maxPerMsgGasLimit
-          || (
-            destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_EVM
-              && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_SVM
-              && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_APTOS
-              && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_SUI
-              && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_TVM
-          )
+          || (destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_EVM
+            && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_SVM
+            && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_APTOS
+            && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_SUI
+            && destChainConfig.chainFamilySelector != Internal.CHAIN_FAMILY_SELECTOR_TVM)
       ) {
         revert InvalidDestChainConfig(destChainSelector);
       }

chains/evm/contracts/NonceManager.sol

@@ -59,11 +59,17 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
   /// @param destChainSelector The destination chain selector.
   /// @param sender The sender address.
   /// @return outboundNonce The outbound nonce.
-  function getOutboundNonce(uint64 destChainSelector, address sender) external view returns (uint64) {
+  function getOutboundNonce(
+    uint64 destChainSelector,
+    address sender
+  ) external view returns (uint64) {
     return _getOutboundNonce(destChainSelector, sender);
   }
 
-  function _getOutboundNonce(uint64 destChainSelector, address sender) private view returns (uint64) {
+  function _getOutboundNonce(
+    uint64 destChainSelector,
+    address sender
+  ) private view returns (uint64) {
     uint64 outboundNonce = s_outboundNonces[destChainSelector][sender];
 
     // When introducing the NonceManager with existing lanes, we still want to have sequential nonces.
@@ -104,11 +110,17 @@ contract NonceManager is INonceManager, AuthorizedCallers, ITypeAndVersion {
   /// @param sourceChainSelector The source chain selector.
   /// @param sender The encoded sender address.
   /// @return inboundNonce The inbound nonce.
-  function getInboundNonce(uint64 sourceChainSelector, bytes calldata sender) external view returns (uint64) {
+  function getInboundNonce(
+    uint64 sourceChainSelector,
+    bytes calldata sender
+  ) external view returns (uint64) {
     return _getInboundNonce(sourceChainSelector, sender);
   }
 
-  function _getInboundNonce(uint64 sourceChainSelector, bytes calldata sender) private view returns (uint64) {
+  function _getInboundNonce(
+    uint64 sourceChainSelector,
+    bytes calldata sender
+  ) private view returns (uint64) {
     uint64 inboundNonce = s_inboundNonces[sourceChainSelector][sender];
 
     // When introducing the NonceManager with existing lanes, we still want to have sequential nonces. Referencing the

chains/evm/contracts/Router.sol

@@ -63,7 +63,10 @@ contract Router is IRouter, IRouterClient, ITypeAndVersion, OwnerIsCreator {
   // lookups for specific chain/offramp pairs.
   EnumerableSet.UintSet private s_chainSelectorAndOffRamps;
 
-  constructor(address wrappedNative, address armProxy) {
+  constructor(
+    address wrappedNative,
+    address armProxy
+  ) {
     // Zero address indicates unsupported auto-wrapping, therefore, unsupported
     // native fee token payments.
     s_wrappedNative = wrappedNative;
@@ -227,7 +230,10 @@ contract Router is IRouter, IRouterClient, ITypeAndVersion, OwnerIsCreator {
   }
 
   /// @inheritdoc IRouter
-  function isOffRamp(uint64 sourceChainSelector, address offRamp) public view returns (bool) {
+  function isOffRamp(
+    uint64 sourceChainSelector,
+    address offRamp
+  ) public view returns (bool) {
     // We have to encode the sourceChainSelector and offRamp into a uint256 to use as a key in the set.
     return s_chainSelectorAndOffRamps.contains(_mergeChainSelectorAndOffRamp(sourceChainSelector, offRamp));
   }
@@ -275,7 +281,11 @@ contract Router is IRouter, IRouterClient, ITypeAndVersion, OwnerIsCreator {
   /// @dev Must be onlyOwner to avoid malicious token contract calls.
   /// @param tokenAddress ERC20-token to recover
   /// @param to Destination address to send the tokens to.
-  function recoverTokens(address tokenAddress, address to, uint256 amount) external onlyOwner {
+  function recoverTokens(
+    address tokenAddress,
+    address to,
+    uint256 amount
+  ) external onlyOwner {
     if (to == address(0)) revert InvalidRecipientAddress(to);
 
     if (tokenAddress == address(0)) {

chains/evm/contracts/applications/CCIPClientExample.sol

@@ -44,12 +44,18 @@ contract CCIPClientExample is CCIPReceiver, Ownable2StepMsgSender {
   // one can simply key based on (chainSelector, messageType) instead of only chainSelector.
   mapping(uint64 destChainSelector => bytes extraArgsBytes) public s_chains;
 
-  constructor(IRouterClient router, IERC20 feeToken) CCIPReceiver(address(router)) {
+  constructor(
+    IRouterClient router,
+    IERC20 feeToken
+  ) CCIPReceiver(address(router)) {
     s_feeToken = feeToken;
     s_feeToken.approve(address(router), type(uint256).max);
   }
 
-  function enableChain(uint64 chainSelector, bytes memory extraArgs) external onlyOwner {
+  function enableChain(
+    uint64 chainSelector,
+    bytes memory extraArgs
+  ) external onlyOwner {
     s_chains[chainSelector] = extraArgs;
   }
 
@@ -88,9 +94,10 @@ contract CCIPClientExample is CCIPReceiver, Ownable2StepMsgSender {
       extraArgs: s_chains[destChainSelector],
       feeToken: address(0) // We leave the feeToken empty indicating we'll pay raw native.
     });
-    bytes32 messageId = IRouterClient(i_ccipRouter).ccipSend{
-      value: IRouterClient(i_ccipRouter).getFee(destChainSelector, message)
-    }(destChainSelector, message);
+    bytes32 messageId = IRouterClient(i_ccipRouter)
+    .ccipSend{value: IRouterClient(i_ccipRouter).getFee(destChainSelector, message)}(
+      destChainSelector, message
+    );
     emit MessageSent(messageId);
   }
 

chains/evm/contracts/applications/DefensiveExample.sol

@@ -39,7 +39,10 @@ contract DefensiveExample is CCIPClientExample {
   // This is used to simulate a revert in the processMessage function.
   bool internal s_simRevert = false;
 
-  constructor(IRouterClient router, IERC20 feeToken) CCIPClientExample(router, feeToken) {}
+  constructor(
+    IRouterClient router,
+    IERC20 feeToken
+  ) CCIPClientExample(router, feeToken) {}
 
   /// @notice The entrypoint for the CCIP router to call. This function should
   /// never revert, all errors should be handled internally in this contract.
@@ -82,7 +85,10 @@ contract DefensiveExample is CCIPClientExample {
   /// @notice This function is callable by the owner when a message has failed  to unblock the tokens
   /// that are associated with that message.
   /// @dev This function is only callable by the owner.
-  function retryFailedMessage(bytes32 messageId, address tokenReceiver) external onlyOwner {
+  function retryFailedMessage(
+    bytes32 messageId,
+    address tokenReceiver
+  ) external onlyOwner {
     if (s_failedMessages.get(messageId) != uint256(ErrorCode.BASIC)) revert MessageNotFailed(messageId);
     // Set the error code to 0 to disallow reentry and retry the same failed message multiple times.
     s_failedMessages.set(messageId, uint256(ErrorCode.RESOLVED));

chains/evm/contracts/applications/PingPongDemo.sol

@@ -30,7 +30,10 @@ contract PingPongDemo is CCIPReceiver, Ownable2StepMsgSender, ITypeAndVersion {
   // Allowing out of order execution.
   bool private s_outOfOrderExecution;
 
-  constructor(address router, IERC20 feeToken) CCIPReceiver(router) {
+  constructor(
+    address router,
+    IERC20 feeToken
+  ) CCIPReceiver(router) {
     s_isPaused = false;
     s_feeToken = feeToken;
     s_feeToken.approve(address(router), type(uint256).max);
@@ -40,7 +43,10 @@ contract PingPongDemo is CCIPReceiver, Ownable2StepMsgSender, ITypeAndVersion {
     return "PingPongDemo 1.5.0";
   }
 
-  function setCounterpart(uint64 counterpartChainSelector, bytes calldata counterpartAddress) external onlyOwner {
+  function setCounterpart(
+    uint64 counterpartChainSelector,
+    bytes calldata counterpartAddress
+  ) external onlyOwner {
     s_counterpartChainSelector = counterpartChainSelector;
     s_counterpartAddress = counterpartAddress;
   }
@@ -63,7 +69,9 @@ contract PingPongDemo is CCIPReceiver, Ownable2StepMsgSender, ITypeAndVersion {
       data: abi.encode(pingPongCount),
       tokenAmounts: new Client.EVMTokenAmount[](0),
       extraArgs: Client._argsToBytes(
-        Client.GenericExtraArgsV2({gasLimit: uint256(DEFAULT_GAS_LIMIT), allowOutOfOrderExecution: s_outOfOrderExecution})
+        Client.GenericExtraArgsV2({
+          gasLimit: uint256(DEFAULT_GAS_LIMIT), allowOutOfOrderExecution: s_outOfOrderExecution
+        })
       ),
       feeToken: address(s_feeToken)
     });