Bump cic-eth, cic-ussd versions

This commit is contained in:
nolash 2021-04-04 19:34:13 +02:00
parent 6210fe05ef
commit b1e228b8e3
Signed by untrusted user who does not match committer: lash
GPG Key ID: 21D2E7BB88C2A746
15 changed files with 22 additions and 22 deletions

View File

@ -32,7 +32,7 @@ class ERC20TransferFilter(SyncFilter):
logg.debug('filter {} {}'.format(block, tx)) logg.debug('filter {} {}'.format(block, tx))
token = None token = None
try: try:
token = ERC20Token(conn, tx.inputs[0]) token = ERC20Token(self.chain_spec, conn, tx.inputs[0])
except NotAContractError: except NotAContractError:
logg.debug('not a contract {}'.format(tx.inputs[0])) logg.debug('not a contract {}'.format(tx.inputs[0]))
return False return False

View File

@ -17,7 +17,7 @@ RUN apt-get update && \
# Copy shared requirements from top of mono-repo # Copy shared requirements from top of mono-repo
RUN echo "copying root req file ${root_requirement_file}" RUN echo "copying root req file ${root_requirement_file}"
RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a53 RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a58
COPY cic-cache/requirements.txt ./ COPY cic-cache/requirements.txt ./
COPY cic-cache/setup.cfg \ COPY cic-cache/setup.cfg \

View File

@ -1,13 +1,13 @@
cic-base~=0.1.2a53 cic-base~=0.1.2a58
alembic==1.4.2 alembic==1.4.2
confini~=0.3.6rc3 confini~=0.3.6rc3
uwsgi==2.0.19.1 uwsgi==2.0.19.1
moolb~=0.1.0 moolb~=0.1.0
cic-eth-registry~=0.5.4a9 cic-eth-registry~=0.5.4a10
SQLAlchemy==1.3.20 SQLAlchemy==1.3.20
semver==2.13.0 semver==2.13.0
psycopg2==2.8.6 psycopg2==2.8.6
celery==4.4.7 celery==4.4.7
redis==3.5.3 redis==3.5.3
chainlib~=0.0.1a44 chainlib~=0.0.2a2
chainsyncer~=0.0.1a20 chainsyncer~=0.0.1a21

View File

@ -528,7 +528,7 @@ class AdminApi:
r = self.rpc.do(o) r = self.rpc.do(o)
tx['recipient_gas_balance'] = r tx['recipient_gas_balance'] = r
tx_unpacked = unpack(bytes.fromhex(tx['signed_tx'][2:]), chain_spec.chain_id()) tx_unpacked = unpack(bytes.fromhex(strip_0x(tx['signed_tx'])), chain_spec)
tx['gas_price'] = tx_unpacked['gasPrice'] tx['gas_price'] = tx_unpacked['gasPrice']
tx['gas_limit'] = tx_unpacked['gas'] tx['gas_limit'] = tx_unpacked['gas']
tx['data'] = tx_unpacked['data'] tx['data'] = tx_unpacked['data']

View File

