From b344c535630af26cd92c2bbcc777efe8d49c7c00 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Sat, 29 Sep 2018 23:42:31 -0500
Subject: [PATCH] delete expired blocks

---
 onionr/core.py              | 18 ++++++++++++++++--
 onionr/dbcreator.py         |  4 +++-
 onionr/onionrdaemontools.py |  9 +++++++--
 onionr/onionrutils.py       | 10 ++++++++--
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/onionr/core.py b/onionr/core.py
index c3f721c6..bb889813 100644
--- a/onionr/core.py
+++ b/onionr/core.py
@@ -620,9 +620,22 @@ class Core:
         for row in c.execute(execute, args):
             for i in row:
                 rows.append(i)
-
         return rows
 
+    def getExpiredBlocks(self):
+        '''Returns a list of expired blocks'''
+        conn = sqlite3.connect(self.blockDB, timeout=10)
+        c = conn.cursor()
+        date = int(self._utils.getEpoch())
+
+        execute = 'SELECT hash FROM hashes WHERE expire >= %s ORDER BY dateReceived;' % (date,)
+
+        rows = list()
+        for row in c.execute(execute):
+            for i in row:
+                rows.append(i)
+        return rows     
+
     def setBlockType(self, hash, blockType):
         '''
             Sets the type of block
@@ -648,9 +661,10 @@ class Core:
             sig    - optional signature by the author (not optional if author is specified)
             author       - multi-round partial sha3-256 hash of authors public key
             dateClaimed  - timestamp claimed inside the block, only as trustworthy as the block author is
+            expire       - expire date for a block
         '''
 
-        if key not in ('dateReceived', 'decrypted', 'dataType', 'dataFound', 'dataSaved', 'sig', 'author', 'dateClaimed'):
+        if key not in ('dateReceived', 'decrypted', 'dataType', 'dataFound', 'dataSaved', 'sig', 'author', 'dateClaimed', 'expire'):
             return False
 
         conn = sqlite3.connect(self.blockDB, timeout=10)
diff --git a/onionr/dbcreator.py b/onionr/dbcreator.py
index f9838342..7f970310 100644
--- a/onionr/dbcreator.py
+++ b/onionr/dbcreator.py
@@ -91,6 +91,7 @@ class DBCreator:
             sig    - optional signature by the author (not optional if author is specified)
             author       - multi-round partial sha3-256 hash of authors public key
             dateClaimed  - timestamp claimed inside the block, only as trustworthy as the block author is
+            expire int   - block expire date in epoch
         '''
         if os.path.exists(self.core.blockDB):
             raise Exception("Block database already exists")
@@ -105,7 +106,8 @@ class DBCreator:
             dataSaved int,
             sig text,
             author text,
-            dateClaimed int
+            dateClaimed int,
+            expire int
             );
         ''')
         conn.commit()
diff --git a/onionr/onionrdaemontools.py b/onionr/onionrdaemontools.py
index bbd7af64..8192e0de 100644
--- a/onionr/onionrdaemontools.py
+++ b/onionr/onionrdaemontools.py
@@ -65,12 +65,17 @@ class DaemonTools:
         self.daemon.decrementThreadCount('netCheck')
     
     def cleanOldBlocks(self):
-        '''Delete old blocks if our disk allocation is full/near full'''
+        '''Delete old blocks if our disk allocation is full/near full, and also expired blocks'''
+
         while self.daemon._core._utils.storageCounter.isFull():
             oldest = self.daemon._core.getBlockList()[0]
             self.daemon._core._blacklist.addToDB(oldest)
             self.daemon._core.removeBlock(oldest)
-            logger.info('Deleted block: %s' % (oldest,))        
+            logger.info('Deleted block: %s' % (oldest,))
+        # Delete expired blocks
+        for bHash in self.daemon._core.getExpiredBlocks():
+            self.daemon._core._blacklist.addToDB(bHash)
+            self.daemon._core.removeBlock(bHash)
         self.daemon.decrementThreadCount('cleanOldBlocks')
 
     def cooldownPeer(self):
diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py
index f5820059..1c9cf637 100644
--- a/onionr/onionrutils.py
+++ b/onionr/onionrutils.py
@@ -270,12 +270,18 @@ class OnionrUtils:
             try:
                 if len(blockType) <= 10:
                     self._core.updateBlockInfo(blockHash, 'dataType', blockType)
-
                     onionrevents.event('processblocks', data = {'block': myBlock, 'type': blockType, 'signer': signer, 'validSig': valid}, onionr = None)
-
             except TypeError:
                 logger.warn("Missing block information")
                 pass
+            # Set block expire time if specified
+            try:
+                expireTime = myBlock.getMetadata('expire')
+                assert len(int(expireTime)) < 20 # test that expire time is an integer of sane length (for epoch)
+            except (AssertionError, ValueError) as e:
+                pass
+            else:
+                self._core.updateBlockInfo(blockHash, 'expire', expireTime)
         else:
             logger.debug('Not processing metadata on encrypted block we cannot decrypt.')