Protect prepaid access credits from kill switches.

OrchidTechnologies · Mar 14, 2021 · f0013f0 · f0013f0
1 parent 7f3b5d0
commit f0013f0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/lot-ethereum/lottery1.sol b/lot-ethereum/lottery1.sol
@@ -138,12 +138,14 @@ contract OrchidLottery1 {
             amount += uint128(backup);
         }
     {
+        uint256 marked;
         uint256 warned;
         uint256 unlock;
 
         if (adjust < 0 || lock != 0) {
             warned = pot.unlock_warned_;
-            unlock = warned >> 128;
+            marked = warned >> 192;
+            unlock = uint64(warned >> 128);
             warned = uint128(warned);
         }
 
@@ -187,7 +189,7 @@ contract OrchidLottery1 {
         }
 
         if (unlock != 0) {
-            uint256 cache = (warned == 0 ? 0 : unlock << 128 | warned);
+            uint256 cache = marked << 192 | (warned == 0 ? 0 : unlock << 128 | warned);
             pot.unlock_warned_ = cache;
             emit Delete(account, cache);
         }
@@ -228,6 +230,14 @@ contract OrchidLottery1 {
             return lottery.merchants_[recipient];
     }
 
+    function mark(IERC20 token, address signer) external {
+        Pot storage pot = lotteries_[msg.sender].pots_[signer][token];
+        uint256 cache = pot.unlock_warned_;
+        cache = block.timestamp << 192 | uint192(cache);
+        pot.unlock_warned_ = cache;
+        emit Delete(keccak256(abi.encodePacked(token, msg.sender, signer)), cache);
+    }
+
 
     /*struct Track {
         uint96 expire;
@@ -306,7 +316,7 @@ contract OrchidLottery1 {
         Pot storage pot = lottery.pots_[signer][token];
 
         if (lottery.closed_ - 1 < block.timestamp)
-            if (lottery.merchants_[recipient] <= block.timestamp)
+            if (lottery.merchants_[recipient] <= pot.unlock_warned_ >> 192)
                 return 0;
     {
         Track storage track = tracks_[keccak256(abi.encodePacked(digest, signer))];

diff --git a/lot-ethereum/seller.sol b/lot-ethereum/seller.sol
@@ -85,6 +85,9 @@ contract OrchidSeller {
         require(account.nonce_ == nonce);
         account.nonce_ = nonce + 1;
 
+        if (amount > retrieve)
+            lottery_.mark(token, signer);
+
         return signer;
     }
 

diff --git a/tst-ethereum/source/main.cpp b/tst-ethereum/source/main.cpp
@@ -196,8 +196,8 @@ struct Tester {
             //Log() << std::dec << uint128_t(escrow_balance) << " " << uint128_t(escrow_balance >> 128) << std::endl;
             orc_assert(uint128_t(escrow_balance) == account.balance_);
             orc_assert(uint128_t(escrow_balance >> 128) == account.escrow_);
-            if (unlock_warned != 0) {
-                const auto warned((uint128_t(unlock_warned)));
+            if (unlock_warned << 64 != 0) {
+                const auto warned((uint64_t(unlock_warned)));
                 const auto unlock(uint128_t(unlock_warned >> 128));
                 Log() << std::dec << warned << " " << unlock << std::endl;
             }
@@ -270,7 +270,7 @@ struct Tester {
 
         static const auto update(
             EVM_STORE_GET+EVM_STORE_SET+
-            EVM_EVENT_IDX*2+EVM_EVENT_ARG*3+
+            EVM_EVENT_IDX*2+EVM_EVENT_ARG*2+
         0);
 
         static const unsigned perp(