Make Gateway entry points nonreantrant

contracts/foundry.toml

@@ -1,5 +1,5 @@
 [profile.default]
-solc_version = "0.8.25"
+solc_version = "0.8.28"
 optimizer = true
 optimizer_runs = 20000
 via_ir = false
@@ -13,8 +13,12 @@ fs_permissions = [
 ignored_error_codes = [
     # DeployLocal.sol is never deployed
     5574,
+    # tstore
+    2394,
 ]
 
+evm_version = 'Cancun'
+
 [profile.production]
 via_ir = true
 

contracts/scripts/Deploy.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {GatewayProxy} from "../src/GatewayProxy.sol";

contracts/scripts/DeployBeefyClient.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Script} from "forge-std/Script.sol";
 import {BeefyClient} from "../src/BeefyClient.sol";

contracts/scripts/DeployLocal.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {Script} from "forge-std/Script.sol";

contracts/scripts/DeployLocalGatewayLogic.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {AgentExecutor} from "../src/AgentExecutor.sol";
 import {Gateway} from "../src//Gateway.sol";

contracts/scripts/FundAgent.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {Script} from "forge-std/Script.sol";

contracts/scripts/UpgradeShell.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {Script} from "forge-std/Script.sol";

contracts/scripts/westend/UpgradeShell.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {WETH9} from "canonical-weth/WETH9.sol";
 import {Script} from "forge-std/Script.sol";

contracts/src/Agent.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 /// @title An agent contract that acts on behalf of a consensus system on Polkadot
 /// @dev Instances of this contract act as an agents for arbitrary consensus systems on Polkadot. These consensus systems

contracts/src/AgentExecutor.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {AgentExecuteCommand, ParaID} from "./Types.sol";
 import {SubstrateTypes} from "./SubstrateTypes.sol";

contracts/src/Assets.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {IERC20} from "./interfaces/IERC20.sol";
 import {IGateway} from "./interfaces/IGateway.sol";
