Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions daily_points_v2.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
POINTS_PER_PILOT_VAULT_TOKEN_FOR_NFT = (142 * 1000) // 100 # 1.42

lp_balances_snapshot = {}
lp_balances_snapshot_start_block = 0

type Points = int

Expand Down Expand Up @@ -110,7 +111,8 @@ def get_points(day_index) -> Dict[str, Points]:
events = block_number_to_events[block_number]
for event in events:
user_state = process_event_above_user_state(event, user_state)
points = give_points_for_user_state(user_state, points)
if block_number > lp_balances_snapshot_start_block:
points = give_points_for_user_state(user_state, points)

validate_end_state(day_index, user_state)
return points
Expand Down Expand Up @@ -139,5 +141,7 @@ def process_points():
)

if __name__ == "__main__":
lp_balances_snapshot = get_user_state("data/lp_balances_snapshot.json", "start_state")
lp_balances_snapshot_data_dir = "data/lp_balances_snapshot.json"
lp_balances_snapshot = get_user_state(lp_balances_snapshot_data_dir, "start_state")
lp_balances_snapshot_start_block = json.load(open(lp_balances_snapshot_data_dir, 'r'))["start_block"]
process_points()
4 changes: 2 additions & 2 deletions test/test_nft_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ def get_onchain_data(w3, state_data, users_data, addresses, block_key):
def validate_nft_balance_and_ownership(
users_data, onchain_data, state_data, w3, addresses
):
users_data_items = sorted(list(users_data.items()))
onchain_data_items = sorted(list(onchain_data.items()))
users_data_items = sorted(list(users_data.items()), key=lambda x: x[0].lower())
onchain_data_items = sorted(list(onchain_data.items()), key=lambda x: x[0].lower())
assert len(users_data_items) == len(
onchain_data_items
), "Users data and onchain data length mismatch"
Expand Down
4 changes: 2 additions & 2 deletions test/test_transfer_events_structure.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ def _check_transfer_balances_if_needed(
).call(block_identifier=prev_event_block)
assert (
user_balances[user] == balance
), f"User {user} balance mismatch: {user_balances[user]} != {total_supply}"
), f"User {user} balance mismatch: {user_balances[user]} != {total_supply} at block {prev_event_block}"
assert total_supply == sum(
user_balances.values()
), f"Total supply mismatch: {total_supply} != {sum(user_balances.values())}"
), f"Total supply mismatch: {total_supply} != {sum(user_balances.values())} at block {prev_event_block}"
affected_users.clear()
2 changes: 1 addition & 1 deletion test/test_user_balance.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def get_onchain_balances(w3, state_data, users_data, addresses, block_key):
block = state_data[block_key] if block_key == "end_block" else state_data[block_key] - 1
for user, _ in users_data.items():
contract = w3.eth.contract(
address=Web3.to_checksum_address(["pilot_vault"]), abi=ERC20_ABI
address=Web3.to_checksum_address(addresses["pilot_vault"]), abi=ERC20_ABI
)
balance = contract.functions.balanceOf(Web3.to_checksum_address(user)).call(
block_identifier=block
Expand Down
2 changes: 1 addition & 1 deletion utils/get_rpc.py
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
def get_rpc():
return "https://ethereum-rpc.publicnode.com"
return "https://mainnet.gateway.tenderly.co"