Refactor/message update

contracts/.solhintignore

@@ -2,4 +2,10 @@ node_modules
 lib/forge-std
 test/foundry
 src/_testing
-src/proxies
+src/proxies
+
+# TODO - Remove below when PR ready
+src/bridging/token/TokenBridgeBase.sol
+src/messaging/l2/v1/L2MessageServiceV1.sol
+src/_testing/unit/rollup/InheritingLineaRollup.sol
+src/_testing/unit/rollup/TestLineaRollup.sol

contracts/common/constants/general.ts

@@ -8,4 +8,7 @@ export const LINEA_ROLLUP_INITIALIZE_SIGNATURE =
 export const L2_MESSAGE_SERVICE_INITIALIZE_SIGNATURE =
   "initialize(uint256,uint256,address,(address,bytes32)[],(uint8,bytes32)[],(uint8,bytes32)[])";
 
+export const YIELD_MANAGER_INITIALIZE_SIGNATURE =
+  "initialize(((uint8,bytes32)[],(uint8,bytes32)[],(address,bytes32)[],address[],address,uint16,uint16,uint256,uint256))";
+
 export const EMPTY_INITIALIZE_SIGNATURE = "initialize()";

contracts/common/constants/pauseTypes.ts

@@ -6,15 +6,24 @@ import {
   PAUSE_L1_L2_ROLE,
   PAUSE_BLOB_SUBMISSION_ROLE,
   PAUSE_L2_L1_ROLE,
+  PAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  PAUSE_NATIVE_YIELD_REPORTING_ROLE,
+  PAUSE_NATIVE_YIELD_STAKING_ROLE,
+  PAUSE_NATIVE_YIELD_UNSTAKING_ROLE,
   UNPAUSE_ALL_ROLE,
+  UNPAUSE_BLOB_SUBMISSION_ROLE,
   UNPAUSE_COMPLETE_TOKEN_BRIDGING_ROLE,
   UNPAUSE_FINALIZATION_ROLE,
   UNPAUSE_INITIATE_TOKEN_BRIDGING_ROLE,
   UNPAUSE_L1_L2_ROLE,
-  UNPAUSE_BLOB_SUBMISSION_ROLE,
   UNPAUSE_L2_L1_ROLE,
+  UNPAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  UNPAUSE_NATIVE_YIELD_REPORTING_ROLE,
+  UNPAUSE_NATIVE_YIELD_STAKING_ROLE,
+  UNPAUSE_NATIVE_YIELD_UNSTAKING_ROLE,
 } from "./roles";
 
+export const UNUSED_PAUSE_TYPE = 0;
 export const GENERAL_PAUSE_TYPE = 1;
 export const L1_L2_PAUSE_TYPE = 2;
 export const L2_L1_PAUSE_TYPE = 3;
@@ -23,6 +32,10 @@ export const CALLDATA_SUBMISSION_PAUSE_TYPE = 5;
 export const FINALIZATION_PAUSE_TYPE = 6;
 export const INITIATE_TOKEN_BRIDGING_PAUSE_TYPE = 7;
 export const COMPLETE_TOKEN_BRIDGING_PAUSE_TYPE = 8;
+export const NATIVE_YIELD_STAKING_PAUSE_TYPE = 9;
+export const NATIVE_YIELD_UNSTAKING_PAUSE_TYPE = 10;
+export const NATIVE_YIELD_PERMISSIONLESS_ACTIONS_PAUSE_TYPE = 11;
+export const NATIVE_YIELD_REPORTING_PAUSE_TYPE = 12;
 
 export const BASE_PAUSE_TYPES_ROLES = [{ pauseType: GENERAL_PAUSE_TYPE, role: PAUSE_ALL_ROLE }];
 export const BASE_UNPAUSE_TYPES_ROLES = [{ pauseType: GENERAL_PAUSE_TYPE, role: UNPAUSE_ALL_ROLE }];
