pinned web3 to v6; alembic fixes

alembic.ini

@@ -12,7 +12,7 @@ script_location = alembic
 
 # sys.path path, will be prepended to sys.path if present.
 # defaults to the current working directory.
-prepend_sys_path = .
+prepend_sys_path = src
 
 # timezone to use when rendering the date within the migration file
 # as well as the filename.

alembic/env.py

@@ -16,8 +16,6 @@ if config.config_file_name is not None and sys.argv[0].endswith('alembic'):  # o
     fileConfig(config.config_file_name)
 
 # DEXORDER SETUP
-from sys import path
-path.append('src')
 import dexorder.database.model
 target_metadata = dexorder.database.model.Base.metadata
 

alembic/versions/86afa7b6415d_token_indexes.py

@@ -17,6 +17,7 @@ depends_on: Union[str, Sequence[str], None] = None
 
 
 def upgrade() -> None:
+    op.execute('CREATE EXTENSION IF NOT EXISTS btree_gist')
     op.create_index(op.f('ix_token_name'), 'token', ['name'], unique=False, postgresql_using='gist')
     op.create_index(op.f('ix_token_approved'), 'token', ['approved'], unique=False)
     op.create_index(op.f('ix_token_symbol'), 'token', ['symbol'], unique=False)

requirements-lock.txt

@@ -13,7 +13,7 @@ cbor2==5.6.4
 certifi==2024.2.2
 cffi==1.16.0
 charset-normalizer==3.3.2
-ckzg==2.0.1
+ckzg==1.0.2
 coincurve==20.0.0
 crcmod==1.7
 cytoolz==0.12.3
@@ -21,19 +21,19 @@ defaultlist==1.0.0
 durationpy==0.9
 ecdsa==0.19.0
 ed25519-blake2b==1.4.1
-eth-account==0.13.4
+eth-account==0.11.3
 eth-bloom==3.0.1
 eth-hash==0.7.0
 eth-keyfile==0.8.1
 eth-keys==0.5.1
-eth-rlp==2.1.0
-eth-typing==5.0.0
-eth-utils==5.0.0
+eth-rlp==1.0.1
+eth-typing==4.4.0
+eth-utils==4.1.1
 eth_abi==5.1.0
 frozenlist==1.4.1
 google-auth==2.35.0
 greenlet==3.0.3
-hexbytes==1.2.1
+hexbytes==0.3.1
 hiredis==3.0.0
 idna==3.7
 jsonschema==4.21.1
@@ -79,7 +79,7 @@ toolz==0.12.1
 types-requests==2.32.0.20240914
 typing_extensions==4.11.0
 urllib3==2.2.1
-web3==7.3.0
+web3==6.20.3
 websocket-client==1.8.0
 websockets==13.1
 yarl==1.9.4

requirements.txt

@@ -1,7 +1,7 @@
 sqlalchemy
 alembic
 omegaconf
-web3
+web3<7
 psycopg2-binary
 orjson
 sortedcontainers