poc works

Author: peersky

abi/src/IVictim.sol/IVictim.json

@@ -0,0 +1,9 @@
+[
+  {
+    "inputs": [],
+    "name": "drainedMethod",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

abi/src/LayeredProxy.sol/LayeredProxy.json

@@ -32,6 +32,11 @@
         "internalType": "struct LibAccessLayers.LayerStruct[]",
         "name": "layers",
         "type": "tuple[]"
+      },
+      {
+        "internalType": "address",
+        "name": "initialImplementation",
+        "type": "address"
       }
     ],
     "stateMutability": "nonpayable",
@@ -104,6 +109,19 @@
     "name": "AdminChanged",
     "type": "event"
   },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "newBalance",
+        "type": "uint256"
+      }
+    ],
+    "name": "BalanceReduced",
+    "type": "event"
+  },
   {
     "anonymous": false,
     "inputs": [
@@ -120,5 +138,9 @@
   {
     "stateMutability": "payable",
     "type": "fallback"
+  },
+  {
+    "stateMutability": "payable",
+    "type": "receive"
   }
 ]

abi/src/SampleLayer.sol/SampleLayer.json abi/src/SampleLayer.sol/RecoverableFuse.json

@@ -3,12 +3,12 @@
     "inputs": [
       {
         "internalType": "bytes",
-        "name": "",
+        "name": "layerConfig",
         "type": "bytes"
       },
       {
         "internalType": "bytes4",
-        "name": "",
+        "name": "messageSig",
         "type": "bytes4"
       },
       {
@@ -34,7 +34,7 @@
     ],
     "name": "afterCallValidation",
     "outputs": [],
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
     "type": "function"
   },
   {
@@ -46,7 +46,7 @@
       },
       {
         "internalType": "bytes4",
-        "name": "",
+        "name": "messageSig",
         "type": "bytes4"
       },
       {

abi/src/mocks/MockERC20.sol/MockERC20.json

@@ -1,22 +1,6 @@
 [
   {
-    "inputs": [
-      {
-        "internalType": "string",
-        "name": "name_",
-        "type": "string"
-      },
-      {
-        "internalType": "string",
-        "name": "symbol_",
-        "type": "string"
-      },
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
+    "inputs": [],
     "stateMutability": "nonpayable",
     "type": "constructor"
   },

abi/src/mocks/drainerContract.sol/Drainer.json

@@ -0,0 +1,25 @@
+[
+  {
+    "inputs": [],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "victim",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "cycles",
+        "type": "uint256"
+      }
+    ],
+    "name": "drain",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]

deploy/drainer.ts

@@ -0,0 +1,19 @@
+import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { DeployFunction } from "hardhat-deploy/types";
+
+const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
+  const { deployments, getNamedAccounts } = hre;
+  const { deploy } = deployments;
+
+  const { deployer, owner } = await getNamedAccounts();
+
+  await deploy("Drainer", {
+    from: deployer,
+    args: [],
+    skipIfAlreadyDeployed: true,
+  });
+};
+
+export default func;
+func.dependencies = ["layer_proxy"];
+func.tags = ["poc", "drainer"];

deploy/layered_proxy.ts

@@ -1,6 +1,6 @@
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { DeployFunction } from "hardhat-deploy/types";
-import { LayeredProxy, SampleLayer } from "../types";
+import { LayeredProxy, RecoverableFuse } from "../types";
 import { ethers } from "hardhat";
 import { LibAccessLayers } from "../types/src/LayeredProxy";
 
@@ -10,11 +10,11 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
   const { deployer, owner } = await getNamedAccounts();
 
-  const simpleLayer = await deployments.get("SampleLayer");
+  const simpleLayer = await deployments.get("RecoverableFuse");
   const simpleLayerContract = (await ethers.getContractAt(
     simpleLayer.abi,
     simpleLayer.address,
-  )) as SampleLayer;
+  )) as RecoverableFuse;
 
   let layer: LibAccessLayers.LayerStructStruct = {
     layerAddess: simpleLayer.address,
@@ -28,15 +28,20 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
         "afterCallValidation(bytes,bytes4,address,uint256,bytes,bytes)"
       ],
     ),
-    layerConfigData: "",
+    layerConfigData: ethers.utils.defaultAbiCoder.encode(["uint256"], [10]),
   };
 
-  const result = await deploy("LayeredProxy", {
+  const result = await deploy("MockERC20", {
     from: deployer,
-    args: [owner, [layer]],
+    args: [],
+    skipIfAlreadyDeployed: true,
+  });
+
+  const lp = await deploy("LayeredProxy", {
+    from: deployer,
+    args: [owner, [layer], result.address],
     skipIfAlreadyDeployed: true,
   });
-  console.log("deployed at", result.address);
 };
 
 export default func;

deploy/simple_layer.ts

@@ -7,12 +7,11 @@ const func: DeployFunction = async (hre: HardhatRuntimeEnvironment) => {
 
   const { deployer } = await getNamedAccounts();
 
-  const result = await deploy("SampleLayer", {
+  await deploy("RecoverableFuse", {
     from: deployer,
     args: [],
     skipIfAlreadyDeployed: true,
   });
-  console.log("deployed at", result.address);
 };
 
 export default func;

hardhat.config.ts

@@ -28,7 +28,7 @@ export default {
     token: "MATIC",
     gasPriceApi:
       "https://api.polygonscan.com/api?module=proxy&action=eth_gasPrice",
-    enabled: false,
+    enabled: true,
     coinmarketcap: process.env.COINMARKETCAP_KEY,
   },
   namedAccounts: {

package.json

@@ -74,7 +74,7 @@
     "@types/node": "^17.0.36",
     "chalk": "^4.1.2",
     "cli-table": "^0.3.11",
-    "hardhat-gas-reporter": "^1.0.9",
+    "hardhat-gas-reporter": "^2.0.2",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   }