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
2 changes: 0 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,9 @@
install:
uv sync --frozen --no-install-project --all-extras
uv run pre-commit install
npm install

update:
uv lock --upgrade
npm update

format:
uv run ruff format && uv run ruff check --fix --select I
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ English | <a href='./README_JA.md'>日本語</a>
- [MySQL](https://www.mysql.com/) - Version 8.0
- [GoQuorum](https://github.com/ConsenSys/quorum)
- We support the official GoQuorum node of [ibet-Network](https://github.com/BoostryJP/ibet-Network).
- We use [hardhat network](https://hardhat.org/hardhat-network/) for local development and unit testing, and we use the latest version.
- We use [Anvil](https://www.getfoundry.sh/anvil/) for local development and unit testing.

## Supported contract version

Expand Down
2 changes: 1 addition & 1 deletion README_JA.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
- [MySQL](https://www.mysql.com/) - バージョン 8.0
- [GoQuorum](https://github.com/ConsenSys/quorum)
- [ibet-Network](https://github.com/BoostryJP/ibet-Network) の公式の GoQuorum をサポートしています。
- 最新の [hardhat network](https://hardhat.org/hardhat-network/) をローカル開発およびユニットテストで利用しています。
- [Anvil](https://www.getfoundry.sh/anvil/) をローカル開発およびユニットテストで利用しています。

## コントラクトのバージョン

Expand Down
4 changes: 2 additions & 2 deletions app/api/routers/events.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from eth_typing import HexStr
from fastapi import APIRouter, Depends, Path, Query
from web3.contract.async_contract import AsyncContractEvent
from web3.exceptions import Web3ValidationError
from web3.exceptions import Web3RPCError, Web3ValidationError
from web3.types import EventData

from app import config, log
Expand Down Expand Up @@ -100,7 +100,7 @@ async def _collect_event_logs(
argument_filters=argument_filters,
)
)
except Web3ValidationError:
except (Web3ValidationError, Web3RPCError):
events = []
for event in events:
block_number = int(event["blockNumber"])
Expand Down
4 changes: 3 additions & 1 deletion app/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,10 @@

# Transaction reception wait
TRANSACTION_WAIT_TIMEOUT = int(os.environ.get("TRANSACTION_WAIT_TIMEOUT") or 5)
_default_transaction_wait_poll_latency = 0.02 if UNIT_TEST_MODE else 0.5
TRANSACTION_WAIT_POLL_LATENCY = float(
os.environ.get("TRANSACTION_WAIT_POLL_LATENCY") or 0.5
os.environ.get("TRANSACTION_WAIT_POLL_LATENCY")
or _default_transaction_wait_poll_latency
)

# Txpool length at which tx sending begins to pause
Expand Down
22 changes: 11 additions & 11 deletions batch/indexer_Token_Holders.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.ext.asyncio import AsyncSession
from web3.contract import AsyncContract as Web3AsyncContract
from web3.exceptions import ABIEventNotFound
from web3.exceptions import ABIEventNotFound, Web3RPCError
from web3.types import EventData

from app.config import TOKEN_LIST_CONTRACT_ADDRESS, ZERO_ADDRESS
Expand Down Expand Up @@ -317,7 +317,7 @@ async def __process_transfer(self, block_from: int, block_to: int):
to_block=block_to,
argument_filters={"token": self.token_contract.address},
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
holder_changed_events = []

for _event in holder_changed_events:
Expand All @@ -339,7 +339,7 @@ async def __process_transfer(self, block_from: int, block_to: int):
] = await self.token_contract.events.Transfer.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
token_transfer_events = []

for _event in token_transfer_events:
Expand Down Expand Up @@ -399,7 +399,7 @@ async def __process_issue(self, block_from: int, block_to: int):
events: list[EventData] = await self.token_contract.events.Issue.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -433,7 +433,7 @@ async def __process_redeem(self, block_from: int, block_to: int):
events: list[EventData] = await self.token_contract.events.Redeem.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -466,7 +466,7 @@ async def __process_consume(self, block_from: int, block_to: int):
events: list[EventData] = await self.token_contract.events.Consume.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand All @@ -493,7 +493,7 @@ async def __process_lock(self, block_from: int, block_to: int):
events: list[EventData] = await self.token_contract.events.Lock.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -525,7 +525,7 @@ async def __process_force_lock(self, block_from: int, block_to: int):
] = await self.token_contract.events.ForceLock.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -555,7 +555,7 @@ async def __process_unlock(self, block_from: int, block_to: int):
events: list[EventData] = await self.token_contract.events.Unlock.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -591,7 +591,7 @@ async def __process_force_unlock(self, block_from: int, block_to: int):
] = await self.token_contract.events.ForceUnlock.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down Expand Up @@ -629,7 +629,7 @@ async def __process_force_change_locked_account(
] = await self.token_contract.events.ForceChangeLockedAccount.get_logs(
from_block=block_from, to_block=block_to
)
except ABIEventNotFound:
except (ABIEventNotFound, Web3RPCError):
events = []
try:
for event in events:
Expand Down
12 changes: 6 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ services:
mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
tmpfs:
- /var/lib/mysql
hardhat-network:
anvil-network:
build:
context: .
dockerfile: tests/Dockerfile_hardhat
dockerfile: tests/Dockerfile_anvil
ports:
- "8545:8545"
ibet-wallet-api-postgres:
Expand All @@ -46,10 +46,10 @@ services:
- SHARE_TOKEN_ENABLED=1
links:
- postgres:postgres
- hardhat-network:quorum
- anvil-network:quorum
depends_on:
- postgres
- hardhat-network
- anvil-network
volumes:
- ./cov:/app/ibet-Wallet-API/cov
ibet-wallet-api-mysql:
Expand All @@ -69,9 +69,9 @@ services:
- SHARE_TOKEN_ENABLED=1
links:
- mysql:mysql
- hardhat-network:quorum
- anvil-network:quorum
depends_on:
- mysql
- hardhat-network
- anvil-network
volumes:
- ./cov:/app/ibet-Wallet-API/cov
15 changes: 0 additions & 15 deletions hardhat.config.js

This file was deleted.

Loading
Loading