diff --git a/lib/functions.py b/lib/functions.py index 83b66068f71047cf81662d1f3629eaeb246cdd29..d7d44c3bd209f725c455cb4e845a1e0a60029f12 100644 --- a/lib/functions.py +++ b/lib/functions.py @@ -7,7 +7,7 @@ from adapters.duniter_v18.memberships import LevelDBMembershipsRepository from adapters.duniter_v18.wallets import LevelDBWalletsRepository from adapters.duniter_v18.ud_value import LevelDBUDValueRepository from custom.parameters import CERT_PERIOD, CERT_MIN_RECEIVED_CERT_TO_ISSUE_CERT -from lib.utility import v1_pubkey_to_v2_address, load_json, date_to_bloc_number +from lib.utility import load_json def get_wallets_data(leveldb_path: str) -> tuple: @@ -108,7 +108,7 @@ def get_identities_and_wallets(start_timestamp: int, leveldb_path: str) -> tuple uid = identity["uid"] is_member = identity["member"] identity_names[pubkey] = uid - membership_expire_on = date_to_bloc_number(memberships_repository.get(pubkey)["expires_on"], start_timestamp) + membership_expire_on = memberships_repository.get(pubkey)["expires_on"] if membership_expire_on < 0: membership_expire_on = 0 # forget old expiry date @@ -154,13 +154,11 @@ def get_identities_and_wallets(start_timestamp: int, leveldb_path: str) -> tuple # get expiration of certification # timestamp of cert creation created_at = blocks_repository.get(cert["created_on"])["medianTime"] - # block of cert creation - created_on = date_to_bloc_number(created_at, start_timestamp) # block of next issuable cert - next_issuable_on = created_on + CERT_PERIOD + next_issuable_on = created_at + CERT_PERIOD # timestamp of cert expiration cert_expire_at = cert["expires_on"] - cert_expire_on = date_to_bloc_number(cert_expire_at, start_timestamp) + cert_expire_on = cert_expire_at # if certification expiration date is before export, # it is a renewed certification and can be ignored diff --git a/main.py b/main.py index f48165edbd9b0f4811deb2c4587fe9e2023dbb44..bfbc237f289a9398838fa3c2d56a584577d05384 100755 --- a/main.py +++ b/main.py @@ -57,7 +57,7 @@ def main(): last_block_time = last_block["medianTime"] first_ud_value = last_block["dividend"] - first_ud_reeval = date_to_bloc_number(last_block["udReevalTime"], start_timestamp) + first_ud_reeval = last_block["udReevalTime"] inital_monetary_mass = last_block["mass"] last_block_time = last_block["medianTime"]