Merge branch 'main' of https://github.com/permaweb/aos into twilson63/chore-bump-2.0.1

Author: twilson63

blueprints/staking.lua

@@ -1,6 +1,7 @@
-Variant = "0.0.2"
+Variant = "0.0.4"
 Stakers = Stakers or {}
 Unstaking = Unstaking or {}
+UnstakeDelay = UnstakeDelay or 670
 local bint = require('.bint')(256)
 
 --[[
@@ -21,13 +22,12 @@ local utils = {
 -- Stake Action Handler
 Handlers.stake = function(msg)
   local quantity = bint(msg.Tags.Quantity)
-  local delay = tonumber(msg.Tags.UnstakeDelay)
   local height = tonumber(msg['Block-Height'])
   assert(Balances[msg.From] and bint(Balances[msg.From]) >= quantity, "Insufficient balance to stake")
   Balances[msg.From] = utils.subtract(Balances[msg.From], msg.Tags.Quantity) 
   Stakers[msg.From] = Stakers[msg.From] or { amount = "0" }
   Stakers[msg.From].amount = utils.add(Stakers[msg.From].amount, msg.Tags.Quantity)  
-  Stakers[msg.From].unstake_at = height + delay
+  Stakers[msg.From].unstake_at = height + UnstakeDelay
   print("Successfully Staked " .. msg.Tags.Quantity)
   if msg.reply then
     msg.reply({ Data = "Successfully Staked " .. msg.Tags.Quantity})
@@ -57,12 +57,11 @@ local finalizationHandler = function(msg)
   local currentHeight = tonumber(msg['Block-Height'])
   -- Process unstaking
   for address, unstakeInfo in pairs(Unstaking) do
-      if currentHeight >= unstakeInfo.release_at then
+      if unstakeInfo.release_at == nil or currentHeight >= unstakeInfo.release_at then
           Balances[address] = utils.add(Balances[address] or "0", unstakeInfo.amount)
           Unstaking[address] = nil
       end
   end
-  
 end
 
 -- wrap function to continue handler flow
@@ -91,5 +90,4 @@ Handlers.add("staking.unstake",
   continue(Handlers.utils.hasMatchingTag("Action", "Unstake")), Handlers.unstake)
 -- Finalization handler should be called for every message
 -- changed to continue to let messages pass-through
-Handlers.add("staking.finalize", function (msg) return "continue" end, finalizationHandler)
-
+Handlers.prepend("staking.finalize", function (msg) return "continue" end, finalizationHandler)