Merge pull request #1 from Sangatdas/gitzenroom

Gitzenroom

Dockerfile

@@ -5,7 +5,7 @@ COPY . /usr/src/app/
 WORKDIR /usr/src/app
 RUN apt-get -qq update \
     && apt-get -y upgrade \
-    && apt-get install -y jq \
+    && apt-get install -y jq vim zsh build-essential cmake\
     && pip install . \
     && apt-get autoremove \
     && apt-get clean

Dockerfile-all-in-one

@@ -9,7 +9,7 @@ WORKDIR /usr/src/app
 
 RUN apk --update add sudo bash \
     && apk --update add python3 openssl ca-certificates git \
-    && apk --update add --virtual build-dependencies python3-dev \
+    && apk --update add --virtual build-dependencies python3-dev vim zsh build-essential cmake\
         libffi-dev openssl-dev build-base jq zsh \
     && apk add --no-cache libstdc++ dpkg gnupg \
     && pip3 install --upgrade pip cffi \

Dockerfile-alpine

@@ -5,7 +5,7 @@ COPY . /usr/src/app/
 WORKDIR /usr/src/app
 RUN apk --update add sudo \
     && apk --update add python3 py-pip openssl ca-certificates git\
-    && apk --update add --virtual build-dependencies python3-dev zsh \
+    && apk --update add --virtual build-dependencies python3-dev zsh vim zsh build-essential cmake\
         libffi-dev openssl-dev build-base \
     && apk add --no-cache libstdc++ \
     && pip3 install --upgrade pip cffi \

Dockerfile-dev

@@ -3,7 +3,7 @@ FROM python:${python_version}
 LABEL maintainer "contact@ipdb.global"
 
 RUN apt-get update \
-    && apt-get install -y git zsh\
+    && apt-get install -y git zsh vim build-essential cmake\
     && pip install -U pip \
     && apt-get autoremove \
     && apt-get clean

acceptance/python/Dockerfile

@@ -1,11 +1,61 @@
 FROM python:3.9
 
-RUN apt-get update && apt-get install -y vim zsh
+RUN apt-get update \
+    && pip install -U pip \
+    && apt-get autoremove \
+    && apt-get clean
+RUN apt-get install -y vim zsh build-essential cmake	
+
 RUN mkdir -p /src
 RUN pip install --upgrade \
 	pycco \
 	websocket-client~=0.47.0 \
 	pytest~=3.0 \
-	planetmint-driver>=0.9.0 \
+	git+https://github.com/planetmint/cryptoconditions.git@gitzenroom  \
-	blns \
+	git+https://github.com/planetmint/planetmint-driver.git@gitzenroom \
-	planetmint-cryptoconditions>=0.9.0
+	#planetmint-cryptoconditions>=0.9.0\
+	#planetmint-driver>=0.9.0 \
+	blns
+	
+	
+
+
+#FROM python:3.9
+#
+#RUN apt-get update && apt-get install -y vim zsh
+#RUN apt-get update \
+#    && apt-get install -y git zsh\
+#    && pip install -U pip \
+#    && apt-get autoremove \
+#    && apt-get clean	
+#RUN apt install sudo
+#RUN apt-get install -y python3 openssl ca-certificates git python3-dev
+#RUN apt-get install zsh gcc
+#RUN apt-get install libffi-dev  
+#RUN apt-get install build-essential cmake -y
+#
+#
+#RUN mkdir -p /src
+#RUN pip install --upgrade \
+#	pycco \
+#	websocket-client~=0.47.0 \
+#	pytest~=3.0 \
+#	planetmint-driver>=0.9.0 \
+#	blns \
+#	git+https://github.com/planetmint/cryptoconditions.git@gitzenroom >=0.9.0 \
+#	chardet==3.0.4 \
+#    aiohttp==3.7.4 \
+#    abci==0.8.3 \
+#    #planetmint-cryptoconditions>=0.9.0\
+#    flask-cors==3.0.10 \
+#    flask-restful==0.3.9 \
+#    flask==2.0.1 \
+#    gunicorn==20.1.0 \
+#    jsonschema==3.2.0 \
+#    logstats==0.3.0 \
+#    packaging>=20.9 \
+#    pymongo==3.11.4 \
+#    pyyaml==5.4.1 \
+#    requests==2.25.1 \
+#    setproctitle==1.2.2
+#

acceptance/python/src/conftest.py

