V2

.env.deploy.example

@@ -0,0 +1,16 @@
+# Deploy script environment variables
+PRIVATE_KEY= # Private key of the deployer
+DEPLOYER= # Address of the deployer
+DEPLOYER_PROXY_NONCE= # Nonce of the deployer when creating the Wrapped M proxy
+EXPECTED_PROXY= # Address of the expected Wrapped M proxy
+M_TOKEN= # Address of the M token
+REGISTRAR= # Address of the Registrar
+EXCESS_DESTINATION= # Address of the Excess Destination
+SWAP_FACILITY= # Address of the Swap Facility
+MIGRATION_ADMIN= # Address of the Migration Admin
+
+# RPC URL to deploy to
+DEPLOY_RPC_URL=
+
+# Used for verifying contracts on Etherscan
+ETHERSCAN_API_KEY=

.env.example

@@ -1,11 +1,11 @@
 # Localhost RPC URL
-export LOCALHOST_RPC_URL=http://127.0.0.1:8545
+LOCALHOST_RPC_URL=http://127.0.0.1:8545
 
 # Mainnet RPC URLs
-export MAINNET_RPC_URL=
+MAINNET_RPC_URL=
 
 # Testnet RPC URLs
-export SEPOLIA_RPC_URL=
+SEPOLIA_RPC_URL=
 
 # Used for verifying contracts on Etherscan
-export ETHERSCAN_API_KEY=
+ETHERSCAN_API_KEY=

.env.upgrade.example

@@ -0,0 +1,8 @@
+# Mainnet upgrade script environment variables
+PRIVATE_KEY= # Private key of the deployer
+
+# Mainnet RPC URL to perform upgrade
+MAINNET_RPC_URL=
+
+# Used for verifying contracts on Etherscan
+ETHERSCAN_API_KEY=

.github/workflows/coverage.yml

@@ -32,7 +32,7 @@ jobs:
         run: make coverage
 
       - name: Report code coverage
-        uses: zgosalvez/github-actions-report-lcov@v3
+        uses: zgosalvez/github-actions-report-lcov@v4.1.22
         with:
           coverage-files: lcov.info
           artifact-name: code-coverage-report

.github/workflows/test-gas.yml

@@ -36,7 +36,7 @@ jobs:
         run: make gas-report
 
       - name: Compare gas reports
-        uses: Rubilmax/foundry-gas-diff@v3.16
+        uses: Rubilmax/foundry-gas-diff@v3.21
         id: gas_diff
 
       - name: Add gas diff to sticky comment

.gitignore

@@ -21,3 +21,6 @@ docs/
 # NPM modules
 node_modules
 gasreport.ansi
+
+#soljson
+soljson-latest.js

.gitmodules

@@ -1,7 +1,11 @@
 [submodule "lib/forge-std"]
 	path = lib/forge-std
-	url = git@github.com:foundry-rs/forge-std.git
+	url = https://github.com/foundry-rs/forge-std
 	branch = v1
 [submodule "lib/common"]
 	path = lib/common
-	url = git@github.com:MZero-Labs/common.git
+	url = https://github.com/m0-foundation/common
+	branch = release-v1.5.2
+[submodule "lib/evm-m-extensions"]
+	path = lib/evm-m-extensions
+	url = https://github.com/m0-foundation/evm-m-extensions

.prettierrc

@@ -7,7 +7,7 @@
       "files": "*.sol",
       "options": {
         "bracketSpacing": true,
-        "compiler": "0.8.23",
+        "compiler": "0.8.26",
         "parser": "solidity-parse",
         "printWidth": 120,
         "tabWidth": 4,

.solhint.json

@@ -13,7 +13,7 @@
     ],
     "compiler-version": [
       "error",
-      "0.8.23"
+      "0.8.26"
     ],
     "comprehensive-interface": "off",
     "const-name-snakecase": "off",

Makefile

@@ -9,10 +9,13 @@ update:; forge update
 
 # Deployment helpers
 deploy:
-	FOUNDRY_PROFILE=production forge script script/DeployProduction.s.sol --skip src --skip test --rpc-url mainnet --slow --broadcast -vvv --verify
+	FOUNDRY_PROFILE=production forge script script/Deploy.s.sol --skip src --skip test --rpc-url ${DEPLOY_RPC_URL} --etherscan-api-key ${ETHERSCAN_API_KEY} --slow --broadcast -vvv --verify --show-standard-json-input
 
 deploy-local:
-	FOUNDRY_PROFILE=production forge script script/DeployProduction.s.sol --skip src --skip test --rpc-url localhost --slow --broadcast -vvv
+	FOUNDRY_PROFILE=production forge script script/Deploy.s.sol --skip src --skip test --rpc-url localhost --slow --broadcast -vvv
+
+deploy-upgrade:
+	FOUNDRY_PROFILE=production forge script script/DeployUpgradeMainnet.s.sol --skip src --skip test --rpc-url mainnet --slow --broadcast -vvv --verify --show-standard-json-input
 
 # Run slither
 slither :