@ -10,7 +10,7 @@ version = (
0, 0,
11, 11,
0, 0,
'alpha.3', 'alpha.4',
) )
version_object = semver.VersionInfo( version_object = semver.VersionInfo(

View File

@ -29,7 +29,7 @@ RUN /usr/local/bin/python -m pip install --upgrade pip
# python merge_requirements.py | tee merged_requirements.txt # python merge_requirements.py | tee merged_requirements.txt
#RUN cd cic-base && \ #RUN cd cic-base && \
# pip install $pip_extra_index_url_flag -r ./merged_requirements.txt # pip install $pip_extra_index_url_flag -r ./merged_requirements.txt
RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a57 RUN pip install $pip_extra_index_url_flag cic-base[full_graph]==0.1.2a58
COPY cic-eth/scripts/ scripts/ COPY cic-eth/scripts/ scripts/
COPY cic-eth/setup.cfg cic-eth/setup.py ./ COPY cic-eth/setup.cfg cic-eth/setup.py ./

View File

@ -1,4 +1,4 @@
cic-base~=0.1.2a57 cic-base~=0.1.2a58
celery==4.4.7 celery==4.4.7
crypto-dev-signer~=0.4.14a17 crypto-dev-signer~=0.4.14a17
confini~=0.3.6rc3 confini~=0.3.6rc3
@ -16,7 +16,7 @@ semver==2.13.0
websocket-client==0.57.0 websocket-client==0.57.0
moolb~=0.1.1b2 moolb~=0.1.1b2
eth-address-index~=0.1.1a7 eth-address-index~=0.1.1a7
chainlib~=0.0.2a1 chainlib~=0.0.2a2
hexathon~=0.0.1a7 hexathon~=0.0.1a7
chainsyncer~=0.0.1a21 chainsyncer~=0.0.1a21
chainqueue~=0.0.1a3 chainqueue~=0.0.1a3

View File

@ -1,7 +1,7 @@
# standard imports # standard imports
import semver import semver
version = (0, 3, 0, 'alpha.7') version = (0, 3, 0, 'alpha.8')
version_object = semver.VersionInfo( version_object = semver.VersionInfo(
major=version[0], major=version[0],

View File

@ -1,4 +1,4 @@
cic_base[full_graph]~=0.1.2a46 cic_base[full_graph]~=0.1.2a58
cic-eth~=0.10.1b1 cic-eth~=0.11.0a4
cic-notify~=0.4.0a3 cic-notify~=0.4.0a3
cic-types~=0.1.0a8 cic-types~=0.1.0a10

View File

@ -57,8 +57,8 @@ WORKDIR /home/grassroots
USER grassroots USER grassroots
ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433 ARG pip_extra_index_url=https://pip.grassrootseconomics.net:8433
ARG cic_base_version=0.1.2a57 ARG cic_base_version=0.1.2a58
ARG cic_eth_version=0.11.0a3 ARG cic_eth_version=0.11.0a4
ARG sarafu_faucet_version=0.0.2a16 ARG sarafu_faucet_version=0.0.2a16
ARG cic_contracts_version=0.0.2a2 ARG cic_contracts_version=0.0.2a2
RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \ RUN pip install --user --extra-index-url $pip_extra_index_url cic-base[full_graph]==$cic_base_version \

View File

@ -96,7 +96,6 @@ def genId(addr, typ):
def genDate(): def genDate():
logg.info(ts_then)
ts = random.randint(ts_then, ts_now) ts = random.randint(ts_then, ts_now)
return datetime.datetime.fromtimestamp(ts).timestamp() return datetime.datetime.fromtimestamp(ts).timestamp()

View File

@ -117,7 +117,7 @@ class Handler:
self.user_dir = user_dir self.user_dir = user_dir
self.balances = balances self.balances = balances
self.chain_spec = chain_spec self.chain_spec = chain_spec
self.tx_factory = ERC20(signer, gas_oracle, nonce_oracle, chain_spec.network_id()) self.tx_factory = ERC20(chain_spec, signer, gas_oracle, nonce_oracle)
def name(self): def name(self):

View File

@ -36,7 +36,7 @@ argparser.add_argument('--redis-port', dest='redis_port', type=int, help='redis
argparser.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use for task submission and callback') argparser.add_argument('--redis-db', dest='redis_db', type=int, help='redis db to use for task submission and callback')
argparser.add_argument('--redis-host-callback', dest='redis_host_callback', default='localhost', type=str, help='redis host to use for callback') argparser.add_argument('--redis-host-callback', dest='redis_host_callback', default='localhost', type=str, help='redis host to use for callback')
argparser.add_argument('--redis-port-callback', dest='redis_port_callback', default=6379, type=int, help='redis port to use for callback') argparser.add_argument('--redis-port-callback', dest='redis_port_callback', default=6379, type=int, help='redis port to use for callback')
argparser.add_argument('--batch-size', dest='batch_size', default=80, type=int, help='burst size of sending transactions to node') argparser.add_argument('--batch-size', dest='batch_size', default=100, type=int, help='burst size of sending transactions to node') # batch size should be slightly below cumulative gas limit worth, eg 80000 gas txs with 8000000 limit is a bit less than 100 batch size
argparser.add_argument('--batch-delay', dest='batch_delay', default=2, type=int, help='seconds delay between batches') argparser.add_argument('--batch-delay', dest='batch_delay', default=2, type=int, help='seconds delay between batches')
argparser.add_argument('--timeout', default=60.0, type=float, help='Callback timeout') argparser.add_argument('--timeout', default=60.0, type=float, help='Callback timeout')
argparser.add_argument('-q', type=str, default='cic-eth', help='Task queue') argparser.add_argument('-q', type=str, default='cic-eth', help='Task queue')

View File

@ -1,5 +1,5 @@
cic-base[full_graph]==0.1.2a57 cic-base[full_graph]==0.1.2a58
sarafu-faucet==0.0.2a16 sarafu-faucet==0.0.2a16
cic-eth==0.11.0a3 cic-eth==0.11.0a4
cic-types==0.1.0a10 cic-types==0.1.0a10
crypto-dev-signer==0.4.14a17 crypto-dev-signer==0.4.14a17

View File

@ -256,6 +256,7 @@ class Verifier:
def verify_gas(self, address, balance_token=None): def verify_gas(self, address, balance_token=None):
o = balance(address) o = balance(address)
r = self.conn.do(o) r = self.conn.do(o)
logg.debug('wtf {}'.format(r))
actual_balance = int(strip_0x(r), 16) actual_balance = int(strip_0x(r), 16)
if actual_balance == 0: if actual_balance == 0:
raise VerifierError((address, actual_balance), 'gas') raise VerifierError((address, actual_balance), 'gas')