@@ -0,0 +1,89 @@
+# Copyright © 2020 Interplanetary Database Association e.V.,
+# Planetmint and IPDB software contributors.
+# SPDX-License-Identifier: (Apache-2.0 AND CC-BY-4.0)
+# Code is Apache-2.0 and docs are CC-BY-4.0
+
+import pytest
+
+GENERATE_KEYPAIR = \
+    """Rule input encoding base58
+    Rule output encoding base58
+    Scenario 'ecdh': Create the keypair
+    Given that I am known as 'Pippo'
+    When I create the ecdh key
+    When I create the testnet key
+    Then print data"""
+
+# secret key to public key
+SK_TO_PK = \
+    """Rule input encoding base58
+    Rule output encoding base58
+    Scenario 'ecdh': Create the keypair
+    Given that I am known as '{}'
+    Given I have the 'keys'
+    When I create the ecdh public key
+    When I create the testnet address
+    Then print my 'ecdh public key'
+    Then print my 'testnet address'"""
+
+FULFILL_SCRIPT = \
+    """Rule input encoding base58
+    Rule output encoding base58
+    Scenario 'ecdh': Bob verifies the signature from Alice
+    Given I have a 'ecdh public key' from 'Alice'
+    Given that I have a 'string dictionary' named 'houses' inside 'asset'
+    Given I have a 'signature' named 'data.signature' inside 'result'
+    When I verify the 'houses' has a signature in 'data.signature' by 'Alice'
+    Then print the string 'ok'"""
+
+HOUSE_ASSETS = {
+    "data": {
+        "houses": [
+            {
+                "name": "Harry",
+                "team": "Gryffindor",
+            },
+            {
+                "name": "Draco",
+                "team": "Slytherin",
+            }
+        ],
+    }
+}
+
+ZENROOM_DATA = {
+    'also': 'more data'
+}
+
+CONDITION_SCRIPT = """Rule input encoding base58
+    Rule output encoding base58
+    Scenario 'ecdh': create the signature of an object
+    Given I have the 'keys'
+    Given that I have a 'string dictionary' named 'houses' inside 'asset'
+    When I create the signature of 'houses'
+    When I rename the 'signature' to 'data.signature'
+    Then print the 'data.signature'"""
+
+@pytest.fixture
+def gen_key_zencode():
+    return GENERATE_KEYPAIR
+
+@pytest.fixture
+def secret_key_to_private_key_zencode():
+    return SK_TO_PK
+
+@pytest.fixture
+def fulfill_script_zencode():
+    return FULFILL_SCRIPT
+
+@pytest.fixture
+def condition_script_zencode():
+    return CONDITION_SCRIPT
+
+@pytest.fixture
+def zenroom_house_assets():
+    return HOUSE_ASSETS
+
+@pytest.fixture
+def zenroom_data():
+    return ZENROOM_DATA

acceptance/python/src/test_zenroom.py

@@ -14,194 +14,72 @@ import hashlib
 from cryptoconditions import ZenroomSha256
 from json.decoder import JSONDecodeError
 
-# from zenroom import zencode_exec
+def test_zenroom(gen_key_zencode, secret_key_to_private_key_zencode, fulfill_script_zencode, 
+condition_script_zencode, zenroom_data, zenroom_house_assets):
+    alice = json.loads(ZenroomSha256.run_zenroom(gen_key_zencode).output)['keys']
+    bob = json.loads(ZenroomSha256.run_zenroom(gen_key_zencode).output)['keys']
 
-# from bigchaindb_driver import BigchainDB
+    zen_public_keys = json.loads(ZenroomSha256.run_zenroom(secret_key_to_private_key_zencode.format('Alice'),
-# # bdb_root_url = 'https://ipdb3.riddleandcode.com'
+                                                keys={'keys': alice}).output)
-# bdb_root_url = 'http://localhost:9984/'
+    zen_public_keys.update(json.loads(ZenroomSha256.run_zenroom(secret_key_to_private_key_zencode.format('Bob'),
-# bdb = BigchainDB(bdb_root_url)
+                                                keys={'keys': bob}).output))
 
-# The procedure to generate the keyring cannot be
+    # CRYPTO-CONDITIONS: instantiate an Ed25519 crypto-condition for buyer
-# fixed in the code base, it depends on the particular
+    zenSha = ZenroomSha256(script=fulfill_script_zencode, keys=zen_public_keys, data=zenroom_data)
-# smart contract
-GENERATE_KEYPAIR = \
-    """Rule input encoding base58
-    Rule output encoding base58
-    Scenario 'ecdh': Create the keypair
-    Given that I am known as 'Pippo'
-    When I create the ecdh key
-    When I create the testnet key
-    Then print data"""
 
-def genkey():
+    # CRYPTO-CONDITIONS: generate the condition uri
-    return json.loads(ZenroomSha256.run_zenroom(GENERATE_KEYPAIR).output)['keys']
+    condition_uri = zenSha.condition.serialize_uri()
 
