Merge pull request #1373 from BoostryJP/web3_v6

Upgrade web3py to v6

.dockerignore

@@ -1,2 +1,3 @@
 .github/
 docs/
+.python-version

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         language_version: python3.10

app/api/routers/bc_explorer.py

@@ -24,7 +24,7 @@
 from sqlalchemy import desc
 from sqlalchemy.orm import Session
 from starlette.requests import Request
-from web3.contract import ContractFunction
+from web3.contract.contract import ContractFunction
 
 from app import config, log
 from app.contracts import Contract

app/api/routers/company_info.py

@@ -172,7 +172,7 @@ def retrieve_company(eth_address: str = Path(..., description="address")):
     """
     Endpoint: /Companies/{eth_address}
     """
-    if not Web3.isAddress(eth_address):
+    if not Web3.is_address(eth_address):
         description = "invalid eth_address"
         raise InvalidParameterError(description=description)
 
@@ -204,7 +204,7 @@ def retrieve_company_tokens(
     Endpoint: /Companies/{eth_address}/Tokens
     """
     # Validation
-    if not Web3.isAddress(eth_address):
+    if not Web3.is_address(eth_address):
         description = "invalid eth_address"
         raise InvalidParameterError(description=description)
 

app/api/routers/dex_order_list.py

@@ -675,7 +675,7 @@ def __call__(
         # path validation
         try:
             token_address = to_checksum_address(token_address)
-            if not Web3.isAddress(token_address):
+            if not Web3.is_address(token_address):
                 description = "invalid token_address"
                 raise InvalidParameterError(description=description)
         except:

app/api/routers/e2e_message.py

@@ -52,7 +52,7 @@ def retrieve_encryption_key(
     # Validation
     try:
         account_address = to_checksum_address(account_address)
-        if not Web3.isAddress(account_address):
+        if not Web3.is_address(account_address):
             raise InvalidParameterError(description="invalid account_address")
     except:
         raise InvalidParameterError(description="invalid account_address")

app/api/routers/events.py

@@ -92,7 +92,7 @@ def list_all_e2e_messaging_event_logs(
     tmp_list = []
     for attr in attr_list:
         contract_event = getattr(contract.events, attr)
-        events = contract_event.getLogs(
+        events = contract_event.get_logs(
             fromBlock=request_query.from_block,
             toBlock=request_query.to_block,
             argument_filters=argument_filters_dict,
@@ -168,7 +168,7 @@ def list_all_ibet_escrow_event_logs(request_query: IbetEscrowEventsQuery = Depen
     tmp_list = []
     for attr in attr_list:
         contract_event = getattr(contract.events, attr)
-        events = contract_event.getLogs(
+        events = contract_event.get_logs(
             fromBlock=request_query.from_block,
             toBlock=request_query.to_block,
             argument_filters=argument_filters_dict,
@@ -256,7 +256,7 @@ def list_all_ibet_security_token_escrow_event_logs(
     tmp_list = []
     for attr in attr_list:
         contract_event = getattr(contract.events, attr)
-        events = contract_event.getLogs(
+        events = contract_event.get_logs(
             fromBlock=request_query.from_block,
             toBlock=request_query.to_block,
             argument_filters=argument_filters_dict,
@@ -311,7 +311,7 @@ def list_all_ibet_security_token_interface_event_logs(
             raise InvalidParameterError("invalid argument_filters")
     try:
         token_address = to_checksum_address(token_address)
-        if not Web3.isAddress(token_address):
+        if not Web3.is_address(token_address):
             description = "invalid token_address"
             raise InvalidParameterError(description=description)
     except:
@@ -329,7 +329,7 @@ def list_all_ibet_security_token_interface_event_logs(
     tmp_list = []
     for attr in attr_list:
         contract_event = getattr(contract.events, attr)
-        events = contract_event.getLogs(
+        events = contract_event.get_logs(
             fromBlock=request_query.from_block,
             toBlock=request_query.to_block,
             argument_filters=argument_filters_dict,

app/api/routers/position.py

@@ -121,7 +121,7 @@ def __call__(
         # Validation
         try:
             account_address = to_checksum_address(account_address)
-            if not Web3.isAddress(account_address):
+            if not Web3.is_address(account_address):
                 raise InvalidParameterError(description="invalid account_address")
         except:
             raise InvalidParameterError(description="invalid account_address")
@@ -225,7 +225,7 @@ def __call__(
         # Validation
         try:
             account_address = to_checksum_address(account_address)
-            if not Web3.isAddress(account_address):
+            if not Web3.is_address(account_address):
                 raise InvalidParameterError(description="invalid account_address")
         except:
             raise InvalidParameterError(description="invalid account_address")
@@ -457,7 +457,7 @@ def get_list(
         # Validation
         try:
             account_address = to_checksum_address(account_address)
-            if not Web3.isAddress(account_address):
+            if not Web3.is_address(account_address):
                 raise InvalidParameterError(description="invalid account_address")
         except:
             raise InvalidParameterError(description="invalid account_address")
@@ -652,13 +652,13 @@ def get_one(
         # Validation
         try:
             account_address = to_checksum_address(account_address)
-            if not Web3.isAddress(account_address):
+            if not Web3.is_address(account_address):
                 raise InvalidParameterError(description="invalid account_address")
         except:
             raise InvalidParameterError(description="invalid account_address")
         try:
             token_address = to_checksum_address(token_address)
-            if not Web3.isAddress(token_address):
+            if not Web3.is_address(token_address):
                 raise InvalidParameterError(description="invalid contract_address")
         except:
             raise InvalidParameterError(description="invalid contract_address")

app/api/routers/token.py

@@ -82,7 +82,7 @@ def get_token_status(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:
@@ -152,7 +152,7 @@ def get_token_holders(
     """
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:
@@ -231,7 +231,7 @@ def get_token_holders_count(
     # Validation
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:
@@ -301,7 +301,7 @@ def create_token_holders_collection(
     # contract_addressのフォーマットチェック
     contract_address = token_address
     try:
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             raise InvalidParameterError("Invalid contract address")
     except Exception as err:
         LOG.debug(f"invalid contract address: {err}")
@@ -392,7 +392,7 @@ def get_token_holders_collection(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(contract_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:
@@ -469,7 +469,7 @@ def list_all_transfer_histories(
     # 入力値チェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:
@@ -543,7 +543,7 @@ def list_all_transfer_approval_histories(
     # Validation
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             raise InvalidParameterError("invalid contract_address")
     except:
         raise InvalidParameterError("invalid contract_address")

app/api/routers/token_bond.py

@@ -73,7 +73,7 @@ def list_all_straight_bond_tokens(
 
     for address in address_list:
         if address is not None:
-            if not Web3.isAddress(address):
+            if not Web3.is_address(address):
                 raise InvalidParameterError(f"invalid token_address: {address}")
 
     owner_address: Optional[str] = request_query.owner_address
@@ -297,7 +297,7 @@ def retrieve_straight_bond_token(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:

app/api/routers/token_coupon.py

@@ -73,7 +73,7 @@ def list_all_coupon_tokens(
 
     for address in address_list:
         if address is not None:
-            if not Web3.isAddress(address):
+            if not Web3.is_address(address):
                 raise InvalidParameterError(f"invalid token_address: {address}")
 
     owner_address: Optional[str] = request_query.owner_address
@@ -271,7 +271,7 @@ def retrieve_coupon_token(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:

app/api/routers/token_membership.py

@@ -73,7 +73,7 @@ def list_all_membership_tokens(
 
     for address in address_list:
         if address is not None:
-            if not Web3.isAddress(address):
+            if not Web3.is_address(address):
                 raise InvalidParameterError(f"invalid token_address: {address}")
 
     owner_address: Optional[str] = request_query.owner_address
@@ -269,7 +269,7 @@ def retrieve_membership_token(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:

app/api/routers/token_share.py

@@ -73,7 +73,7 @@ def list_all_share_tokens(
 
     for address in address_list:
         if address is not None:
-            if not Web3.isAddress(address):
+            if not Web3.is_address(address):
                 raise InvalidParameterError(f"invalid token_address: {address}")
 
     owner_address: Optional[str] = request_query.owner_address
@@ -295,7 +295,7 @@ def retrieve_share_token(
     # 入力アドレスフォーマットチェック
     try:
         contract_address = to_checksum_address(token_address)
-        if not Web3.isAddress(contract_address):
+        if not Web3.is_address(contract_address):
             description = "invalid contract_address"
             raise InvalidParameterError(description=description)
     except:

app/model/db/idx_token.py

@@ -19,8 +19,8 @@
 from typing import Type, Union
 
 from sqlalchemy import JSON, BigInteger, Boolean, Column, DateTime, Float, String, Text
-from app.database import engine
 
+from app.database import engine
 from app.model.db.base import Base
 
 

app/model/schema/admin.py

@@ -43,7 +43,7 @@ class RegisterAdminTokenRequest(BaseModel):
 
     @validator("contract_address")
     def contract_address_is_valid_address(cls, v):
-        if not Web3.isAddress(v):
+        if not Web3.is_address(v):
             raise ValueError("token_address is not a valid address")
         return v
 
@@ -57,7 +57,7 @@ class UpdateAdminTokenRequest(BaseModel):
     @validator("owner_address")
     def owner_address_is_valid_address(cls, v):
         if v is not None:
-            if not Web3.isAddress(v):
+            if not Web3.is_address(v):
                 raise ValueError("owner_address is not a valid address")
         return v
 

app/model/schema/bc_explorer.py

@@ -115,14 +115,14 @@ class ListTxDataQuery:
     @validator("from_address")
     def from_address_is_valid_address(cls, v):
         if v is not None:
-            if not Web3.isAddress(v):
+            if not Web3.is_address(v):
                 raise ValueError("from_address is not a valid address")
         return v
 
     @validator("to_address")
     def to_address_is_valid_address(cls, v):
         if v is not None:
-            if not Web3.isAddress(v):
+            if not Web3.is_address(v):
                 raise ValueError("to_address is not a valid address")
         return v
 

app/model/schema/dex_market.py

@@ -56,20 +56,20 @@ class ListAllOrderBookQuery:
 
     @validator("token_address")
     def token_address_is_valid_address(cls, v):
-        if not Web3.isAddress(v):
+        if not Web3.is_address(v):
             raise ValueError("token_address is not a valid address")
         return v
 
     @validator("exchange_agent_address")
     def exchange_agent_address_is_valid_address(cls, v):
-        if not Web3.isAddress(v):
+        if not Web3.is_address(v):
             raise ValueError("exchange_agent_address is not a valid address")
         return v
 
     @validator("account_address")
     def account_address_is_valid_address(cls, v):
         if v is not None:
-            if not Web3.isAddress(v):
+            if not Web3.is_address(v):
                 raise ValueError("account_address is not a valid address")
         return v
 
@@ -82,7 +82,7 @@ class ListAllLastPriceQuery:
     def address_list_is_valid_address(cls, v):
         for address in v:
             if address is not None:
-                if not Web3.isAddress(address):
+                if not Web3.is_address(address):
                     raise ValueError("address_list has not a valid address")
         return v
 
@@ -95,7 +95,7 @@ class ListAllTickQuery:
     def address_list_is_valid_address(cls, v):
         for address in v:
             if address is not None:
-                if not Web3.isAddress(address):
+                if not Web3.is_address(address):
                     raise ValueError("address_list has not a valid address")
         return v
 
@@ -108,7 +108,7 @@ class RetrieveAgreementQuery:
 
     @validator("exchange_address")
     def exchange_address_is_valid_address(cls, v):
-        if not Web3.isAddress(v):
+        if not Web3.is_address(v):
             raise ValueError("owner_address is not a valid address")
         return v
 

app/model/schema/dex_order_list.py

@@ -49,7 +49,7 @@ class ListAllOrderListQuery:
     def account_address_list_is_valid_address(cls, v):
         for address in v:
             if address is not None:
-                if not Web3.isAddress(address):
+                if not Web3.is_address(address):
                     raise ValueError("account_address_list has not a valid address")
         return v