Merge branch 'v3' of https://github.com/blockchain-certificates/cert-…

…issuer into v3

Dockerfile

@@ -12,6 +12,8 @@ RUN apk add --update \
         gmp-dev \
         libffi-dev \
         libressl-dev \
+        libxml2-dev \
+        libxslt-dev \
         linux-headers \
         make \
         musl-dev \
@@ -21,16 +23,19 @@ RUN apk add --update \
         tar \
     && python3 -m ensurepip \
     && pip3 install --upgrade pip setuptools \
+    && pip3 install Cython \
+    && pip3 install wheel \
     && mkdir -p /etc/cert-issuer/data/unsigned_certificates \
     && mkdir /etc/cert-issuer/data/blockchain_certificates \
     && mkdir ~/.bitcoin \
     && echo $'rpcuser=foo\nrpcpassword=bar\nrpcport=8332\nregtest=1\nrelaypriority=0\nrpcallowip=127.0.0.1\nrpcconnect=127.0.0.1\n' > /root/.bitcoin/bitcoin.conf \
     && pip3 install /cert-issuer/. \
+    && pip3 install -r /cert-issuer/ethereum_requirements.txt \
     && rm -r /usr/lib/python*/ensurepip \
     && rm -rf /var/cache/apk/* \
-    && rm -rf /root/.cache \
-    && sed -i.bak s/==1\.0b1/\>=1\.0\.2/g /usr/lib/python3.*/site-packages/merkletools-1.0.2-py3.*.egg-info/requires.txt
+    && rm -rf /root/.cache
 
 
 ENTRYPOINT bitcoind -daemon && bash
 
+

cert_issuer/blockchain_handlers/ethereum/connectors.py

@@ -235,7 +235,7 @@ def broadcast_tx(self, tx):
             "params": ["0x" + tx],
             "id": 1
         }
-        response = requests.post(self.base_url, json=data)
+        response = requests.post(self.base_url, json=data, headers={'user-agent':'cert-issuer'})
         if 'error' in response.json():
             logging.error("MyEtherWallet returned an error: %s", response.json()['error'])
             raise BroadcastError(response.json()['error'])
@@ -257,7 +257,7 @@ def get_balance(self, address):
             "params": [address, "latest"],
             "id": 1
         }
-        response = requests.post(self.base_url, json=data)
+        response = requests.post(self.base_url, json=data, headers={'user-agent':'cert-issuer'})
         if int(response.status_code) == 200:
             logging.info('Balance check response: %s', response.json())
             balance = int(response.json().get('result', None), 0)
@@ -278,7 +278,7 @@ def get_address_nonce(self, address):
             "params": [address, "pending"],
             "id": 1
         }
-        response = requests.post(self.base_url, json=data)
+        response = requests.post(self.base_url, json=data, headers={'user-agent':'cert-issuer'})
         if int(response.status_code) == 200:
             # the int(res, 0) transforms the hex nonce to int
             nonce = int(response.json().get('result', None), 0)

cert_issuer/merkle_tree_generator.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 
 from cert_core import Chain
-from chainpoint.chainpoint import MerkleTools
+from merkletools import MerkleTools
 from pycoin.serialize import h2b
 from lds_merkle_proof_2019.merkle_proof_2019 import MerkleProof2019
 from cert_issuer import helpers

ethereum_requirements.txt

@@ -1,4 +1,5 @@
-web3==5.11.0
+web3<=4.4.1
 coincurve==7.1.0
 ethereum==2.3.1
 rlp<1
+eth-account<=0.3.0