Multichain

contracts/config/Config.sol

@@ -515,7 +515,7 @@ contract Config is ReentrancyGuard, RoleModule, BasicMulticall {
 
         allowedBaseKeys[Keys.DATA_STREAM_SPREAD_REDUCTION_FACTOR] = true;
 
-        allowedBaseKeys[Keys.SOURCE_CHAIN_BALANCE] = true;
+        allowedBaseKeys[Keys.MULTICHAIN_BALANCE] = true;
 
         allowedBaseKeys[Keys.MAX_DATA_LENGTH] = true;
 
@@ -540,6 +540,9 @@ contract Config is ReentrancyGuard, RoleModule, BasicMulticall {
         allowedLimitedBaseKeys[Keys.MAX_POOL_USD_FOR_DEPOSIT] = true;
         allowedLimitedBaseKeys[Keys.MAX_OPEN_INTEREST] = true;
 
+        allowedLimitedBaseKeys[Keys.GLV_MAX_MARKET_TOKEN_BALANCE_USD] = true;
+        allowedLimitedBaseKeys[Keys.GLV_MAX_MARKET_TOKEN_BALANCE_AMOUNT] = true;
+
         allowedLimitedBaseKeys[Keys.PRO_TRADER_TIER] = true;
     }
 

contracts/data/Keys.sol

@@ -409,6 +409,7 @@ library Keys {
     bytes32 public constant AFFILIATE_REWARD = keccak256(abi.encode("AFFILIATE_REWARD"));
     // @dev key for max allowed subaccount action count
     bytes32 public constant MAX_ALLOWED_SUBACCOUNT_ACTION_COUNT = keccak256(abi.encode("MAX_ALLOWED_SUBACCOUNT_ACTION_COUNT"));
+    bytes32 public constant SUBACCOUNT_EXPIRES_AT = keccak256(abi.encode("SUBACCOUNT_EXPIRES_AT"));
     // @dev key for subaccount action count
     bytes32 public constant SUBACCOUNT_ACTION_COUNT = keccak256(abi.encode("SUBACCOUNT_ACTION_COUNT"));
     // @dev key for subaccount auto top up amount
@@ -470,8 +471,8 @@ library Keys {
     // @dev key for the buyback withdrawable fees
     bytes32 public constant WITHDRAWABLE_BUYBACK_TOKEN_AMOUNT = keccak256(abi.encode("WITHDRAWABLE_BUYBACK_TOKEN_AMOUNT"));
 
-    // @dev key for user's balance for a source chain, recorded under the user's virtual account
-    bytes32 public constant SOURCE_CHAIN_BALANCE = keccak256(abi.encode("SOURCE_CHAIN_BALANCE"));
+    // @dev key for user's multichain balance
+    bytes32 public constant MULTICHAIN_BALANCE = keccak256(abi.encode("MULTICHAIN_BALANCE"));
 
     // @dev key for the maximum length for data list array of bytes32
     bytes32 public constant MAX_DATA_LENGTH = keccak256(abi.encode("MAX_DATA_LENGTH"));
@@ -1779,6 +1780,15 @@ library Keys {
         ));
     }
 
+    function subaccountExpiresAtKey(address account, address subaccount, bytes32 actionType) internal pure returns (bytes32) {
+        return keccak256(abi.encode(
+            SUBACCOUNT_EXPIRES_AT,
+            account,
+            subaccount,
+            actionType
+        ));
+    }
+
     function subaccountActionCountKey(address account, address subaccount, bytes32 actionType) internal pure returns (bytes32) {
         return keccak256(abi.encode(
             SUBACCOUNT_ACTION_COUNT,
@@ -2110,14 +2120,16 @@ library Keys {
         ));
     }
 
-    // @dev key for user's balance for a source chain, recorded under the user's virtual account
-    // @param virtualAccount the virtual account for which to retreive the user balance key
+    // @dev key for user's multichain balance
+    // @param chainId the chain id for the destination chain
+    // @param account the account for which to retreive the user balance key
     // @param token the token for which to retreive the user balance key
-    // @return key for a source chain balance for a given user and token
-    function sourceChainBalanceKey(address virtualAccount, address token) internal pure returns (bytes32) {
+    // @return key for multichain balance for a given user and token
+    function multichainBalanceKey(uint256 chainId, address account, address token) internal pure returns (bytes32) {
         return keccak256(abi.encode(
-            SOURCE_CHAIN_BALANCE,
-            virtualAccount,
+            MULTICHAIN_BALANCE,
+            chainId,
+            account,
             token
         ));
     }

contracts/deposit/Deposit.sol

@@ -54,6 +54,7 @@ library Deposit {
         uint256 updatedAtTime;
         uint256 executionFee;
         uint256 callbackGasLimit;
+        uint256 chainId;
     }
 
     // @param shouldUnwrapNativeToken whether to unwrap the native token when
@@ -181,6 +182,14 @@ library Deposit {
         props.numbers.callbackGasLimit = value;
     }
 
+    function chainId(Props memory props) internal pure returns (uint256) {
+        return props.numbers.chainId;
+    }
+
+    function setChainId(Props memory props, uint256 value) internal pure {
+        props.numbers.chainId = value;
+    }
+
     function shouldUnwrapNativeToken(Props memory props) internal pure returns (bool) {
         return props.flags.shouldUnwrapNativeToken;
     }

contracts/deposit/DepositEventUtils.sol

@@ -41,21 +41,25 @@ library DepositEventUtils {
         eventData.addressItems.setItem(0, "longTokenSwapPath", deposit.longTokenSwapPath());
         eventData.addressItems.setItem(1, "shortTokenSwapPath", deposit.shortTokenSwapPath());
 
-        eventData.uintItems.initItems(7);
+        eventData.uintItems.initItems(8);
         eventData.uintItems.setItem(0, "initialLongTokenAmount", deposit.initialLongTokenAmount());
         eventData.uintItems.setItem(1, "initialShortTokenAmount", deposit.initialShortTokenAmount());
         eventData.uintItems.setItem(2, "minMarketTokens", deposit.minMarketTokens());
         eventData.uintItems.setItem(3, "updatedAtTime", deposit.updatedAtTime());
         eventData.uintItems.setItem(4, "executionFee", deposit.executionFee());
         eventData.uintItems.setItem(5, "callbackGasLimit", deposit.callbackGasLimit());
         eventData.uintItems.setItem(6, "depositType", uint256(depositType));
+        eventData.uintItems.setItem(7, "chainId", deposit.chainId());
 
         eventData.boolItems.initItems(1);
         eventData.boolItems.setItem(0, "shouldUnwrapNativeToken", deposit.shouldUnwrapNativeToken());
 
         eventData.bytes32Items.initItems(1);
         eventData.bytes32Items.setItem(0, "key", key);
 
+        eventData.bytes32Items.initArrayItems(1);
+        eventData.bytes32Items.setItem(0, "dataList", deposit.dataList());
+
         eventEmitter.emitEventLog2(
             "DepositCreated",
             key,
@@ -67,6 +71,7 @@ library DepositEventUtils {
     function emitDepositExecuted(
         EventEmitter eventEmitter,
         bytes32 key,
+        // uint256 chainId, TODO: should chainId be added as param? Is it ok to change the event signature (for e.g. analytics)
         address account,
         uint256 longTokenAmount,
         uint256 shortTokenAmount,

contracts/deposit/DepositStoreUtils.sol

@@ -30,6 +30,7 @@ library DepositStoreUtils {
     bytes32 public constant UPDATED_AT_TIME = keccak256(abi.encode("UPDATED_AT_TIME"));
     bytes32 public constant EXECUTION_FEE = keccak256(abi.encode("EXECUTION_FEE"));
     bytes32 public constant CALLBACK_GAS_LIMIT = keccak256(abi.encode("CALLBACK_GAS_LIMIT"));
+    bytes32 public constant CHAIN_ID = keccak256(abi.encode("CHAIN_ID"));
 
     bytes32 public constant SHOULD_UNWRAP_NATIVE_TOKEN = keccak256(abi.encode("SHOULD_UNWRAP_NATIVE_TOKEN"));
 
@@ -101,6 +102,10 @@ library DepositStoreUtils {
             keccak256(abi.encode(key, CALLBACK_GAS_LIMIT))
         ));
 
+        deposit.setChainId(dataStore.getUint(
+            keccak256(abi.encode(key, CHAIN_ID))
+        ));
+
         deposit.setShouldUnwrapNativeToken(dataStore.getBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN))
         ));
@@ -198,6 +203,11 @@ library DepositStoreUtils {
             deposit.callbackGasLimit()
         );
 
+        dataStore.setUint(
+            keccak256(abi.encode(key, CHAIN_ID)),
+            deposit.chainId()
+        );
+
         dataStore.setBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN)),
             deposit.shouldUnwrapNativeToken()
@@ -284,6 +294,10 @@ library DepositStoreUtils {
             keccak256(abi.encode(key, CALLBACK_GAS_LIMIT))
         );
 
+        dataStore.removeUint(
+            keccak256(abi.encode(key, CHAIN_ID))
+        );
+
         dataStore.removeBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN))
         );

