feat: New Staking workflow

README.md

@@ -78,6 +78,8 @@ This project includes the following smart contracts and their metadata:
     - HitchensOrderStatisticsTreeLib
   - Test Token
 
+**`StakeRegistry` / `applyUpdates` (bots & backends):** `applyUpdates(address)` applies the ready prefix of each owner’s update queue. If the next pending item at the queue head is a **due** `WithdrawTokens` or `ExitStake` and payouts are blocked by an active freeze, the call **reverts** with `FrozenWithdrawal()` and the **whole transaction rolls back** (no partial commit from that call). Integrators should treat that as retry-after-unfreeze, or rely on paths that advance the queue internally under different constraints (redistributor-triggered txs, paused migration flows). Inline NatSpec next to `applyUpdates` matches this behaviour.
+
 - Metadata ([Testnet](./testnet_deployed.json),[Mainnet](./mainnet_deployed.json))
   - **Chain ID**: Chain ID of the blockchain.
   - **Network ID**: Network ID.

deploy/local/003_deploy_staking.ts

@@ -4,12 +4,18 @@ import { networkConfig } from '../../helper-hardhat-config';
 const func: DeployFunction = async function ({ deployments, getNamedAccounts, network }) {
   const { deploy, get, log } = deployments;
   const { deployer } = await getNamedAccounts();
-  const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
+  const config = networkConfig[network.name] || {};
+  const swarmNetworkID = config.swarmNetworkId;
 
   const token = await get('TestToken');
-  const oracleAddress = (await get('PriceOracle')).address;
 
-  const args = [token.address, swarmNetworkID, oracleAddress];
+  const args = [
+    token.address,
+    swarmNetworkID,
+    config.stakeWaitBase || 2,
+    config.stakeWaitOverlayChange || 2,
+    config.stakeWaitWithdrawal || 2,
+  ];
   await deploy('StakeRegistry', {
     from: deployer,
     args: args,

deploy/main/003_deploy_staking.ts

@@ -4,11 +4,17 @@ import { networkConfig } from '../../helper-hardhat-config';
 const func: DeployFunction = async function ({ deployments, getNamedAccounts, network }) {
   const { deploy, log, get } = deployments;
   const { deployer } = await getNamedAccounts();
-  const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
+  const config = networkConfig[network.name] || {};
+  const swarmNetworkID = config.swarmNetworkId;
   const token = await get('Token');
-  const oracleAddress = (await get('PriceOracle')).address;
 
-  const args = [token.address, swarmNetworkID, oracleAddress];
+  const args = [
+    token.address,
+    swarmNetworkID,
+    config.stakeWaitBase || 2,
+    config.stakeWaitOverlayChange || 2,
+    config.stakeWaitWithdrawal || 2,
+  ];
   await deploy('StakeRegistry', {
     from: deployer,
     args: args,

deploy/main/010_deploy_verify.ts

@@ -6,7 +6,8 @@ const func: DeployFunction = async function ({ deployments, network }) {
   const { log, get } = deployments;
 
   if (network.name == 'mainnet' && process.env.MAINNET_ETHERSCAN_KEY) {
-    const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
+    const config = networkConfig[network.name] || {};
+    const swarmNetworkID = config.swarmNetworkId;
     const token = await get('Token');
 
     // Verify postageStamp
@@ -27,14 +28,21 @@ const func: DeployFunction = async function ({ deployments, network }) {
 
     // Verify staking
     const staking = await get('StakeRegistry');
-    const argStaking = [token.address, swarmNetworkID, priceOracle.address];
+    const redistribution = await get('Redistribution');
+    const argStaking = [
+      token.address,
+      redistribution.address,
+      swarmNetworkID,
+      config.stakeWaitBase || 2,
+      config.stakeWaitOverlayChange || 2,
+      config.stakeWaitWithdrawal || 2,
+    ];
 
     log('Verifying...');
     await verify(staking.address, argStaking);
     log('----------------------------------------------------');
 
     // Verify redistribution
-    const redistribution = await get('Redistribution');
     const argRedistribution = [staking.address, postageStamp.address, priceOracle.address];
 
     log('Verifying...');

deploy/test/003_deploy_staking.ts

@@ -4,11 +4,17 @@ import { networkConfig } from '../../helper-hardhat-config';
 const func: DeployFunction = async function ({ deployments, getNamedAccounts, network }) {
   const { deploy, log, get } = deployments;
   const { deployer } = await getNamedAccounts();
-  const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
+  const config = networkConfig[network.name] || {};
+  const swarmNetworkID = config.swarmNetworkId;
   const token = await get('TestToken');
-  const oracleAddress = (await get('PriceOracle')).address;
 
-  const args = [token.address, swarmNetworkID, oracleAddress];
+  const args = [
+    token.address,
+    swarmNetworkID,
+    config.stakeWaitBase || 2,
+    config.stakeWaitOverlayChange || 2,
+    config.stakeWaitWithdrawal || 2,
+  ];
   await deploy('StakeRegistry', {
     from: deployer,
     args: args,

deploy/test/010_deploy_verify.ts

@@ -6,7 +6,8 @@ const func: DeployFunction = async function ({ deployments, network }) {
   const { log, get } = deployments;
 
   if (process.env.TESTNET_ETHERSCAN_KEY) {
-    const swarmNetworkID = networkConfig[network.name]?.swarmNetworkId;
+    const config = networkConfig[network.name] || {};
+    const swarmNetworkID = config.swarmNetworkId;
 
     // Verify TestNet token
     const token = await get('TestToken');
@@ -34,14 +35,21 @@ const func: DeployFunction = async function ({ deployments, network }) {
 
     // Verify staking
     const staking = await get('StakeRegistry');
-    const argStaking = [token.address, swarmNetworkID, priceOracle.address];
+    const redistribution = await get('Redistribution');
+    const argStaking = [
+      token.address,
+      redistribution.address,
+      swarmNetworkID,
+      config.stakeWaitBase || 2,
+      config.stakeWaitOverlayChange || 2,
+      config.stakeWaitWithdrawal || 2,
+    ];
 
     log('Staking');
     await verify(staking.address, argStaking);
     log('----------------------------------------------------');
 
     // Verify redistribution
-    const redistribution = await get('Redistribution');
     const argRedistribution = [staking.address, postageStamp.address, priceOracle.address];
 
     log('Redistribution');

helper-hardhat-config.ts

@@ -2,34 +2,70 @@ export interface networkConfigItem {
   blockConfirmations?: number;
   swarmNetworkId?: number;
   multisig?: string;
+  stakeWaitBase?: number;
+  stakeWaitOverlayChange?: number;
+  stakeWaitWithdrawal?: number;
 }
 export interface networkConfigInfo {
   [key: string]: networkConfigItem;
 }
 
+const ROUNDS_PER_DAY = 114;
+const WITHDRAWAL_WAIT_ROUNDS = ROUNDS_PER_DAY * 28;
+
 export const networkConfig: networkConfigInfo = {
-  localhost: { swarmNetworkId: 0, multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5' },
-  hardhat: { swarmNetworkId: 0, multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5' },
-  localcluster: { swarmNetworkId: 0, multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5' },
+  localhost: {
+    swarmNetworkId: 0,
+    multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: 2,
+  },
+  hardhat: {
+    swarmNetworkId: 0,
+    multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: 2,
+  },
+  localcluster: {
+    swarmNetworkId: 0,
+    multisig: '0x62cab2b3b55f341f10348720ca18063cdb779ad5',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: 2,
+  },
   testnetlight: {
     blockConfirmations: 6,
     swarmNetworkId: 5,
     multisig: '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: WITHDRAWAL_WAIT_ROUNDS,
   },
   testnet: {
     blockConfirmations: 6,
     swarmNetworkId: 10,
     multisig: '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: WITHDRAWAL_WAIT_ROUNDS,
   },
   tenderly: {
     blockConfirmations: 1,
     swarmNetworkId: 1,
     multisig: '0xb1C7F17Ed88189Abf269Bf68A3B2Ed83C5276aAe',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: WITHDRAWAL_WAIT_ROUNDS,
   },
   mainnet: {
     blockConfirmations: 6,
     swarmNetworkId: 1,
     multisig: '0xD5C070FEb5EA883063c183eDFF10BA6836cf9816',
+    stakeWaitBase: 2,
+    stakeWaitOverlayChange: 2,
+    stakeWaitWithdrawal: WITHDRAWAL_WAIT_ROUNDS,
   },
 };
 

src/Redistribution.sol

@@ -12,21 +12,19 @@ interface IPriceOracle {
 }
 
 interface IStakeRegistry {
-    struct Stake {
-        bytes32 overlay;
-        uint256 stakeAmount;
-        uint256 lastUpdatedBlockNumber;
-    }
-
     function freezeDeposit(address _owner, uint256 _time) external;
 
-    function lastUpdatedBlockNumberOfAddress(address _owner) external view returns (uint256);
-
     function overlayOfAddress(address _owner) external view returns (bytes32);
 
+    function overlayOfAddressLookahead(address _owner, uint64 _lookahead) external view returns (bytes32);
+
     function heightOfAddress(address _owner) external view returns (uint8);
 
+    function heightOfAddressLookahead(address _owner, uint64 _lookahead) external view returns (uint8);
+
     function nodeEffectiveStake(address _owner) external view returns (uint256);
+
+    function nodeEffectiveStakeLookahead(address _owner, uint64 _lookahead) external view returns (uint256);
 }
 
 /**
@@ -200,11 +198,6 @@ contract Redistribution is AccessControl, Pausable {
      */
     event PriceAdjustmentSkipped(uint16 redundancyCount);
 
-    /**
-     * @dev Withdraw not successful in claim
-     */
-    event WithdrawFailed(address owner);
-
     /**
      * @dev Logs that an overlay has revealed
      */
@@ -230,7 +223,6 @@ contract Redistribution is AccessControl, Pausable {
     error CommitRoundOver(); // Commit phase in this round is over
     error CommitRoundNotStarted(); // Commit phase in this round has not started yet
     error NotMatchingOwner(); // Sender of commit is not matching the overlay address
-    error MustStake2Rounds(); // Before entering the game node must stake 2 rounds prior
     error NotStaked(); // Node didn't add any staking
     error WrongPhase(); // Checking in wrong phase, need to check duing claim phase of current round for next round or commit in current round
     error AlreadyCommitted(); // Node already committed in this round
@@ -293,17 +285,12 @@ contract Redistribution is AccessControl, Pausable {
         uint64 cr = currentRound();
         bytes32 _overlay = Stakes.overlayOfAddress(msg.sender);
         uint256 _stake = Stakes.nodeEffectiveStake(msg.sender);
-        uint256 _lastUpdate = Stakes.lastUpdatedBlockNumberOfAddress(msg.sender);
         uint8 _height = Stakes.heightOfAddress(msg.sender);
 
-        if (_lastUpdate == 0) {
+        if (_stake == 0) {
             revert NotStaked();
         }
 
-        if (_lastUpdate >= block.number - 2 * ROUND_LENGTH) {
-            revert MustStake2Rounds();
-        }
-
         if (cr > _roundNumber) {
             revert CommitRoundOver();
         }
@@ -482,13 +469,7 @@ contract Redistribution is AccessControl, Pausable {
 
         estimateSize(entryProofLast.proofSegments[0]);
 
-        // Do the check if the withdraw was success
-        (bool success, ) = address(PostageContract).call(
-            abi.encodeWithSignature("withdraw(address)", winnerSelected.owner)
-        );
-        if (!success) {
-            emit WithdrawFailed(winnerSelected.owner);
-        }
+        PostageContract.withdraw(winnerSelected.owner);
 
         emit WinnerSelected(winnerSelected);
         emit ChunkCount(PostageContract.validChunkCount());
@@ -824,26 +805,31 @@ contract Redistribution is AccessControl, Pausable {
 
     /**
      * @notice Determine if a the owner of a given overlay can participate in the upcoming round.
+     * @dev This method is part of the external interface used by Bee nodes to pre-check
+     * eligibility, so it must remain available even when it is not referenced by on-chain code.
      * @param _owner The address of the applicant from.
      * @param _depth The storage depth the applicant intends to report.
      */
     function isParticipatingInUpcomingRound(address _owner, uint8 _depth) public view returns (bool) {
-        uint256 _lastUpdate = Stakes.lastUpdatedBlockNumberOfAddress(_owner);
-        uint8 _depthResponsibility = _depth - Stakes.heightOfAddress(_owner);
-
         if (currentPhaseReveal()) {
             revert WrongPhase();
         }
 
-        if (_lastUpdate == 0) {
+        uint64 lookahead = currentPhaseClaim() ? 1 : 0;
+        uint256 _stake = Stakes.nodeEffectiveStakeLookahead(_owner, lookahead);
+
+        if (_stake == 0) {
             revert NotStaked();
         }
 
-        if (_lastUpdate >= block.number - 2 * ROUND_LENGTH) {
-            revert MustStake2Rounds();
-        }
+        uint8 _depthResponsibility = _depth - Stakes.heightOfAddressLookahead(_owner, lookahead);
 
-        return inProximity(Stakes.overlayOfAddress(_owner), currentRoundAnchor(), _depthResponsibility);
+        return
+            inProximity(
+                Stakes.overlayOfAddressLookahead(_owner, lookahead),
+                currentRoundAnchor(),
+                _depthResponsibility
+            );
     }
 
     // ----------------------------- Reveal ------------------------------