Merge pull request #35 from codenotary/feat/proofV1.2

Feat/proof v1.2

Author: mabmayer

.github/workflows/ci.yml

@@ -21,7 +21,8 @@ jobs:
           make dev
       - name: Start immudb container
         run: |
-          docker run -d --health-cmd "immuadmin status" --health-interval 10s --health-timeout 5s --health-retries 5 -v ${{ github.workspace }}/tests/certs/my.key.pem:/key.pem -p 3322:3322 codenotary/immudb:latest --signingKey=/key.pem
+          docker run -d --health-cmd "immuadmin status" --health-interval 10s --health-timeout 5s --health-retries 5 -v ${{ github.workspace }}/tests/certs/my.key.pem:/key.pem -p 3322:3322 codenotary/immudb:1.2.2 --signingKey=/key.pem
+          docker run -d --health-cmd "immuadmin status" --health-interval 10s --health-timeout 5s --health-retries 5 -v ${{ github.workspace }}/tests/certs/my.key.pem:/key.pem -p 3333:3322 codenotary/immudb:1.1.0 --signingKey=/key.pem
       - name: Run tests
         run: |
           make test

Makefile

@@ -1,6 +1,6 @@
 SHELL := /bin/bash
 
-
+PYTHON ?= python3
 PYTEST ?= python3 -m pytest
 PIP ?= pip3
 COVERAGE ?= $(shell which coverage)
@@ -28,10 +28,10 @@ coverage:
 	$(COVERAGE) run -m pytest tests
 
 install:
