[ECHOT-335] Update registration method and operation

echoprotocol · Mar 23, 2020 · fcc4e77 · fcc4e77
1 parent a644ddc
commit fcc4e77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/echopy/echo.py b/echopy/echo.py
@@ -15,7 +15,7 @@ def __init__(self):
     def solve_registration_task(self, block_id, rand_num, difficulty):
         return solve_registration_task(block_id, rand_num, difficulty)
 
-    async def register_account(self, callback, name, active, echorand):
+    async def register_account(self, callback, name, active, echorand, evm_address=None):
         if self.api.ws.connection is None:
             raise AttributeError("Connection is needed: use 'connect' method for connecting to node")
         task = self.api.registration.request_registration_task()
@@ -29,6 +29,7 @@ async def register_account(self, callback, name, active, echorand):
             name,
             active,
             echorand,
+            evm_address,
             nonce,
             task["rand_num"]
         )

diff --git a/echopy/echoapi/ws_api/registration_api.py b/echopy/echoapi/ws_api/registration_api.py
@@ -9,10 +9,11 @@ async def request_registration_task(self):
             []
         )
 
-    async def submit_registration_solution(self, callback, name, active, echorand_key, nonce, rand_num):
+    async def submit_registration_solution(self, callback, name, active, echorand_key,
+                                           evm_address, nonce, rand_num):
         return await self.db.rpcexec(
             'submit_registration_solution',
-            [callback, name, active, echorand_key, nonce, rand_num]
+            [callback, name, active, echorand_key, evm_address, nonce, rand_num]
         )
 
     async def get_registrar(self):

diff --git a/echopy/echobase/operations.py b/echopy/echobase/operations.py
@@ -140,12 +140,15 @@ def detail(self, *args, **kwargs):
 # Account Management
 class AccountCreate(EchoObject):
     def detail(self, *args, **kwargs):
+        evm_address = get_optional("evm_address", kwargs, Bytes)
+
         result = OrderedDict(
             [
                 ("registrar", ObjectId(kwargs["registrar"], "account")),
                 ("name", String(kwargs["name"])),
                 ("active", Permission(kwargs["active"])),
                 ("echorand_key", PublicKey(kwargs["echorand_key"])),
+                ("evm_address", Optional(evm_address)),
                 ("options", AccountOptions(kwargs["options"])),
                 ("extensions", Set([])),
             ]