Update names

Author: pavlovdog

.github/workflows/test.yml

@@ -48,5 +48,5 @@ jobs:
 
       - name: Run Forge tests
         run: |
-          pnpm test
+          pnpm test -- --gas-report
         id: test

abi/MagicSpendStakeManager.abi.json

@@ -586,7 +586,7 @@
         "internalType": "address"
       },
       {
-        "name": "asset",
+        "name": "token",
         "type": "address",
         "indexed": true,
         "internalType": "address"
@@ -611,7 +611,7 @@
         "internalType": "address"
       },
       {
-        "name": "asset",
+        "name": "token",
         "type": "address",
         "indexed": true,
         "internalType": "address"
@@ -642,7 +642,7 @@
         "internalType": "address"
       },
       {
-        "name": "asset",
+        "name": "token",
         "type": "address",
         "indexed": true,
         "internalType": "address"
@@ -667,7 +667,7 @@
         "internalType": "address"
       },
       {
-        "name": "asset",
+        "name": "token",
         "type": "address",
         "indexed": true,
         "internalType": "address"

package.json

@@ -4,7 +4,9 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "build": "forge clean && forge build",
+    "build": "pnpm build:contracts && pnpm build:abi",
+    "build:abi": "./generate-abi.sh",
+    "build:contracts": "forge clean && forge build",
     "test": "pnpm build && forge test"
   },
   "keywords": [],

src/base/StakeManager.sol

@@ -36,16 +36,16 @@ abstract contract StakeManager is ReentrancyGuardUpgradeable {
     error InsufficientFunds();
 
     /// Emitted when a stake is added
-    event StakeLocked(address indexed account, address indexed asset, uint256 amount, uint256 unstakeDelaySec);
+    event StakeLocked(address indexed account, address indexed token, uint256 amount, uint256 unstakeDelaySec);
 
     /// Emitted when a stake is unlocked (starts the unstake process)
-    event StakeUnlocked(address indexed account, address indexed asset, uint256 withdrawTime);
+    event StakeUnlocked(address indexed account, address indexed token, uint256 withdrawTime);
 
     /// Emitted when a stake is withdrawn
-    event StakeWithdrawn(address indexed account, address indexed asset, uint256 amount);
+    event StakeWithdrawn(address indexed account, address indexed token, uint256 amount);
 
     /// Emitted when a stake is claimed
-    event StakeClaimed(address indexed account, address indexed asset, uint256 amount);
+    event StakeClaimed(address indexed account, address indexed token, uint256 amount);
 
     /**
      * @param stake           - Actual amount of ether staked for this entity.
@@ -58,8 +58,7 @@ abstract contract StakeManager is ReentrancyGuardUpgradeable {
         bool staked; // Indicates if the asset is currently staked
     }
 
-    /// maps account to asset to stake
-    mapping(address => mapping(address => StakeInfo)) private stakes;
+    mapping(address account => mapping(address token => StakeInfo stake)) private stakes;
 
     uint32 public constant ONE_DAY = 60 * 60 * 24;
     uint32 public constant THREE_DAYS = ONE_DAY * 3;