Merge pull request #499 from BoostryJP/fix/checkpoint_locked_balance

fix: set previous locked balance when checkpoint is used
BoostryJP · Mar 22, 2023 · 71a3222 · 71a3222
2 parents ca36630 + 14acd9e
commit 71a3222
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/batch/indexer_token_holders.py b/batch/indexer_token_holders.py
@@ -159,7 +159,9 @@ def __load_checkpoint(
             )
             for holder in _holders:
                 self.balance_book.store(
-                    account_address=holder.account_address, amount=holder.hold_balance
+                    account_address=holder.account_address,
+                    amount=holder.hold_balance,
+                    locked=holder.locked_balance,
                 )
             block_from = _checkpoint.block_number + 1
             return block_from

diff --git a/tests/test_batch_indexer_token_holders.py b/tests/test_batch_indexer_token_holders.py
@@ -936,7 +936,9 @@ def test_normal_3(
         )
 
         assert user1_record.hold_balance == 17000
+        assert user1_record.locked_balance == 0
         assert user2_record.hold_balance == 13000
+        assert user2_record.locked_balance == 0
 
         assert (
             len(
@@ -1701,7 +1703,9 @@ def test_normal_6(
         )
 
         assert user1_record.hold_balance == 17000
+        assert user1_record.locked_balance == 0
         assert user2_record.hold_balance == 13000
+        assert user2_record.locked_balance == 0
 
         assert (
             len(
@@ -1916,6 +1920,12 @@ def test_normal_8(
             issuer_private_key,
             [exchange_contract.address, 10000],
         )
+        STContractUtils.lock(
+            token_contract.address,
+            user_address_1,
+            user_pk_1,
+            [issuer_address, 10000, ""],
+        )
 
         # Insert collection record with above token and current block number
         list_id = str(uuid.uuid4())
@@ -1927,6 +1937,12 @@ def test_normal_8(
         db.commit()
         processor.collect()
 
+        STContractUtils.unlock(
+            token_contract.address,
+            issuer_address,
+            issuer_private_key,
+            [user_address_1, user_address_2, 10000, ""],
+        )
         STContractUtils.transfer(
             token_contract.address,
             issuer_address,
@@ -1969,8 +1985,10 @@ def test_normal_8(
             .first()
         )
 
-        assert user1_record.hold_balance == 40000
-        assert user2_record.hold_balance == 20000
+        assert user1_record.hold_balance == 30000
+        assert user1_record.locked_balance == 0
+        assert user2_record.hold_balance == 30000
+        assert user2_record.locked_balance == 0
 
         assert (
             len(