kopia lustrzana https://github.com/bugout-dev/moonstream
Migration Call request types and Metatx holders
kompotkot
rodzic
179370affb
commit
3b265ad15d
|
|
@ -0,0 +1,162 @@
|
|||
"""Call request types and Metatx holders
|
||||
|
||||
Revision ID: b4257b10daaf
|
||||
Revises: dedd8a7d0624
|
||||
Create Date: 2023-08-02 18:28:14.724453
|
||||
|
||||
"""
|
||||
from alembic import op
|
||||
import sqlalchemy as sa
|
||||
|
||||
|
||||
# revision identifiers, used by Alembic.
|
||||
revision = 'b4257b10daaf'
|
||||
down_revision = 'dedd8a7d0624'
|
||||
branch_labels = None
|
||||
depends_on = None
|
||||
|
||||
|
||||
def upgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
|
||||
# Blockchains
|
||||
op.create_table('blockchains',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('name', sa.VARCHAR(length=128), nullable=False),
|
||||
sa.Column('chain_id', sa.Integer(), nullable=False),
|
||||
sa.Column('testnet', sa.Boolean(), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id', name=op.f('pk_blockchains')),
|
||||
sa.UniqueConstraint('id', name=op.f('uq_blockchains_id'))
|
||||
)
|
||||
|
||||
op.create_index(op.f('ix_blockchains_chain_id'), 'blockchains', ['chain_id'], unique=False)
|
||||
op.create_index(op.f('ix_blockchains_name'), 'blockchains', ['name'], unique=True)
|
||||
|
||||
op.add_column('registered_contracts', sa.Column('blockchain_id', sa.UUID(), nullable=True))
|
||||
op.create_foreign_key(op.f('fk_registered_contracts_blockchain_id_blockchains'), 'registered_contracts', 'blockchains', ['blockchain_id'], ['id'], ondelete='CASCADE')
|
||||
|
||||
# Manual - Start
|
||||
op.execute("INSERT INTO blockchains (name, chain_id, testnet) VALUES ('polygon', 137, FALSE);")
|
||||
op.execute("INSERT INTO blockchains (name, chain_id, testnet) VALUES ('mumbai', 80001, TRUE);")
|
||||
op.execute("UPDATE registered_contracts SET blockchain_id = (SELECT id FROM blockchains WHERE blockchains.name = contracts.blockchain);")
|
||||
op.alter_column("registered_contracts", "blockchain_id", nullable=False)
|
||||
# Manual - End
|
||||
|
||||
op.drop_constraint('uq_registered_contracts_blockchain', 'registered_contracts', type_='unique')
|
||||
op.drop_index('ix_registered_contracts_blockchain', table_name='registered_contracts')
|
||||
op.drop_column('registered_contracts', 'blockchain')
|
||||
|
||||
# Types
|
||||
op.create_table('call_request_types',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('request_type', sa.VARCHAR(length=128), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id', name=op.f('pk_call_request_types')),
|
||||
sa.UniqueConstraint('id', name=op.f('uq_call_request_types_id'))
|
||||
)
|
||||
|
||||
op.create_index(op.f('ix_call_request_types_request_type'), 'call_request_types', ['request_type'], unique=True)
|
||||
|
||||
op.add_column('call_requests', sa.Column('call_request_type_id', sa.UUID(), nullable=True))
|
||||
op.create_foreign_key(op.f('fk_call_requests_call_request_id_call_request_types'), 'call_requests', 'call_request_types', ['call_request_id'], ['id'], ondelete='CASCADE')
|
||||
|
||||
# Manual - Start
|
||||
op.execute("INSERT INTO call_request_types (request_type) VALUES ('raw');")
|
||||
op.execute("INSERT INTO call_request_types (request_type) VALUES ('dropper-v0.2.0');")
|
||||
op.execute("UPDATE call_requests SET request_type = (SELECT id FROM call_request_types INNER JOIN registered_contracts ON call_requests.registered_contract_id = registered_contracts.id WHERE call_request_types.request_type = registered_contracts.contract_type);")
|
||||
op.alter_column("call_requests", "call_request_type_id", nullable=False)
|
||||
# Manual - End
|
||||
|
||||
op.drop_index('ix_registered_contracts_contract_type', table_name='registered_contracts')
|
||||
op.drop_column('registered_contracts', 'contract_type')
|
||||
|
||||
# Holders
|
||||
op.create_table('metatx_holders',
|
||||
sa.Column('id', sa.UUID(), nullable=False),
|
||||
sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text("TIMEZONE('utc', statement_timestamp())"), nullable=False),
|
||||
sa.PrimaryKeyConstraint('id', name=op.f('pk_metatx_holders')),
|
||||
sa.UniqueConstraint('id', name=op.f('uq_metatx_holders_id'))
|
||||
)
|
||||
|
||||
op.add_column('call_requests', sa.Column('metatx_holder_id', sa.UUID(), nullable=True))
|
||||
op.create_foreign_key(op.f('fk_call_requests_metatx_holder_id_metatx_holders'), 'call_requests', 'metatx_holders', ['metatx_holder_id'], ['id'], ondelete='CASCADE')
|
||||
op.add_column('registered_contracts', sa.Column('metatx_holder_id', sa.UUID(), nullable=True))
|
||||
op.create_foreign_key(op.f('fk_registered_contracts_metatx_holder_id_metatx_holders'), 'registered_contracts', 'metatx_holders', ['metatx_holder_id'], ['id'], ondelete='CASCADE')
|
||||
|
||||
# Manual - Start
|
||||
op.execute("INSERT INTO metatx_holders (id) SELECT DISTINCT moonstream_user_id FROM registered_contracts ON CONFLICT (id) DO NOTHING;")
|
||||
op.execute("INSERT INTO metatx_holders (id) SELECT DISTINCT moonstream_user_id FROM call_requests ON CONFLICT (id) DO NOTHING;")
|
||||
op.execute("UPDATE registered_contracts SET metatx_holder_id = moonstream_user_id;")
|
||||
op.execute("UPDATE call_requests SET metatx_holder_id = moonstream_user_id;")
|
||||
op.alter_column("call_requests", "metatx_holder_id", nullable=False)
|
||||
op.alter_column("registered_contracts", "metatx_holder_id", nullable=False)
|
||||
# Manual - End
|
||||
|
||||
op.drop_index('ix_call_requests_moonstream_user_id', table_name='call_requests')
|
||||
op.drop_column('call_requests', 'moonstream_user_id')
|
||||
op.drop_index('ix_registered_contracts_moonstream_user_id', table_name='registered_contracts')
|
||||
op.drop_column('registered_contracts', 'moonstream_user_id')
|
||||
|
||||
# Other
|
||||
op.create_unique_constraint(op.f('uq_registered_contracts_blockchain_id'), 'registered_contracts', ['blockchain_id', 'metatx_holder_id', 'address'])
|
||||
|
||||
op.create_unique_constraint(op.f('uq_call_requests_id'), 'call_requests', ['id'])
|
||||
op.create_unique_constraint(op.f('uq_registered_contracts_id'), 'registered_contracts', ['id'])
|
||||
op.create_unique_constraint(op.f('uq_leaderboard_scores_id'), 'leaderboard_scores', ['id'])
|
||||
op.create_unique_constraint(op.f('uq_leaderboards_id'), 'leaderboards', ['id'])
|
||||
# ### end Alembic commands ###
|
||||
|
||||
|
||||
def downgrade():
|
||||
# ### commands auto generated by Alembic - please adjust! ###
|
||||
|
||||
# Blockchains
|
||||
op.add_column('registered_contracts', sa.Column('blockchain', sa.VARCHAR(length=128), autoincrement=False, nullable=False))
|
||||
op.create_index('ix_registered_contracts_blockchain', 'registered_contracts', ['blockchain'], unique=False)
|
||||
|
||||
# Manual
|
||||
# Copy blockchain values
|
||||
# ...
|
||||
|
||||
op.drop_constraint(op.f('fk_registered_contracts_blockchain_id_blockchains'), 'registered_contracts', type_='foreignkey')
|
||||
op.drop_constraint(op.f('uq_registered_contracts_blockchain_id'), 'registered_contracts', type_='unique')
|
||||
op.drop_column('registered_contracts', 'blockchain_id')
|
||||
|
||||
op.drop_index(op.f('ix_blockchains_name'), table_name='blockchains')
|
||||
op.drop_index(op.f('ix_blockchains_chain_id'), table_name='blockchains')
|
||||
op.drop_table('blockchains')
|
||||
|
||||
# Types
|
||||
op.add_column('registered_contracts', sa.Column('contract_type', sa.VARCHAR(length=128), autoincrement=False, nullable=False))
|
||||
op.create_index('ix_registered_contracts_contract_type', 'registered_contracts', ['contract_type'], unique=False)
|
||||
|
||||
# Manual
|
||||
# Copy type values
|
||||
# ...
|
||||
|
||||
op.drop_constraint(op.f('fk_call_requests_call_request_id_call_request_types'), 'call_requests', type_='foreignkey')
|
||||
op.drop_column('call_requests', 'call_request_type_id')
|
||||
|
||||
op.drop_index(op.f('ix_call_request_types_request_type'), table_name='call_request_types')
|
||||
op.drop_table('call_request_types')
|
||||
|
||||
# Holders
|
||||
op.add_column('registered_contracts', sa.Column('moonstream_user_id', sa.UUID(), autoincrement=False, nullable=False))
|
||||
op.create_index('ix_registered_contracts_moonstream_user_id', 'registered_contracts', ['moonstream_user_id'], unique=False)
|
||||
op.add_column('call_requests', sa.Column('moonstream_user_id', sa.UUID(), autoincrement=False, nullable=False))
|
||||
op.create_index('ix_call_requests_moonstream_user_id', 'call_requests', ['moonstream_user_id'], unique=False)
|
||||
|
||||
# Manual
|
||||
# Copy moonstream_user_ids
|
||||
# ...
|
||||
|
||||
op.drop_constraint(op.f('fk_registered_contracts_metatx_holder_id_metatx_holders'), 'registered_contracts', type_='foreignkey')
|
||||
op.drop_column('registered_contracts', 'metatx_holder_id')
|
||||
op.drop_constraint(op.f('fk_call_requests_metatx_holder_id_metatx_holders'), 'call_requests', type_='foreignkey')
|
||||
op.drop_column('call_requests', 'metatx_holder_id')
|
||||
|
||||
op.drop_table('metatx_holders')
|
||||
|
||||
# Other
|
||||
op.create_unique_constraint('uq_registered_contracts_blockchain', 'registered_contracts', ['blockchain', 'moonstream_user_id', 'address', 'contract_type'])
|
||||
|
||||
# ### end Alembic commands ###
|
||||
|
|
@ -66,7 +66,6 @@ def validate_method_and_params(
|
|||
Web3.toChecksumAddress(parameters["signer"])
|
||||
except:
|
||||
raise InvalidAddressFormat("Parameter signer must be a valid address")
|
||||
required_params["amount"] = str(required_params["amount"])
|
||||
else:
|
||||
raise ValueError(f"Unknown contract type {contract_type}")
|
||||
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@ from sqlalchemy import (
|
|||
MetaData,
|
||||
String,
|
||||
UniqueConstraint,
|
||||
Integer,
|
||||
)
|
||||
from sqlalchemy.dialects.postgresql import JSONB, UUID
|
||||
from sqlalchemy.ext.compiler import compiles
|
||||
from sqlalchemy.orm import relationship
|
||||
from sqlalchemy.ext.declarative import declarative_base
|
||||
from sqlalchemy.sql import and_, expression
|
||||
|
||||
|
|
@ -155,14 +157,86 @@ class DropperClaimant(Base): # type: ignore
|
|||
)
|
||||
|
||||
|
||||
class CallRequestType(Base): # type: ignore
|
||||
"""
|
||||
CallRequestType contains versions of call requests like:
|
||||
raw or dropper-v0.2.0.
|
||||
"""
|
||||
|
||||
__tablename__ = "call_request_types"
|
||||
|
||||
id = Column(
|
||||
UUID(as_uuid=True),
|
||||
primary_key=True,
|
||||
default=uuid.uuid4,
|
||||
unique=True,
|
||||
)
|
||||
request_type = Column(VARCHAR(128), nullable=False, unique=True, index=True)
|
||||
|
||||
call_requests = relationship(
|
||||
"CallRequest",
|
||||
back_populates="call_request_type",
|
||||
cascade="all, delete, delete-orphan",
|
||||
)
|
||||
|
||||
|
||||
class MetatxHolder(Base): # type: ignore
|
||||
"""
|
||||
MetatxHolder represents id of user from bugout authorization.
|
||||
"""
|
||||
|
||||
__tablename__ = "metatx_holders"
|
||||
|
||||
id = Column(
|
||||
UUID(as_uuid=True),
|
||||
primary_key=True,
|
||||
default=uuid.uuid4,
|
||||
unique=True,
|
||||
)
|
||||
|
||||
created_at = Column(
|
||||
DateTime(timezone=True), server_default=utcnow(), nullable=False
|
||||
)
|
||||
|
||||
registered_contracts = relationship(
|
||||
"RegisteredContract",
|
||||
back_populates="metatx_holder",
|
||||
cascade="all, delete, delete-orphan",
|
||||
)
|
||||
call_requests = relationship(
|
||||
"CallRequest",
|
||||
back_populates="metatx_holder",
|
||||
cascade="all, delete, delete-orphan",
|
||||
)
|
||||
|
||||
|
||||
class Blockchain(Base): # type: ignore
|
||||
__tablename__ = "blockchains"
|
||||
|
||||
id = Column(
|
||||
UUID(as_uuid=True),
|
||||
primary_key=True,
|
||||
default=uuid.uuid4,
|
||||
unique=True,
|
||||
)
|
||||
name = Column(VARCHAR(128), nullable=False, index=True, unique=True)
|
||||
chain_id = Column(Integer, nullable=False, index=True, unique=False)
|
||||
testnet = Column(Boolean, default=False, nullable=False)
|
||||
|
||||
registered_contracts = relationship(
|
||||
"RegisteredContract",
|
||||
back_populates="blockchain",
|
||||
cascade="all, delete, delete-orphan",
|
||||
)
|
||||
|
||||
|
||||
class RegisteredContract(Base): # type: ignore
|
||||
__tablename__ = "registered_contracts"
|
||||
__table_args__ = (
|
||||
UniqueConstraint(
|
||||
"blockchain",
|
||||
"moonstream_user_id",
|
||||
"blockchain_id",
|
||||
"metatx_holder_id",
|
||||
"address",
|
||||
"contract_type",
|
||||
),
|
||||
)
|
||||
|
||||
|
|
@ -172,14 +246,21 @@ class RegisteredContract(Base): # type: ignore
|
|||
default=uuid.uuid4,
|
||||
unique=True,
|
||||
)
|
||||
blockchain = Column(VARCHAR(128), nullable=False, index=True)
|
||||
metatx_holder_id = Column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("metatx_holders.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
)
|
||||
blockchain_id = Column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("blockchains.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
)
|
||||
|
||||
address = Column(VARCHAR(256), nullable=False, index=True)
|
||||
contract_type = Column(VARCHAR(128), nullable=False, index=True)
|
||||
title = Column(VARCHAR(128), nullable=False)
|
||||
description = Column(String, nullable=True)
|
||||
image_uri = Column(String, nullable=True)
|
||||
# User ID of the Moonstream user who registered this contract.
|
||||
moonstream_user_id = Column(UUID(as_uuid=True), nullable=False, index=True)
|
||||
|
||||
created_at = Column(
|
||||
DateTime(timezone=True), server_default=utcnow(), nullable=False
|
||||
|
|
@ -191,6 +272,15 @@ class RegisteredContract(Base): # type: ignore
|
|||
nullable=False,
|
||||
)
|
||||
|
||||
call_requests = relationship(
|
||||
"CallRequest",
|
||||
back_populates="registered_contract",
|
||||
cascade="all, delete, delete-orphan",
|
||||
)
|
||||
|
||||
metatx_holder = relationship("MetatxHolder", back_populates="registered_contracts")
|
||||
blockchain = relationship("Blockchain", back_populates="registered_contracts")
|
||||
|
||||
|
||||
class CallRequest(Base):
|
||||
__tablename__ = "call_requests"
|
||||
|
|
@ -202,19 +292,23 @@ class CallRequest(Base):
|
|||
unique=True,
|
||||
nullable=False,
|
||||
)
|
||||
|
||||
registered_contract_id = Column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("registered_contracts.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
)
|
||||
call_request_type_id = Column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("call_request_types.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
)
|
||||
metatx_holder_id = Column(
|
||||
UUID(as_uuid=True),
|
||||
ForeignKey("metatx_holders.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
)
|
||||
|
||||
caller = Column(VARCHAR(256), nullable=False, index=True)
|
||||
# User ID of the Moonstream user who requested this call.
|
||||
# For now, this duplicates the moonstream_user_id in the registered_contracts table. Nevertheless,
|
||||
# we keep this column here for auditing purposes. In the future, we will add a group_id column to
|
||||
# the registered_contracts table, and this column will be used to track the user from that group
|
||||
# who made each call request.
|
||||
moonstream_user_id = Column(UUID(as_uuid=True), nullable=False, index=True)
|
||||
method = Column(String, nullable=False, index=True)
|
||||
# TODO(zomglings): Should we conditional indices on parameters depending on the contract type?
|
||||
parameters = Column(JSONB, nullable=False)
|
||||
|
|
@ -231,6 +325,12 @@ class CallRequest(Base):
|
|||
nullable=False,
|
||||
)
|
||||
|
||||
registered_contract = relationship(
|
||||
"RegisteredContract", back_populates="call_requests"
|
||||
)
|
||||
call_request_type = relationship("CallRequestType", back_populates="call_requests")
|
||||
metatx_holder = relationship("MetatxHolder", back_populates="call_requests")
|
||||
|
||||
|
||||
class Leaderboard(Base): # type: ignore
|
||||
__tablename__ = "leaderboards"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue