diff --git a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/db.py b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/db.py index 85807dbe..8f1ecd26 100644 --- a/crawlers/mooncrawl/mooncrawl/moonworm_crawler/db.py +++ b/crawlers/mooncrawl/mooncrawl/moonworm_crawler/db.py @@ -355,8 +355,8 @@ def add_function_calls_to_session( "block_number": label_function_call.block_number, "block_hash": label_function_call.block_hash, "block_timestamp": label_function_call.block_timestamp, - "caller_address": label_function_call.caller_address, - "origin_address": label_function_call.caller_address, + "caller_address": bytes.fromhex(label_function_call.caller_address[2:]), + "origin_address": bytes.fromhex(label_function_call.caller_address[2:]), "address": bytes.fromhex(label_function_call.address[2:]), "label_name": label_function_call.label_name, "label_type": "tx_call", diff --git a/moonstreamdb-v3/moonstreamdbv3/alembic/versions/2e90b758090c_bytea_address_in_labels.py b/moonstreamdb-v3/moonstreamdbv3/alembic/versions/2e90b758090c_bytea_address_in_labels.py new file mode 100644 index 00000000..71571574 --- /dev/null +++ b/moonstreamdb-v3/moonstreamdbv3/alembic/versions/2e90b758090c_bytea_address_in_labels.py @@ -0,0 +1,604 @@ +"""Bytea address in labels + +Revision ID: 2e90b758090c +Revises: 792ca9c4722c +Create Date: 2024-07-15 17:38:36.529835 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '2e90b758090c' +down_revision: Union[str, None] = '792ca9c4722c' +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('amoy_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('amoy_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('amoy_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('arbitrum_nova_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_nova_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_nova_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('arbitrum_one_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_one_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_one_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('arbitrum_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('arbitrum_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('avalanche_fuji_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('avalanche_fuji_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('avalanche_fuji_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('avalanche_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('avalanche_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('avalanche_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('base_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('base_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('base_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('blast_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('blast_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('blast_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('blast_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('blast_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('blast_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('ethereum_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('ethereum_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('ethereum_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('mantle_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mantle_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mantle_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('mantle_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mantle_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mantle_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('mumbai_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mumbai_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('mumbai_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('polygon_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('polygon_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('polygon_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('proofofplay_apex_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('proofofplay_apex_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('proofofplay_apex_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('starknet_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('starknet_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('starknet_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('starknet_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('starknet_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('starknet_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('xai_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xai_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xai_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('xai_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xai_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xai_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('xdai_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xdai_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('xdai_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('zksync_era_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('zksync_era_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('zksync_era_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + op.alter_column('zksync_era_sepolia_labels', 'caller_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('zksync_era_sepolia_labels', 'origin_address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + existing_nullable=True) + op.alter_column('zksync_era_sepolia_labels', 'address', + existing_type=sa.VARCHAR(length=64), + type_=sa.LargeBinary(), + nullable=False) + # ### end Alembic commands ### + + +def downgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + op.alter_column('zksync_era_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('zksync_era_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('zksync_era_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('zksync_era_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('zksync_era_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('zksync_era_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xdai_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('xdai_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xdai_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xai_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('xai_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xai_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xai_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('xai_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('xai_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('starknet_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('starknet_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('starknet_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('starknet_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('starknet_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('starknet_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('proofofplay_apex_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('proofofplay_apex_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('proofofplay_apex_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('polygon_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('polygon_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('polygon_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mumbai_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('mumbai_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mumbai_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mantle_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('mantle_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mantle_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mantle_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('mantle_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('mantle_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('ethereum_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('ethereum_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('ethereum_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('blast_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('blast_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('blast_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('blast_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('blast_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('blast_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('base_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('base_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('base_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('avalanche_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('avalanche_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('avalanche_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('avalanche_fuji_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('avalanche_fuji_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('avalanche_fuji_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_sepolia_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('arbitrum_sepolia_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_sepolia_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_one_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('arbitrum_one_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_one_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_nova_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('arbitrum_nova_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('arbitrum_nova_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('amoy_labels', 'address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + nullable=True) + op.alter_column('amoy_labels', 'origin_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + op.alter_column('amoy_labels', 'caller_address', + existing_type=sa.LargeBinary(), + type_=sa.VARCHAR(length=64), + existing_nullable=True) + # ### end Alembic commands ### diff --git a/moonstreamdb-v3/moonstreamdbv3/alembic/versions/38ad819f94ed_bytea_address_in_labels.py b/moonstreamdb-v3/moonstreamdbv3/alembic/versions/38ad819f94ed_bytea_address_in_labels.py deleted file mode 100644 index b1ec64e9..00000000 --- a/moonstreamdb-v3/moonstreamdbv3/alembic/versions/38ad819f94ed_bytea_address_in_labels.py +++ /dev/null @@ -1,220 +0,0 @@ -"""Bytea address in labels - -Revision ID: 38ad819f94ed -Revises: 792ca9c4722c -Create Date: 2024-07-15 16:16:35.400430 - -""" -from typing import Sequence, Union - -from alembic import op -import sqlalchemy as sa - - -# revision identifiers, used by Alembic. -revision: str = '38ad819f94ed' -down_revision: Union[str, None] = '792ca9c4722c' -branch_labels: Union[str, Sequence[str], None] = None -depends_on: Union[str, Sequence[str], None] = None - - -def upgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('amoy_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('arbitrum_nova_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('arbitrum_one_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('arbitrum_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('avalanche_fuji_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('avalanche_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('base_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('blast_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('blast_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('ethereum_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('mantle_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('mantle_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('mumbai_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('polygon_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('proofofplay_apex_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('starknet_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('starknet_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('xai_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('xai_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('xdai_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('zksync_era_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - op.alter_column('zksync_era_sepolia_labels', 'address', - existing_type=sa.VARCHAR(length=64), - type_=sa.LargeBinary(), - nullable=False) - # ### end Alembic commands ### - - -def downgrade() -> None: - # ### commands auto generated by Alembic - please adjust! ### - op.alter_column('zksync_era_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('zksync_era_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('xdai_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('xai_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('xai_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('starknet_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('starknet_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('proofofplay_apex_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('polygon_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('mumbai_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('mantle_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('mantle_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('game7_orbit_arbitrum_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('ethereum_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('blast_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('blast_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('base_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('avalanche_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('avalanche_fuji_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('arbitrum_sepolia_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('arbitrum_one_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('arbitrum_nova_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - op.alter_column('amoy_labels', 'address', - existing_type=sa.LargeBinary(), - type_=sa.VARCHAR(length=64), - nullable=True) - # ### end Alembic commands ### diff --git a/moonstreamdb-v3/moonstreamdbv3/models.py b/moonstreamdb-v3/moonstreamdbv3/models.py index 4c45d67f..781c887f 100644 --- a/moonstreamdb-v3/moonstreamdbv3/models.py +++ b/moonstreamdb-v3/moonstreamdbv3/models.py @@ -94,15 +94,16 @@ class EvmBasedLabel(Base): # type: ignore block_timestamp = Column(BigInteger, nullable=False) caller_address = Column( - VARCHAR(64), + LargeBinary, nullable=True, index=True, ) origin_address = Column( - VARCHAR(64), + LargeBinary, nullable=True, index=True, ) + address = Column( LargeBinary, nullable=False,