-# There is not a unique way of generating the public
+    # CRYPTO-CONDITIONS: construct an unsigned fulfillment dictionary
-# key, for example, for the testnet I don't want the
+    unsigned_fulfillment_dict = {
-# public key but the address (but there could exist
+        'type': zenSha.TYPE_NAME,
-# a script in which the user want the public key and
+        'script': fulfill_script_zencode,
-# not the address)
+        'keys': zen_public_keys,
-# Thus we cannot fix it inside the script
-
-# secret key to public key
-SK_TO_PK = \
-    """Rule input encoding base58
-    Rule output encoding base58
-    Scenario 'ecdh': Create the keypair
-    Given that I am known as '{}'
-    Given I have the 'keys'
-    When I create the ecdh public key
-    When I create the testnet address
-    Then print my 'ecdh public key'
-    Then print my 'testnet address'"""
-
-def sk2pk(name, keys):
-    return json.loads(ZenroomSha256.run_zenroom(SK_TO_PK.format(name),
-                                                keys={'keys': keys}).output)
-# Alice assert the composition of the houses
-
-# zen_public_keys is an identity dictionary
-
-alice, bob = genkey(), genkey()
-print("============== ALICE KEYPAIR =================")
-print(alice)
-print("============== BOB KEYPAIR =================")
-print(bob)
-
-asset = {
-    "data": {
-        "houses": [
-            {
-                "name": "Harry",
-                "team": "Gryffindor",
-            },
-            {
-                "name": "Draco",
-                "team": "Slytherin",
-            }
-        ],
     }
-}
-zen_public_keys = sk2pk('Alice', alice)
-zen_public_keys.update(sk2pk('Bob', bob))
 
-data = {
+    output = {
-    'also': 'more data'
+        'amount': '1000',
-}
+        'condition': {
-print("============== PUBLIC IDENTITIES =================")
+            'details': unsigned_fulfillment_dict,
-print(zen_public_keys)
+            'uri': condition_uri,
-
+        },
-metadata = {
+        'data': zenroom_data,
-}
+        'script': fulfill_script_zencode,
-
+        'conf': '',
-version = '2.0'
+        'public_keys': (zen_public_keys['Alice']['ecdh_public_key'], ),
-
+    }
-fulfill_script = """Rule input encoding base58
-Rule output encoding base58
-Scenario 'ecdh': Bob verifies the signature from Alice
-Given I have a 'ecdh public key' from 'Alice'
-Given that I have a 'string dictionary' named 'houses' inside 'asset'
-Given I have a 'signature' named 'data.signature' inside 'result'
-When I verify the 'houses' has a signature in 'data.signature' by 'Alice'
-Then print the string 'ok'
-"""
-# CRYPTO-CONDITIONS: instantiate an Ed25519 crypto-condition for buyer
-zenSha = ZenroomSha256(script=fulfill_script, keys=zen_public_keys, data=data)
-
-# CRYPTO-CONDITIONS: generate the condition uri
-condition_uri = zenSha.condition.serialize_uri()
-# CRYPTO-CONDITIONS: construct an unsigned fulfillment dictionary
-unsigned_fulfillment_dict = {
-    'type': zenSha.TYPE_NAME,
-    'script': fulfill_script,
-    'keys': zen_public_keys,
-}
-
-output = {
-    'amount': '1000',
-    'condition': {
-        'details': unsigned_fulfillment_dict,
-        'uri': condition_uri,
-    },
-    'data': data,
-    'script': fulfill_script,
-    'conf': '',
-    'public_keys': (zen_public_keys['Alice']['ecdh_public_key'], ),
-}
 
 
-input_ = {
+    input_ = {
-    'fulfillment': None,
+        'fulfillment': None,
-    'fulfills': None,
+        'fulfills': None,
-    'owners_before': (zen_public_keys['Alice']['ecdh_public_key'], ),
+        'owners_before': (zen_public_keys['Alice']['ecdh_public_key'], ),
-}
+    }
 
-token_creation_tx = {
+    token_creation_tx = {
-    'operation': 'CREATE',
+        'operation': 'CREATE',
-    'asset': asset,
+        'asset': zenroom_house_assets,
-    'metadata': None,
+        'metadata': None,
-    'outputs': (output,),
+        'outputs': (output,),
-    'inputs': (input_,),
+        'inputs': (input_,),
-    'version': version,
+        'version': '2.0',
-    'id': None,
+        'id': None,
-}
+    }
 
-# JSON: serialize the transaction-without-id to a json formatted string
+    # JSON: serialize the transaction-without-id to a json formatted string
-message = json.dumps(
+    message = json.dumps(
-    token_creation_tx,
+        token_creation_tx,
-    sort_keys=True,
+        sort_keys=True,
-    separators=(',', ':'),
+        separators=(',', ':'),
-    ensure_ascii=False,
+        ensure_ascii=False,
-)
+    )
 
-print("====== GENERATE RESULT (METADATA) =======")
+    try:
-condition_script = """Rule input encoding base58
+        assert(not zenSha.validate(message=message))
-    Rule output encoding base58
+    except JSONDecodeError:
-    Scenario 'ecdh': create the signature of an object
+        pass
-    Given I have the 'keys'
+    except ValueError:
-    Given that I have a 'string dictionary' named 'houses' inside 'asset'
+        pass
-    When I create the signature of 'houses'
-    When I rename the 'signature' to 'data.signature'
-    Then print the 'data.signature'
-    """
 
-# THIS FILLS THE METADATA WITH THE RESULT
+    message = zenSha.sign(message, condition_script_zencode, alice)
-try:
+    assert(zenSha.validate(message=message))
-    assert(not zenSha.validate(message=message))
-except JSONDecodeError:
-    pass
-except ValueError:
-    pass
-
-message = zenSha.sign(message, condition_script, alice)
-assert(zenSha.validate(message=message))
-# now metadata looks like
-# 'metadata': {'result': {'data.signature': {'r': 'fdoan0GYo9RGP8y0fq+PKZ9Q1V8+VqJtBkSMB1tUnGQ=', 's': 'RnJCEepYJcVgFG/Y6cRc/2DWPaz5Pe5NpdRWegrZk5A='}}}
-
-# CRYPTO-CONDITIONS: generate the fulfillment uri
-fulfillment_uri = zenSha.serialize_uri()
-
-# add the fulfillment uri (signature)
-token_creation_tx['inputs'][0]['fulfillment'] = fulfillment_uri
-print(token_creation_tx)
-
-# JSON: serialize the id-less transaction to a json formatted string
-json_str_tx = json.dumps(
-    token_creation_tx,
-    sort_keys=True,
-    separators=(',', ':'),
-    ensure_ascii=False,
-)
-
-
-# SHA3: hash the serialized id-less transaction to generate the id
-shared_creation_txid = hashlib.sha3_256(json_str_tx.encode()).hexdigest()
-
-# add the id
-token_creation_tx['id'] = shared_creation_txid
-
-# exit()
-# send CREATE tx into the bdb network
-# returned_creation_tx = bdb.transactions.send_async(token_creation_tx)
-
-# print(returned_creation_tx)

docs/root/source/contributing/index.rst

@@ -11,7 +11,7 @@ There are many ways you can contribute to Planetmint.
 It includes several sub-projects.
 
 - `Planetmint Server <https://github.com/planetmint/planetmint>`_
-- `Planetmint Python Driver <https://github.com/planetmint/planetmint-driver>`_
+- `Planetmint Python Driver <https://github.com/planetmint/planetmint-driver-python>`_
 - `Planetmint JavaScript Driver <https://github.com/planetmint/js-bigchaindb-driver>`_
 - `Planetmint Java Driver <https://github.com/planetmint/java-bigchaindb-driver>`_
 - `cryptoconditions <https://github.com/planetmint/cryptoconditions>`_ (a Python package by us)

docs/root/source/contributing/ways-to-contribute/write-docs.md

@@ -19,7 +19,7 @@ If you're writing code, you should also update any related docs. However, you mi
 You can certainly do that!
 
 - The docs for Planetmint Server live under ``planetmint/docs/`` in the ``planetmint/planetmint`` repo.
-- There are docs for the Python driver under ``planetmint-driver/docs/`` in the ``planetmint/planetmint-driver`` repo.
+- There are docs for the Python driver under ``planetmint-driver/docs/`` in the ``planetmint/planetmint-driver-python`` repo.
 - There are docs for the JavaScript driver under ``planetmint/js-bigchaindb-driver`` in the ``planetmint/js-bigchaindb-driver`` repo.
 - The source code for the Planetmint website is in a private repo, but we can give you access if you ask.
 

setup.py

@@ -76,7 +76,8 @@ install_requires = [
     'chardet==3.0.4',
     'aiohttp==3.7.4',
     'abci==0.8.3',
-    'planetmint-cryptoconditions>=0.9.0',
+    #'planetmint-cryptoconditions>=0.9.0',
+    'planetmint-cryptoconditions @ git+https://github.com/planetmint/cryptoconditions.git@gitzenroom',
     'flask-cors==3.0.10',
     'flask-restful==0.3.9',
     'flask==2.0.1',