@@ -35,10 +38,10 @@ invariant:
 	MAINNET_RPC_URL=$(MAINNET_RPC_URL) ./test.sh -d test/invariant -p $(profile)
 
 coverage:
-	MAINNET_RPC_URL=$(MAINNET_RPC_URL) forge coverage --no-match-path 'test/in*/**/*.sol' --report lcov && lcov --extract lcov.info --rc lcov_branch_coverage=1 --rc derive_function_end_line=0 -o lcov.info 'src/*' && genhtml lcov.info --rc branch_coverage=1 --rc derive_function_end_line=0 -o coverage
+	FOUNDRY_PROFILE=production forge coverage --fork-url $(MAINNET_RPC_URL) --report lcov && lcov --extract lcov.info --rc lcov_branch_coverage=1 --rc derive_function_end_line=0 -o lcov.info 'src/*' && genhtml lcov.info --rc branch_coverage=1 --rc derive_function_end_line=0 -o coverage
 
 gas-report:
-	FOUNDRY_PROFILE=production forge test --no-match-path 'test/integration/**/*.sol' --gas-report > gasreport.ansi
+	FOUNDRY_PROFILE=production forge test --fork-url $(MAINNET_RPC_URL) --gas-report > gasreport.ansi
 
 sizes:
 	./build.sh -p production -s

README.md