@@ -35,6 +48,7 @@ export const LINEA_ROLLUP_PAUSE_TYPES_ROLES = [
   { pauseType: BLOB_SUBMISSION_PAUSE_TYPE, role: PAUSE_BLOB_SUBMISSION_ROLE },
   { pauseType: CALLDATA_SUBMISSION_PAUSE_TYPE, role: PAUSE_BLOB_SUBMISSION_ROLE },
   { pauseType: FINALIZATION_PAUSE_TYPE, role: PAUSE_FINALIZATION_ROLE },
+  { pauseType: NATIVE_YIELD_STAKING_PAUSE_TYPE, role: PAUSE_NATIVE_YIELD_STAKING_ROLE },
 ];
 
 export const LINEA_ROLLUP_UNPAUSE_TYPES_ROLES = [
@@ -44,6 +58,7 @@ export const LINEA_ROLLUP_UNPAUSE_TYPES_ROLES = [
   { pauseType: BLOB_SUBMISSION_PAUSE_TYPE, role: UNPAUSE_BLOB_SUBMISSION_ROLE },
   { pauseType: CALLDATA_SUBMISSION_PAUSE_TYPE, role: UNPAUSE_BLOB_SUBMISSION_ROLE },
   { pauseType: FINALIZATION_PAUSE_TYPE, role: UNPAUSE_FINALIZATION_ROLE },
+  { pauseType: NATIVE_YIELD_STAKING_PAUSE_TYPE, role: UNPAUSE_NATIVE_YIELD_STAKING_ROLE },
 ];
 
 // L2MessageService
@@ -71,3 +86,26 @@ export const TOKEN_BRIDGE_UNPAUSE_TYPES_ROLES = [
   { pauseType: INITIATE_TOKEN_BRIDGING_PAUSE_TYPE, role: UNPAUSE_INITIATE_TOKEN_BRIDGING_ROLE },
   { pauseType: COMPLETE_TOKEN_BRIDGING_PAUSE_TYPE, role: UNPAUSE_COMPLETE_TOKEN_BRIDGING_ROLE },
 ];
+
+// YieldManager
+export const YIELD_MANAGER_PAUSE_TYPES_ROLES = [
+  ...BASE_PAUSE_TYPES_ROLES,
+  { pauseType: NATIVE_YIELD_STAKING_PAUSE_TYPE, role: PAUSE_NATIVE_YIELD_STAKING_ROLE },
+  { pauseType: NATIVE_YIELD_UNSTAKING_PAUSE_TYPE, role: PAUSE_NATIVE_YIELD_UNSTAKING_ROLE },
+  {
+    pauseType: NATIVE_YIELD_PERMISSIONLESS_ACTIONS_PAUSE_TYPE,
+    role: PAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  },
+  { pauseType: NATIVE_YIELD_REPORTING_PAUSE_TYPE, role: PAUSE_NATIVE_YIELD_REPORTING_ROLE },
+];
+
+export const YIELD_MANAGER_UNPAUSE_TYPES_ROLES = [
+  ...BASE_UNPAUSE_TYPES_ROLES,
+  { pauseType: NATIVE_YIELD_STAKING_PAUSE_TYPE, role: UNPAUSE_NATIVE_YIELD_STAKING_ROLE },
+  { pauseType: NATIVE_YIELD_UNSTAKING_PAUSE_TYPE, role: UNPAUSE_NATIVE_YIELD_UNSTAKING_ROLE },
+  {
+    pauseType: NATIVE_YIELD_PERMISSIONLESS_ACTIONS_PAUSE_TYPE,
+    role: UNPAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  },
+  { pauseType: NATIVE_YIELD_REPORTING_PAUSE_TYPE, role: UNPAUSE_NATIVE_YIELD_REPORTING_ROLE },
+];

contracts/common/constants/roles.ts

@@ -76,6 +76,70 @@ export const SET_CUSTOM_CONTRACT_ROLE = generateKeccak256(["string"], ["SET_CUST
 export const SET_MESSAGE_SERVICE_ROLE = generateKeccak256(["string"], ["SET_MESSAGE_SERVICE_ROLE"], {
   encodePacked: true,
 });
+// Roles for LineaRollup introduced with YieldManager
+export const SET_YIELD_MANAGER_ROLE = generateKeccak256(["string"], ["SET_YIELD_MANAGER_ROLE"], {
+  encodePacked: true,
+});
+export const PAUSE_NATIVE_YIELD_STAKING_ROLE = generateKeccak256(["string"], ["PAUSE_NATIVE_YIELD_STAKING_ROLE"], {
+  encodePacked: true,
+});
+export const UNPAUSE_NATIVE_YIELD_STAKING_ROLE = generateKeccak256(["string"], ["UNPAUSE_NATIVE_YIELD_STAKING_ROLE"], {
+  encodePacked: true,
+});
+// Roles for YieldManager
+export const YIELD_PROVIDER_STAKING_ROLE = generateKeccak256(["string"], ["YIELD_PROVIDER_STAKING_ROLE"], {
+  encodePacked: true,
+});
+export const YIELD_PROVIDER_UNSTAKER_ROLE = generateKeccak256(["string"], ["YIELD_PROVIDER_UNSTAKER_ROLE"], {
+  encodePacked: true,
+});
+export const YIELD_REPORTER_ROLE = generateKeccak256(["string"], ["YIELD_REPORTER_ROLE"], {
+  encodePacked: true,
+});
+export const STAKING_PAUSE_CONTROLLER_ROLE = generateKeccak256(["string"], ["STAKING_PAUSE_CONTROLLER_ROLE"], {
+  encodePacked: true,
+});
+export const OSSIFICATION_INITIATOR_ROLE = generateKeccak256(["string"], ["OSSIFICATION_INITIATOR_ROLE"], {
+  encodePacked: true,
+});
+export const OSSIFICATION_PROCESSOR_ROLE = generateKeccak256(["string"], ["OSSIFICATION_PROCESSOR_ROLE"], {
+  encodePacked: true,
+});
+export const WITHDRAWAL_RESERVE_SETTER_ROLE = generateKeccak256(["string"], ["WITHDRAWAL_RESERVE_SETTER_ROLE"], {
+  encodePacked: true,
+});
+export const SET_YIELD_PROVIDER_ROLE = generateKeccak256(["string"], ["SET_YIELD_PROVIDER_ROLE"], {
+  encodePacked: true,
+});
+export const SET_L2_YIELD_RECIPIENT_ROLE = generateKeccak256(["string"], ["SET_L2_YIELD_RECIPIENT_ROLE"], {
+  encodePacked: true,
+});
+export const PAUSE_NATIVE_YIELD_UNSTAKING_ROLE = generateKeccak256(["string"], ["PAUSE_NATIVE_YIELD_UNSTAKING_ROLE"], {
+  encodePacked: true,
+});
+export const UNPAUSE_NATIVE_YIELD_UNSTAKING_ROLE = generateKeccak256(
+  ["string"],
+  ["UNPAUSE_NATIVE_YIELD_UNSTAKING_ROLE"],
+  { encodePacked: true },
+);
+export const PAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE = generateKeccak256(
+  ["string"],
+  ["PAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE"],
+  { encodePacked: true },
+);
+export const UNPAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE = generateKeccak256(
+  ["string"],
+  ["UNPAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE"],
+  { encodePacked: true },
+);
+export const PAUSE_NATIVE_YIELD_REPORTING_ROLE = generateKeccak256(["string"], ["PAUSE_NATIVE_YIELD_REPORTING_ROLE"], {
+  encodePacked: true,
+});
+export const UNPAUSE_NATIVE_YIELD_REPORTING_ROLE = generateKeccak256(
+  ["string"],
+  ["UNPAUSE_NATIVE_YIELD_REPORTING_ROLE"],
+  { encodePacked: true },
+);
 
 export const BASE_ROLES = [PAUSE_ALL_ROLE, UNPAUSE_ALL_ROLE];
 
@@ -93,6 +157,11 @@ export const LINEA_ROLLUP_ROLES = [
   UNPAUSE_BLOB_SUBMISSION_ROLE,
   PAUSE_FINALIZATION_ROLE,
   UNPAUSE_FINALIZATION_ROLE,
+  // New roles introduced with YieldManager
+  SET_YIELD_MANAGER_ROLE,
+  YIELD_PROVIDER_STAKING_ROLE,
+  PAUSE_NATIVE_YIELD_STAKING_ROLE,
+  UNPAUSE_NATIVE_YIELD_STAKING_ROLE,
 ];
 
 export const L2_MESSAGE_SERVICE_ROLES = [
@@ -119,3 +188,31 @@ export const TOKEN_BRIDGE_ROLES = [
   PAUSE_COMPLETE_TOKEN_BRIDGING_ROLE,
   UNPAUSE_COMPLETE_TOKEN_BRIDGING_ROLE,
 ];
+
+// For NativeYieldCronJob
+export const YIELD_MANAGER_OPERATOR_ROLES = [
+  YIELD_PROVIDER_STAKING_ROLE,
+  YIELD_PROVIDER_UNSTAKER_ROLE,
+  YIELD_REPORTER_ROLE,
+  STAKING_PAUSE_CONTROLLER_ROLE,
+  OSSIFICATION_PROCESSOR_ROLE,
+];
+
+export const YIELD_MANAGER_SECURITY_COUNCIL_ROLES = [
+  ...BASE_ROLES,
+  ...YIELD_MANAGER_OPERATOR_ROLES,
+  // Operational roles unique to Security Council
+  OSSIFICATION_INITIATOR_ROLE,
+  SET_YIELD_PROVIDER_ROLE,
+  SET_L2_YIELD_RECIPIENT_ROLE,
+  WITHDRAWAL_RESERVE_SETTER_ROLE,
+  // Pause/unpause roles
+  PAUSE_NATIVE_YIELD_STAKING_ROLE,
+  UNPAUSE_NATIVE_YIELD_STAKING_ROLE,
+  PAUSE_NATIVE_YIELD_UNSTAKING_ROLE,
+  UNPAUSE_NATIVE_YIELD_UNSTAKING_ROLE,
+  PAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  UNPAUSE_NATIVE_YIELD_PERMISSIONLESS_ACTIONS_ROLE,
+  PAUSE_NATIVE_YIELD_REPORTING_ROLE,
+  UNPAUSE_NATIVE_YIELD_REPORTING_ROLE,
+];

contracts/docs/workflows/administration/unpausing.md

@@ -44,16 +44,22 @@ Safe Member
 ## 🗂️ Pause Types
 
 
-| Value | Address                              |
-|-------|---------------------------------------|
-| 1     | GENERAL_PAUSE_TYPE                   |
-| 2     | L1_L2_PAUSE_TYPE                     |
-| 3     | L2_L1_PAUSE_TYPE                     |
-| 4     | PROVING_SYSTEM_PAUSE_TYPE           |
-| 5     | CALLDATA_SUBMISSION_PAUSE_TYPE      |
-| 6     | FINALIZATION_PAUSE_TYPE             |
-| 7     | INITIATE_TOKEN_BRIDGING_PAUSE_TYPE  |
-| 8     | COMPLETE_TOKEN_BRIDGING_PAUSE_TYPE  |
+| Value | Pause Type                                   |
+|-------|----------------------------------------------|
+| 0     | UNUSED_PAUSE_TYPE                            |
+| 1     | GENERAL_PAUSE_TYPE                          |
+| 2     | L1_L2_PAUSE_TYPE                            |
+| 3     | L2_L1_PAUSE_TYPE                            |
+| 4     | BLOB_SUBMISSION_PAUSE_TYPE                  |
+| 5     | CALLDATA_SUBMISSION_PAUSE_TYPE              |
+| 6     | FINALIZATION_PAUSE_TYPE                     |
+| 7     | INITIATE_TOKEN_BRIDGING_PAUSE_TYPE          |
+| 8     | COMPLETE_TOKEN_BRIDGING_PAUSE_TYPE          |
+| 9     | NATIVE_YIELD_STAKING_PAUSE_TYPE             |
+| 10    | NATIVE_YIELD_UNSTAKING_PAUSE_TYPE           |
+| 11    | NATIVE_YIELD_PERMISSIONLESS_ACTIONS_PAUSE_TYPE |
+| 12    | NATIVE_YIELD_REPORTING_PAUSE_TYPE           |
+| 13    | NATIVE_YIELD_DONATION_PAUSE_TYPE            |
 
 
 ---
@@ -76,4 +82,4 @@ Safe Member
 | L2MessageService   | `0x508cA82Df566dCD1B0DE828967a0e96332cDc446`      |
 | L2 Token Bridge    | `0x353012d04a9A6cF5C941bADC267f82004A8ceB9`        |
 
-<img src="../diagrams/unpausing.png">
+<img src="../diagrams/unpausing.png">

contracts/hardhat.config.ts

@@ -60,6 +60,7 @@ const config: HardhatUserConfig = {
   networks: {
     hardhat: {
       hardfork: "prague",
+      allowUnlimitedContractSize: true, // TODO - Remove when ready for PR
     },
     mainnet: {
       accounts: [process.env.MAINNET_PRIVATE_KEY || EMPTY_HASH],
@@ -135,6 +136,7 @@ const config: HardhatUserConfig = {
       "security/reentrancy/TransientStorageReentrancyGuardUpgradeable.sol",
       "tokens",
       "verifiers",
+      "yield", // TODO - Remove this when we are ready for PR
     ],
     pages: "files",
     outputDir: "docs/api/",

contracts/package.json

@@ -15,7 +15,7 @@
     "prettier": "prettier -c '**/*.{js,ts,sol}'",
     "prettier:fix": "prettier -w '**/*.{js,ts,sol}'",
     "lint:sol": "solhint -f stylish 'src/**/*.sol'",
-    "lint:sol:fix": "solhint --fix --noPrompt -f stylish 'src/**/*.sol'",
+    "lint:sol:fix": "prettier -w 'src/**/*.sol'",
     "lint:ts": "npx eslint '**/*.{js,ts}'",
     "lint:ts:fix": "npx eslint --fix '**/*.{js,ts}'",
     "lint": "pnpm run lint:sol && npm run lint:ts && npm run prettier",
@@ -25,6 +25,7 @@
   },
   "devDependencies": {
     "@chainlink/contracts": "1.4.0",
+    "@chainsafe/blst": "2.2.0",
     "@ethereumjs/util": "9.0.3",
     "@nomicfoundation/hardhat-ethers": "3.0.5",
     "@nomicfoundation/hardhat-foundry": "1.1.3",