chore: Deploy Lens SpokePool & Adapter

deploy/059_deploy_lens_spokepool.ts

@@ -73,6 +73,12 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     newAddress = proxy.address;
   }
 
+  // Verify the proxy + implementation contract.
+  // @dev Verify before saving artifacts; saving artifacts seems to prevent successful verification.
+  // It's observed that saving artifacts seems to trigger a rebuild, hardhat-zksync-verify subsequently
+  // complains about a bytecode mismatch in the deployed artifact.
+  await hre.run("verify:verify", { address: newAddress, constructorArguments: constructorArgs });
+
   // Save the deployment manually because OZ's hardhat-upgrades packages bypasses hardhat-deploy.
   // See also: https://stackoverflow.com/questions/74870472
   const extendedArtifact = await deployments.getExtendedArtifact(contractName);
@@ -81,9 +87,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     ...extendedArtifact,
   };
   await deployments.save(contractName, deployment);
-
-  // Verify the proxy + implementation contract.
-  await hre.run("verify:verify", { address: newAddress, constructorArguments: constructorArgs });
 };
 
 module.exports = func;

deploy/064_deploy_zkstack_adapter.ts

@@ -17,7 +17,7 @@ import {
  * This adapter supports ZkStack L2s.
  *
  * Usage:
- * $ SPOKE_CHAIN_ID=37111 yarn hardhat deploy --network sepolia --tags ZkStackCustomGasTokenAdapter
+ * $ SPOKE_CHAIN_ID=37111 yarn hardhat deploy --network sepolia --tags ZkStackAdapter
  */
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {

deployments/deployments.json

@@ -33,7 +33,7 @@
     "AlephZero_Adapter": { "address": "0x6F4083304C2cA99B077ACE06a5DcF670615915Af", "blockNumber": 21131132 },
     "Ink_Adapter": { "address": "0x7e90a40c7519b041a7df6498fbf5662e8cfc61d2", "blockNumber": 21438590 },
     "Cher_Adapter": { "address": "0x0c9d064523177dBB55CFE52b9D0c485FBFc35FD2", "blockNumber": 21597341 },
-    "Lens_Adapter": { "address": "0x63AC22131eD457aeCbD63e6c4C7eeC7BBC74fF1F", "blockNumber": 22167069 },
+    "Lens_Adapter": { "address": "0x5e0B7e20a77BDf11812837D30F1326068Bcf24Cf", "blockNumber": 22382942 },
     "DoctorWho_Adapter": { "address": "0xFADcC43096756e1527306FD92982FEbBe3c629Fa", "blockNumber": 21773451 },
     "Solana_Adapter": { "address": "0x9F788694934fD2Ed34D5340B9a76EB34f2bFD7B3", "blockNumber": 22595936 },
     "SpokePoolPeriphery": { "address": "0x89415a82d909a7238d69094C3Dd1dCC1aCbDa85C", "blockNumber": 22789839 }

tasks/enableL1TokenAcrossEcosystem.ts

@@ -26,6 +26,8 @@ const getChainsFromList = (taskArgInput: string): number[] =>
     ?.split(",")
     ?.map((chainId: string) => Number(chainId)) || [];
 
+const notSolana = (chainId: number | string) => ![CHAIN_IDs.SOLANA, CHAIN_IDs.SOLANA_DEVNET].includes(Number(chainId));
+
 task("enableToken", "Enable a provided token across the entire ecosystem of supported chains")
   .addFlag("execute", "Provide this flag if you would like to actually execute the transaction from the EOA")
   .addFlag("disable", "Set to disable deposit routes for the specified chains")
@@ -86,7 +88,7 @@ task("enableToken", "Enable a provided token across the entire ecosystem of supp
     else if (inputChains.some((chain) => isNaN(chain) || !Number.isInteger(chain) || chain < 0)) {
       throw new Error(`Invalid chains list: ${inputChains}`);
     }
-    const chainIds = _enabledChainIds.filter((chainId) => inputChains.includes(chainId));
+    const chainIds = _enabledChainIds.filter((chainId) => inputChains.includes(chainId) && notSolana(chainId));
 
     console.log("\nLoading L2 companion token address for provided L1 token.");
     const tokens = Object.fromEntries(