diff --git a/apps/cic-eth/cic_eth/eth/util.py b/apps/cic-eth/cic_eth/eth/util.py index 4bd2dea6..d90c3221 100644 --- a/apps/cic-eth/cic_eth/eth/util.py +++ b/apps/cic-eth/cic_eth/eth/util.py @@ -35,6 +35,10 @@ def unpack_signed_raw_tx(tx_raw_bytes, chain_id): if chain_id != 0: v = int.from_bytes(d[6], 'big') vb = v - (chain_id * 2) - 35 + while len(d[7]) < 32: + d[7] = b'\x00' + d[7] + while len(d[8]) < 32: + d[8] = b'\x00' + d[8] s = b''.join([d[7], d[8], bytes([vb])]) so = KeyAPI.Signature(signature_bytes=s) diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 88dfea8c..14f3b0ba 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -41,3 +41,8 @@ COPY cic-eth/tests/ tests/ COPY cic-eth/config/ /usr/local/etc/cic-eth/ COPY cic-eth/cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY cic-eth/crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ + +RUN apt-get install -y git && \ + git clone https://gitlab.com/grassrootseconomics/cic-contracts.git && \ + mkdir -p /usr/local/share/cic/solidity && \ + cp -R cic-contracts/abis /usr/local/share/cic/solidity/abi diff --git a/docker-compose.yml b/docker-compose.yml index 20d3d32e..7004b13f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -354,6 +354,7 @@ services: CELERY_BROKER_URL: ${CELERY_BROKER_URL:-redis://redis} CELERY_RESULT_URL: ${CELERY_RESULT_URL:-redis://redis} TASKS_TRANSFER_CALLBACKS: $TASKS_TRANSFER_CALLBACKS + CIC_TX_RETRY_DELAY: 15 depends_on: - eth - postgres