Merge pull request #46 from rocklabs-io/mnemonic

Add identity from mnemonic and clean code

Author: ccyanxyz

.gitignore

@@ -8,6 +8,7 @@ build/
 *.egg-info
 
 .tox/
+.DS_Store
 
 .antlr
 dist/

ic/agent.py

@@ -19,20 +19,6 @@ def sign_request(req, iden):
     }
     return req_id, cbor2.dumps(envelop)
 
-# According to did, get the method returned param type
-def getType(method:str):
-    if method == 'totalSupply':
-        return Types.Nat
-    elif method == 'name':
-        return Types.Text
-    elif method == 'balanceOf':
-        return Types.Nat
-    elif method == 'transfer':
-        return Types.Variant({'ok': Types.Nat, 'err': Types.Variant})
-    else:
-        # pass
-        return Types.Nat
-
 class Agent:
     def __init__(self, identity, client, nonce_factory=None, ingress_expiry=300, root_key=IC_ROOT_KEY):
         self.identity = identity
@@ -113,6 +99,10 @@ def read_state_raw(self, canister_id, paths):
         }
         _, data = sign_request(req, self.identity)
         ret = self.read_state_endpoint(canister_id, data)
+        if ret == b'Invalid path requested.':
+            raise ValueError('Invalid path requested!')
+        elif ret == b'Could not parse body as read request: invalid type: byte array, expected a sequence':
+            raise ValueError('Could not parse body as read request: invalid type: byte array, expected a sequence')
         d = cbor2.loads(ret)
         cert = cbor2.loads(d['certificate'])
         return cert

ic/certificate.py

@@ -79,7 +79,10 @@ def flatten_forks(t):
   if t[0] == NodeId.Empty.value:
       return []
   elif t[0] == NodeId.Fork.value:
-      return flatten_forks(t[1]) + (flatten_forks(t[2]))
+      val1 = flatten_forks(t[1])
+      val2 = flatten_forks(t[2])
+      val1.extend(val2)
+      return val1
   else:
       return [t]
 
@@ -96,4 +99,4 @@ def find_label(l, trees):
     tree = [1, [4, b'W\xb4\x1b\x00\xc9x\xc0\xcb\\\xf4\xb6\xa1\xbbE\\\x9fr\xe2\x1a8\xd2bE\x14\x11\xab:\xb5\x1b`\x98\x9d'], [1, [4, b'\xac>_\x80\xeb.$\x9c\x00\xbc\x12\xce&!^\xa8,i\x08\xaeH\x8e\x9ce9\x87\xbahGPo\xe6'], [2, b'time', [3, b'\xd2\xac\xd3\x8a\xfc\xa0\xd0\xe0\x16']]]]
     tree2 = [1, [4, b'5J\xe2\x98A\x8d5\xc8\xe6\x94V\xc9\x90\x87\x00\xc9:\xe1\xb3i\x91fS\xc0udD\x19mQ\x1c\x85'], [1, [4, b'\xac>_\x80\xeb.$\x9c\x00\xbc\x12\xce&!^\xa8,i\x08\xaeH\x8e\x9ce9\x87\xbahGPo\xe6'], [2, b'time', [3, b'\xe7\xfc\xcf\x90\x87\x85\xd0\xe0\x16']]]]
     path = b'time'
-    print(lookup_path([path], tree))
+    print(lookup_path([path], tree))

ic/identity.py

@@ -3,6 +3,7 @@
 from ecdsa.curves import Ed25519, SECP256k1
 from .principal import Principal
 import ecdsa
+from mnemonic import Mnemonic
 
 class Identity:
     def __init__(self, privkey = "", type = "ed25519", anonymous = False):
@@ -32,6 +33,14 @@ def __init__(self, privkey = "", type = "ed25519", anonymous = False):
         else:
             raise 'unsupported identity type'
 
+    @staticmethod
+    def from_seed(mnemonic: str):
+        mnemo = Mnemonic('english')
+        seed = mnemo.to_seed(mnemonic).hex()
+        privkey = seed[:64]
+        type = "ed25519"
+        return Identity(privkey=privkey, type=type)
+
     @staticmethod
     def from_pem(pem: str):
         key = ecdsa.SigningKey.from_pem(pem)

setup.py

@@ -22,7 +22,8 @@
         'cbor2>=5.4.2', 
         'leb128>=1.0.4', 
         'waiter>=1.2',
-        'antlr4-python3-runtime==4.9.3'
+        'antlr4-python3-runtime==4.9.3',
+        'mnemonic==0.20'
         ],
     py_modules = ['ic'],
     package_dir = { 'ic': "ic" },

tests/test_identity.py

@@ -22,4 +22,10 @@ def test_ed25519_frompem(self):
         assert iden.pubkey == 'ab3b98863398672d6ac76afcb0a177a40285cfa5846e0740ebe838d917a15992'
 
     def test_secp256k1_frompem(self):
-        pass
+        pass
+
+    def test_ed25519_from_seed(self):
+        mnemonic = 'fence dragon soft spoon embrace bronze regular hawk more remind detect slam'
+        iden = Identity.from_seed(mnemonic)
+        assert iden.key_type == 'ed25519'
+        assert iden.privkey == '97cc884647e7e0ef58c36b57448269ba6a123521a7f234fa5fdc5816d824ef50'