@@ -12,7 +12,6 @@ You may have to install the following tools to use this repository:
 
 - [foundry](https://github.com/foundry-rs/foundry) to compile and test contracts
 - [lcov](https://github.com/linux-test-project/lcov) to generate the code coverage report
-- [yarn](https://classic.yarnpkg.com/lang/en/docs/install/) to manage node dependencies
 - [slither](https://github.com/crytic/slither) to static analyze contracts
 
 Install dependencies:

earners/arbitrum.csv

@@ -0,0 +1,4 @@
+address,balance
+0x0a1a1a107e45b7ced86833863f482bc5f4ed82ef,678979424224816
+0x0b2b2b2076d95dda7817e785989fe353fe955ef9,6094692055093
+0xb50a1f651a5acb2679c8f679d782c728f3702e53,6039117591036

earners/ethereum.csv

@@ -0,0 +1,25 @@
+address,balance
+0x4cbc25559dbbd1272ec5b64c7b5f48a2405e6470,68218629706363
+0xff95c5f35f4ffb9d5f596f898ac1ae38d62749c2,14498026276966
+0x0502d65f26f45d17503e4d34441f5e73ea143033,2576885412528
+0x970a7749ecaa4394c8b2bf5f2471f41fd6b79288,2335445266321
+0x81ad394c0fa87e99ca46e1aca093bee020f203f4,73701877312
+0xfe940bfe535013a52e8e2df9644f95e3c94fa14b,23142486046
+0xe0663f2372caa1459b7ade90812dc737ce587fa6,6847088454
+0xa969cfcd9e583edb8c8b270dc8cafb33d6cf662d,3080743473
+0x9c6e67fa86138ab49359f595bfe4fb163d0f16cc,2536640986
+0xdd82875f0840aad58a455a70b88eed9f59cec7c7,1702276055
+0xb65a66621d7de34afec9b9ac0755133051550dd7,891681763
+0xcad001c30e96765ac90307669d578219d4fb1dce,85322234
+0xded796de6a14e255487191963dee436c45995813,66920585
+0xea0c048c728578b1510ebdf9b692e8936d6fbc90,34057216
+0xbbbbbbbbbb9cc5e90e3b3af64bdaf62c37eeffcb,7137461
+0x13ccb6e28f22e2f6783badedce32cc74583a3647,337592
+0x985de23260743c2c2f09bfdec50b048c7a18c461,287386
+0x7db685961f97c847a4c815d43e9cc0e5647328b9,41793
+0x48afe17cb6363fd1aaea50a8cb652c5978972c96,1931
+0xe72fe64840f4ef80e3ec73a1c749491b5c938cb9,988
+0xcf3166181848eec4fd3b9046ae7cb582f34d2e6c,0
+0xb50a1f651a5acb2679c8f679d782c728f3702e53,0
+0x9f6d1a62bf268aa05a1218cfc89c69833d2d2a70,0
+0x569d7dccbf6923350521ecbc28a555a500c4f0ec,0

earners/get-earners.ts

@@ -0,0 +1,130 @@
+#!/usr/bin/env tsx
+
+import { writeFileSync, mkdirSync } from "fs";
+import { join } from "path";
+
+interface WMHolder {
+  address: string;
+  balance: string;
+  isEarning: boolean;
+}
+
+interface GraphQLResponse {
+  data?: {
+    WMHolders?: WMHolder[];
+    WMHoldersArbitrum?: WMHolder[];
+  };
+  errors?: Array<{ message: string }>;
+}
+
+const PROTOCOL_API_URL = "https://protocol-api.m0.org/graphql";
+
+async function fetchWMHolders(network: string): Promise<WMHolder[]> {
+  const fieldName = network === "ethereum" ? "WMHolders" : "WMHoldersL2";
+  const chainArg =
+    network === "ethereum" ? "" : `chain: ${network.toUpperCase()}`;
+
+  const query = `
+    query GetWMHolders {
+      ${fieldName}(first: 1000, ${chainArg}) {
+        address
+        balance
+        isEarning
+      }
+    }
+  `;
+
+  const response = await fetch(PROTOCOL_API_URL, {
+    method: "POST",
+    headers: {
+      "Content-Type": "application/json",
+    },
+    body: JSON.stringify({ query }),
+  });
+
+  if (!response.ok) {
+    throw new Error(`HTTP error! status: ${response.status}`);
+  }
+
+  const result: GraphQLResponse = await response.json();
+
+  if (result.errors) {
+    throw new Error(
+      `GraphQL errors: ${result.errors.map((e) => e.message).join(", ")}`,
+    );
+  }
+
+  return result.data?.[fieldName as keyof GraphQLResponse["data"]] || [];
+}
+
+function convertToCSV(holders: WMHolder[]): string {
+  const headers = ["address", "balance"];
+  const rows = holders.map((holder) => [holder.address, holder.balance]);
+
+  return [headers, ...rows].map((row) => row.join(",")).join("\n");
+}
+
+async function main() {
+  const networks = [
+    "arbitrum",
+    "base",
+    "bsc",
+    "ethereum",
+    "hyperevm",
+    "linea",
+    "mantra",
+    "optimism",
+    "plasma",
+    "plume",
+    "soneium",
+  ];
+
+  mkdirSync("earners", { recursive: true });
+
+  for (const network of networks) {
+    const networkName = network.charAt(0).toUpperCase() + network.slice(1);
+
+    try {
+      console.log(`\nFetching WrappedM holders from ${networkName}...`);
+
+      const holders = await fetchWMHolders(network);
+      console.log(`Found ${holders.length} WrappedM holders on ${networkName}`);
+
+      if (holders.length === 0) {
+        console.log("No holders found");
+        continue;
+      }
+
+      const earners = holders.filter((holder) => holder.isEarning);
+      console.log(
+        `Found ${earners.length} WrappedM earners (isEarning = true)`,
+      );
+
+      if (earners.length === 0) {
+        console.log("No earners found");
+        continue;
+      }
+
+      const csvPath = join("earners", `${network}.csv`);
+      const csvContent = convertToCSV(earners);
+
+      writeFileSync(csvPath, csvContent);
+      console.log(`Exported ${earners.length} earners to ${csvPath}`);
+
+      const totalBalance = earners.reduce(
+        (sum, h) => sum + parseFloat(h.balance || "0"),
+        0,
+      );
+
+      console.log(`Total balance: ${totalBalance}`);
+      console.log(`Total earners: ${earners.length}`);
+    } catch (error) {
+      console.error(
+        `Error processing ${networkName}:`,
+        error instanceof Error ? error.message : error,
+      );
+    }
+  }
+}
+
+main();

earners/plume.csv

@@ -0,0 +1,2 @@
+address,balance
+0xe72fe64840f4ef80e3ec73a1c749491b5c938cb9,749816515

foundry.lock

@@ -0,0 +1,17 @@
+{
+  "lib/common": {
+    "branch": {
+      "name": "release-v1.5.2",
+      "rev": "489fae6daecd227616155e4f8cacfd17aeb3e2a1"
+    }
+  },
+  "lib/evm-m-extensions": {
+    "rev": "87a2f42ab55b5e10771f48fa0d5994bfaa3dca09"
+  },
+  "lib/forge-std": {
+    "branch": {
+      "name": "v1",
+      "rev": "620536fa5277db4e3fd46772d5cbc1ea0696fb43"
+    }
+  }
+}

foundry.toml

@@ -2,15 +2,16 @@
 gas_reports = ["*"]
 gas_reports_ignore = []
 ignored_error_codes = []
-solc_version = "0.8.23"
+solc_version = "0.8.26"
 optimizer = true
-optimizer_runs = 999999
+optimizer_runs = 4150
 verbosity = 3
-block_number = 20_270_778
-block_timestamp = 1_720_550_400
-fork_block_number = 20_270_778
+fork_block_number = 23_170_985
 rpc_storage_caching = { chains = ["mainnet"], endpoints = "all" }
-evm_version = "shanghai"
+evm_version = "cancun"
+
+[lint]
+lint_on_build = false
 
 [profile.production]
 build_info = true