-	python setup.py install
+	$(PYTHON) setup.py install
 
 .PHONY: dist
 dist:
 	mkdir -p ./dist
 	rm -fr ./dist/* ./build/*
-	python setup.py sdist bdist_wheel
+	$(PYTHON) setup.py sdist bdist_wheel

devtest.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from immudb.client import ImmudbClient
 
 a = ImmudbClient()

immudb/client.py

@@ -15,10 +15,10 @@
 
 from immudb import header_manipulator_client_interceptor
 from immudb.handler import (batchGet, batchSet, changePassword, changePermission, createUser,
-                            currentRoot, databaseCreate, databaseList, databaseUse,
+                            currentRoot, createDatabase, databaseList, useDatabase,
                             get, listUsers, sqldescribe, verifiedGet, verifiedSet, setValue, history,
                             scan, reference, verifiedreference, zadd, verifiedzadd,
-                            zscan, healthcheck, txbyid, verifiedtxbyid, sqlexec, sqlquery,
+                            zscan, healthcheck, health, txbyid, verifiedtxbyid, sqlexec, sqlquery,
                             listtables, execAll)
 from immudb.rootService import *
 from immudb.grpc import schema_pb2_grpc
@@ -101,6 +101,9 @@ def stub(self):
     def healthCheck(self):
         return healthcheck.call(self.__stub, self.__rs)
 
+    def health(self):
+        return health.call(self.__stub, self.__rs)
+
     def get(self, key: bytes):
         return get.call(self.__stub, self.__rs, key)
 
@@ -175,16 +178,30 @@ def databaseList(self):
         return [x.databaseName for x in dbs.dblist.databases]
 
     def databaseUse(self, dbName: bytes):
+        warnings.warn("Call to deprecated databaseUse. Use useDatabase instead",
+                      category=DeprecationWarning,
+                      stacklevel=2
+                      )
+        return self.useDatabase(dbName)
+
+    def useDatabase(self, dbName: bytes):
         request = schema_pb2_grpc.schema__pb2.Database(databaseName=dbName)
-        resp = databaseUse.call(self.__stub, self.__rs, request)
+        resp = useDatabase.call(self.__stub, self.__rs, request)
         # modify header token accordingly
         self.__stub = self.set_token_header_interceptor(resp)
         self.__rs.init(dbName, self.__stub)
         return resp
 
-    def databaseCreate(self, dbName: bytes):
+    def createDatabase(self, dbName: bytes):
         request = schema_pb2_grpc.schema__pb2.Database(databaseName=dbName)
-        return databaseCreate.call(self.__stub, self.__rs, request)
+        return createDatabase.call(self.__stub, self.__rs, request)
+
+    def databaseCreate(self, dbName: bytes):
+        warnings.warn("Call to deprecated databaseCreate. Use createDatabase instead",
+                      category=DeprecationWarning,
+                      stacklevel=2
+                      )
+        return self.createDatabase(dbName)
 
     def currentState(self):
         return currentRoot.call(self.__stub, self.__rs, None)

immudb/constants.py

@@ -1,4 +1,4 @@
-# Copyright 2021 CodeNotary, Inc. All rights reserved.
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

immudb/database/__init__.py

@@ -0,0 +1,13 @@
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from immudb.database.meta import *

immudb/database/meta.py

@@ -0,0 +1,64 @@
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from immudb.constants import *
+import immudb.embedded.store as store
+import struct
+
+
+def WrapWithPrefix(b: bytes, prefix: bytes) -> bytes:
+    return prefix+b
+
+
+def EncodeKey(key: bytes):
+    return WrapWithPrefix(key, SET_KEY_PREFIX)
+
+
+def EncodeEntrySpec(key: bytes, md: store.KVMetadata, value: bytes):
+    es = store.EntrySpec(
+        key=WrapWithPrefix(key, SET_KEY_PREFIX),
+        md=md,
+        value=WrapWithPrefix(value, PLAIN_VALUE_PREFIX)
+    )
+    return es
+
+
+def EncodeReference(key: bytes, md: store.KVMetadata, referencedKey: bytes, atTx: int):
+    es = store.EntrySpec(key=WrapWithPrefix(key, SET_KEY_PREFIX),
+                         md=md,
+                         value=WrapReferenceValueAt(
+        WrapWithPrefix(referencedKey, SET_KEY_PREFIX), atTx)
+    )
+    return es
+
+
+def WrapReferenceValueAt(key: bytes, atTx: int) -> bytes:
+    refVal = REFERENCE_VALUE_PREFIX+atTx.to_bytes(8, 'big')+key
+    return refVal
+
+
+def EncodeZAdd(zset: bytes, score: float, key: bytes, attx: int):
+    es = store.EntrySpec(key=WrapZAddReferenceAt(zset, score, key, attx),
+                         md=None,
+                         value=b''
+                         )
+    return es
+
+
+def WrapZAddReferenceAt(zset: bytes, score: float, key: bytes, attx: int) -> bytes:
+    ekey = SET_KEY_PREFIX+key
+    zkey = SORTED_KEY_PREFIX
+    zkey += struct.pack(">Q", len(zset))+zset
+    zkey += struct.pack(">d", score)
+    zkey += struct.pack(">Q", len(ekey))+ekey
+    zkey += struct.pack(">Q", attx)
+    return zkey

immudb/embedded/__init__.py

@@ -0,0 +1,11 @@
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.

immudb/embedded/ahtree/__init__.py

@@ -0,0 +1,13 @@
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from immudb.embedded.ahtree.verification import *

immudb/embedded/ahtree/verification.py

@@ -0,0 +1,85 @@
+# Copyright 2022 CodeNotary, Inc. All rights reserved.
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#       http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from immudb.constants import *
+import hashlib
+
+
+def VerifyInclusion(iproof: list, i: int, j: int, iLeaf: bytes, jRoot: bytes) -> bool:
+    if i > j or i == 0 or i < j and len(iproof) == 0:
+        return False
+    ciRoot = EvalInclusion(iproof, i, j, iLeaf)
+    return jRoot == ciRoot
+
+
+def EvalInclusion(iproof: list, i: int, j: int, iLeaf: bytes) -> bool:
+    i1 = i - 1
+    j1 = j - 1
+    ciRoot = iLeaf
+    for h in iproof:
+        if i1 % 2 == 0 and i1 != j1:
+            b = NODE_PREFIX+ciRoot+h
+        else:
+            b = NODE_PREFIX+h+ciRoot
+        ciRoot = hashlib.sha256(b).digest()
+        i1 = i1 >> 1
+        j1 = j1 >> 1
+    return ciRoot
+
+
+def VerifyConsistency(cproof: list, i: int, j: int, iRoot: bytes, jRoot: bytes) -> bool:
+    if i > j or i == 0 or (i < j and len(cproof) == 0):
+        return False
+    if i == j and len(cproof) == 0:
+        return iRoot == jRoot
+    ciRoot, cjRoot = EvalConsistency(cproof, i, j)
+    return iRoot == ciRoot and jRoot == cjRoot
+
+
+def EvalConsistency(cproof: list, i: int, j: int):
+    fn = i - 1
+    sn = j - 1
+    while fn % 2 == 1:
+        fn = fn >> 1
+        sn = sn >> 1
+    ciRoot, cjRoot = cproof[0], cproof[0]
+    for h in cproof[1:]:
+        if fn % 2 == 1 or fn == sn:
+            b = NODE_PREFIX+h+ciRoot
+            ciRoot = hashlib.sha256(b).digest()
+            b = NODE_PREFIX+h+cjRoot
+            cjRoot = hashlib.sha256(b).digest()
+            while fn % 2 == 0 and fn != 0:
+                fn = fn >> 1
+                sn = sn >> 1
+        else:
+            b = NODE_PREFIX+cjRoot+h
+            cjRoot = hashlib.sha256(b).digest()
+        fn = fn >> 1
+        sn = sn >> 1
+    return ciRoot, cjRoot
+
+
+def VerifyLastInclusion(iproof: list, i: int, leaf: bytes, root: bytes) -> bool:
+    if i == 0:
+        return False
+    return root == EvalLastInclusion(iproof, i, leaf)
+
+
+def EvalLastInclusion(iproof: list, i: int, leaf: bytes) -> bytes:
+    i1 = i - 1
+    root = leaf
+    for h in iproof:
+        b = NODE_PREFIX+h+root
+        root = hashlib.sha256(b).digest()
+        i1 >>= 1
+    return root