@@ -254,7 +254,7 @@ library Assets {
         // It means that registration can be retried.
         // But register a PNA here is not allowed
         TokenInfo storage info = $.tokenRegistry[token];
-        if(info.foreignID != bytes32(0)) {
+        if (info.foreignID != bytes32(0)) {
             revert TokenAlreadyRegistered();
         }
         info.isRegistered = true;

contracts/src/BeefyClient.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {ECDSA} from "openzeppelin/utils/cryptography/ECDSA.sol";
 import {SubstrateMerkleProof} from "./utils/SubstrateMerkleProof.sol";

contracts/src/Gateway.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {MerkleProof} from "openzeppelin/utils/cryptography/MerkleProof.sol";
 import {Verification} from "./Verification.sol";
@@ -30,6 +30,7 @@ import {SafeNativeTransfer} from "./utils/SafeTransfer.sol";
 import {Call} from "./utils/Call.sol";
 import {Math} from "./utils/Math.sol";
 import {ScaleCodec} from "./utils/ScaleCodec.sol";
+import {ReentrantGuard} from "./utils/ReentrantGuard.sol";
 
 import {
     AgentExecuteParams,
@@ -74,7 +75,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
     // Gas used for:
     // 1. Mapping a command id to an implementation function
     // 2. Calling implementation function
-    uint256 DISPATCH_OVERHEAD_GAS = 10_000;
+    uint256 constant DISPATCH_OVERHEAD_GAS = 10_000;
 
     // The maximum fee that can be sent to a destination parachain to pay for execution (DOT).
     // Has two functions:
@@ -108,6 +109,13 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         _;
     }
 
+    // Makes sure that a method is non reentrant.
+    modifier nonreentrant() {
+        ReentrantGuard.checkAndSet();
+        _;
+        ReentrantGuard.clear();
+    }
+
     constructor(
         address beefyClient,
         address agentExecutor,
@@ -137,7 +145,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         InboundMessage calldata message,
         bytes32[] calldata leafProof,
         Verification.Proof calldata headerProof
-    ) external {
+    ) external nonreentrant {
         uint256 startGas = gasleft();
 
         Channel storage channel = _ensureChannel(message.channelID);
@@ -437,7 +445,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
     }
 
     // Register an Ethereum-native token in the gateway and on AssetHub
-    function registerToken(address token) external payable {
+    function registerToken(address token) external payable nonreentrant {
         _submitOutbound(Assets.registerToken(token));
     }
 
@@ -457,7 +465,7 @@ contract Gateway is IGateway, IInitializable, IUpgradable {
         MultiAddress calldata destinationAddress,
         uint128 destinationFee,
         uint128 amount
-    ) external payable {
+    ) external payable nonreentrant {
         Ticket memory ticket = Assets.sendToken(
             token, msg.sender, destinationChain, destinationAddress, destinationFee, MAX_DESTINATION_FEE, amount
         );

contracts/src/GatewayProxy.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {ERC1967} from "./utils/ERC1967.sol";
 import {Call} from "./utils/Call.sol";

contracts/src/MultiAddress.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 using {isIndex, asIndex, isAddress32, asAddress32, isAddress20, asAddress20} for MultiAddress global;
 

contracts/src/Params.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {ChannelID, OperatingMode} from "./Types.sol";
 import {UD60x18} from "prb/math/src/UD60x18.sol";

contracts/src/Shell.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Upgrade} from "./Upgrade.sol";
 import {IInitializable} from "./interfaces/IInitializable.sol";

contracts/src/SubstrateTypes.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {ScaleCodec} from "./utils/ScaleCodec.sol";
 import {ParaID} from "./Types.sol";

contracts/src/Token.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Axelar Network
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {IERC20} from "./interfaces/IERC20.sol";
 import {IERC20Permit} from "./interfaces/IERC20Permit.sol";

contracts/src/TokenLib.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Axelar Network
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {IERC20} from "./interfaces/IERC20.sol";
 import {IERC20Permit} from "./interfaces/IERC20Permit.sol";

contracts/src/Types.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {
     MultiAddress, multiAddressFromUint32, multiAddressFromBytes32, multiAddressFromBytes20

contracts/src/Upgrade.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {ERC1967} from "./utils/ERC1967.sol";
 import {Call} from "./utils/Call.sol";

contracts/src/Verification.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {SubstrateMerkleProof} from "./utils/SubstrateMerkleProof.sol";
 import {BeefyClient} from "./BeefyClient.sol";

contracts/src/interfaces/IERC20.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Axelar Network
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

contracts/src/interfaces/IERC20Permit.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Axelar Network
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 interface IERC20Permit {
     error PermitExpired();

contracts/src/interfaces/IGateway.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {OperatingMode, InboundMessage, ParaID, ChannelID, MultiAddress} from "../Types.sol";
 import {Verification} from "../Verification.sol";

contracts/src/interfaces/IInitializable.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 /**
  * @title Initialization of gateway logic contracts

contracts/src/interfaces/IShell.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 interface IShell {
     error Unauthorized();

contracts/src/interfaces/IUpgradable.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 interface IUpgradable {
     // The new implementation address is a not a contract

contracts/src/interfaces/extensions/IERC20Metadata.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2024 Snowfork <[email protected]>
 // OpenZeppelin Contracts v4.4.1 (token/ERC20/extensions/IERC20Metadata.sol)
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import "../IERC20.sol";
 

contracts/src/storage/AssetsStorage.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {TokenInfo, ParaID} from "../Types.sol";
 

contracts/src/storage/CoreStorage.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Channel, OperatingMode, ChannelID, ParaID} from "../Types.sol";
 

contracts/src/storage/OperatorStorage.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 library OperatorStorage {
     struct Layout {

contracts/src/storage/PricingStorage.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {UD60x18} from "prb/math/src/UD60x18.sol";
 

contracts/src/upgrades/Gateway202410.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import "../Gateway.sol";
 

contracts/src/utils/Address.sol

@@ -2,7 +2,7 @@
 // SPDX-FileCopyrightText: 2023 Axelar Network
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 library Address {
     // Checks whether `account` is a contract

contracts/src/utils/Bitfield.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 import {Bits} from "./Bits.sol";
 

contracts/src/utils/Bits.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
 // Code from https://github.com/ethereum/solidity-examples
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 library Bits {
     uint256 internal constant ONE = uint256(1);

contracts/src/utils/Call.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 // SPDX-FileCopyrightText: 2023 OpenZeppelin
 // SPDX-FileCopyrightText: 2023 Snowfork <[email protected]>
-pragma solidity 0.8.25;
+pragma solidity 0.8.28;
 
 // Derived from OpenZeppelin Contracts (last updated v4.9.0) (utils/Address.sol)
 library Call {