contracts/deposit/DepositUtils.sol

@@ -50,6 +50,7 @@ library DepositUtils {
         bool shouldUnwrapNativeToken;
         uint256 executionFee;
         uint256 callbackGasLimit;
+        uint256 chainId;
         bytes32[] dataList;
     }
 
@@ -117,7 +118,8 @@ library DepositUtils {
                 params.minMarketTokens,
                 Chain.currentTimestamp(), // updatedAtTime
                 params.executionFee,
-                params.callbackGasLimit
+                params.callbackGasLimit,
+                params.chainId
             ),
             Deposit.Flags(
                 params.shouldUnwrapNativeToken

contracts/error/Errors.sol

@@ -199,7 +199,7 @@ library Errors {
     // Oracle errors
     error SequencerDown();
     error SequencerGraceDurationNotYetPassed(uint256 timeSinceUp, uint256 sequencerGraceDuration);
-    error EmptyValidatedPrices();
+    error EmptyValidatedPrices(); // not used, kept for compatibility
     error InvalidOracleProvider(address provider);
     error InvalidOracleProviderForToken(address provider, address expectedProvider);
     error GmEmptySigner(uint256 signerIndex);
@@ -358,10 +358,12 @@ library Errors {
 
     // SubaccountRouter errors
     error InvalidReceiverForSubaccountOrder(address receiver, address expectedReceiver);
+    error InvalidCancellationReceiverForSubaccountOrder(address cancellationReceiver, address expectedCancellationReceiver);
 
     // SubaccountUtils errors
     error SubaccountNotAuthorized(address account, address subaccount);
     error MaxSubaccountActionCountExceeded(address account, address subaccount, uint256 count, uint256 maxCount);
+    error SubaccountApprovalExpired(address account, address subaccount, uint256 deadline, uint256 currentTimestamp);
 
     // TokenUtils errors
     error TokenTransferError(address token, address receiver, uint256 amount);
@@ -433,4 +435,23 @@ library Errors {
     error InvalidMultichainProviderSignature();
     error InvalidStargatePool();
     error InvalidLzEndpoint();
+
+    enum SignatureType {
+        Call,
+        SubaccountApproval
+    }
+
+    // Gelato relay errors
+    error InvalidSignature(string signatureType);
+    // User sent incorrect fee token or incorrect swap path
+    error UnexpectedRelayFeeTokenAfterSwap(address feeToken, address expectedFeeToken);
+    // Contract received unsupported fee token from Gelato relay
+    error UnsupportedRelayFeeToken(address feeToken, address expectedFeeToken);
+    error InvalidPermitSpender(address spender, address expectedSpender);
+    error InvalidUserNonce(uint256 storedUserNonce, uint256 userNonce);
+    error SubaccountApprovalDeadlinePassed(uint256 currentTimestamp, uint256 deadline);
+    error InvalidSubaccountApprovalNonce(uint256 storedNonce, uint256 nonce);
+    error DeadlinePassed(uint256 currentTimestamp, uint256 deadline);
+    error InsufficientRelayFee(uint256 requiredRelayFee, uint256 feeAmount);
+    error InvalidSubaccountApprovalSubaccount();
 }

contracts/exchange/DepositHandler.sol

@@ -152,7 +152,8 @@ contract DepositHandler is IDepositHandler, BaseHandler {
             keeper,
             startingGas,
             ISwapPricingUtils.SwapPricingType.Deposit,
-            true // includeVirtualInventoryImpact
+            true, // includeVirtualInventoryImpact
+            deposit.chainId()
         );
 
         ExecuteDepositUtils.executeDeposit(params, deposit);

contracts/glv/glvDeposit/GlvDeposit.sol

@@ -52,6 +52,7 @@ library GlvDeposit {
         uint256 updatedAtTime;
         uint256 executionFee;
         uint256 callbackGasLimit;
+        uint256 chainId;
     }
 
     // @param shouldUnwrapNativeToken whether to unwrap the native token when
@@ -198,6 +199,14 @@ library GlvDeposit {
         props.numbers.callbackGasLimit = value;
     }
 
+    function chainId(Props memory props) internal pure returns (uint256) {
+        return props.numbers.chainId;
+    }
+
+    function setChainId(Props memory props, uint256 value) internal pure {
+        props.numbers.chainId = value;
+    }
+
     function shouldUnwrapNativeToken(Props memory props) internal pure returns (bool) {
         return props.flags.shouldUnwrapNativeToken;
     }

contracts/glv/glvDeposit/GlvDepositEventUtils.sol

@@ -56,6 +56,9 @@ library GlvDepositEventUtils {
         eventData.bytes32Items.initItems(1);
         eventData.bytes32Items.setItem(0, "key", key);
 
+        eventData.bytes32Items.initArrayItems(1);
+        eventData.bytes32Items.setItem(0, "dataList", glvDeposit.dataList());
+
         eventEmitter.emitEventLog2(
             "GlvDepositCreated",
             key,

contracts/glv/glvDeposit/GlvDepositStoreUtils.sol

@@ -38,6 +38,8 @@ library GlvDepositStoreUtils {
 
     bytes32 public constant DATA_LIST = keccak256(abi.encode("DATA_LIST"));
 
+    bytes32 public constant CHAIN_ID = keccak256(abi.encode("CHAIN_ID"));
+
     function get(DataStore dataStore, bytes32 key) external view returns (GlvDeposit.Props memory) {
         GlvDeposit.Props memory glvDeposit;
         if (!dataStore.containsBytes32(Keys.GLV_DEPOSIT_LIST, key)) {
@@ -112,6 +114,10 @@ library GlvDepositStoreUtils {
             keccak256(abi.encode(key, CALLBACK_GAS_LIMIT))
         ));
 
+        glvDeposit.setChainId(dataStore.getUint(
+            keccak256(abi.encode(key, CHAIN_ID))
+        ));
+
         glvDeposit.setShouldUnwrapNativeToken(dataStore.getBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN))
         ));
@@ -223,6 +229,11 @@ library GlvDepositStoreUtils {
             glvDeposit.callbackGasLimit()
         );
 
+        dataStore.setUint(
+            keccak256(abi.encode(key, CHAIN_ID)),
+            glvDeposit.chainId()
+        );
+
         dataStore.setBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN)),
             glvDeposit.shouldUnwrapNativeToken()
@@ -322,6 +333,10 @@ library GlvDepositStoreUtils {
             keccak256(abi.encode(key, CALLBACK_GAS_LIMIT))
         );
 
+        dataStore.removeUint(
+            keccak256(abi.encode(key, CHAIN_ID))
+        );
+
         dataStore.removeBool(
             keccak256(abi.encode(key, SHOULD_UNWRAP_NATIVE_TOKEN))
         );

contracts/glv/glvDeposit/GlvDepositUtils.sol

@@ -32,6 +32,7 @@ library GlvDepositUtils {
         uint256 minGlvTokens;
         uint256 executionFee;
         uint256 callbackGasLimit;
+        uint256 chainId;
         bool shouldUnwrapNativeToken;
         bool isMarketTokenDeposit;
         bytes32[] dataList;
@@ -177,7 +178,8 @@ library GlvDepositUtils {
                 minGlvTokens: params.minGlvTokens,
                 updatedAtTime: Chain.currentTimestamp(),
                 executionFee: params.executionFee,
-                callbackGasLimit: params.callbackGasLimit
+                callbackGasLimit: params.callbackGasLimit,
+                chainId: params.chainId
             }),
             GlvDeposit.Flags({
                 shouldUnwrapNativeToken: params.shouldUnwrapNativeToken,
@@ -354,7 +356,8 @@ library GlvDepositUtils {
                 minMarketTokens: 0,
                 updatedAtTime: glvDeposit.updatedAtTime(),
                 executionFee: 0,
-                callbackGasLimit: 0
+                callbackGasLimit: 0,
+                chainId: 0
             }),
             Deposit.Flags({shouldUnwrapNativeToken: false}),
             new bytes32[](0) // dataList
@@ -373,7 +376,8 @@ library GlvDepositUtils {
                 params.keeper,
                 params.startingGas,
                 ISwapPricingUtils.SwapPricingType.Deposit,
-                true // includeVirtualInventoryImpact
+                true, // includeVirtualInventoryImpact
+                glvDeposit.chainId()
             );
 
         uint256 receivedMarketTokens = ExecuteDepositUtils.executeDeposit(executeDepositParams, deposit);

contracts/glv/glvShift/GlvShiftUtils.sol

@@ -138,7 +138,8 @@ library GlvShiftUtils {
                 marketTokenAmount: glvShift.marketTokenAmount(),
                 updatedAtTime: glvShift.updatedAtTime(),
                 executionFee: 0,
-                callbackGasLimit: 0
+                callbackGasLimit: 0,
+                chainId: 0 // TODO: should glvShift have the chainId as well?
             }),
             new bytes32[](0)
         );

contracts/glv/glvWithdrawal/GlvWithdrawal.sol

@@ -49,6 +49,7 @@ library GlvWithdrawal {
         uint256 updatedAtTime;
         uint256 executionFee;
         uint256 callbackGasLimit;
+        uint256 chainId;
     }
 
     // @param shouldUnwrapNativeToken whether to unwrap the native token when
@@ -168,6 +169,14 @@ library GlvWithdrawal {
         props.numbers.callbackGasLimit = value;
     }
 
+    function chainId(Props memory props) internal pure returns (uint256) {
+        return props.numbers.chainId;
+    }
+
+    function setChainId(Props memory props, uint256 value) internal pure {
+        props.numbers.chainId = value;
+    }
+
     function shouldUnwrapNativeToken(Props memory props) internal pure returns (bool) {
         return props.flags.shouldUnwrapNativeToken;
     }