Merge branch 'develop'

Author: syypoo

src/system/contracts/NewUser.sim

@@ -2,22 +2,19 @@ contract NewUser {
     data {
         NewPubkey string
     }
-
     conditions {
-        $newId = PubToID($NewPubkey)
-        if $newId == 0 {
-            warning LangRes("@1wrong_pub", "en")
+        $id = PubToID($NewPubkey)
+        if $id == 0 {
+            error LangRes("@1wrong_pub", "en")
         }
-        if DBFind("@1keys").Columns("id").Where({"id": $newId, "ecosystem": $ecosystem_id}).One("id") != nil {
-            warning LangRes("@1template_user_exists", "en")
+        if DBFind("keys").Columns("id").WhereId($id).One("id") != nil {
+            error LangRes("@1template_user_exists", "en")
         }
-
-        $amount = Money(1000) * Money(1000000000000000000)
     }
-
     action {
-        NewMoney($newId, Str($amount), "New user deposit")
-        SetPubKey($newId, StringToBytes($NewPubkey))
-        $result = $newId 
+        $pub = HexToPub($NewPubkey)
+        $account = IdToAddress($id)
+        $amount = Money(1000) * Money(1000000000000000000)
+        DBInsert("keys", {"id": $id, "account": $account, "pub": $pub, "amount": $amount, "ecosystem": 1})
     }
 }

system.json

@@ -628,7 +628,7 @@
         {
             "Name": "NewUser",
             "Conditions": "ContractConditions(\"@1DeveloperCondition\")",
-            "Value": "contract NewUser {\n    data {\n        NewPubkey string\n    }\n\n    conditions {\n        $newId = PubToID($NewPubkey)\n        if $newId == 0 {\n            warning LangRes(\"@1wrong_pub\", \"en\")\n        }\n        if DBFind(\"@1keys\").Columns(\"id\").Where({\"id\": $newId, \"ecosystem\": $ecosystem_id}).One(\"id\") != nil {\n            warning LangRes(\"@1template_user_exists\", \"en\")\n        }\n\n        $amount = Money(1000) * Money(1000000000000000000)\n    }\n\n    action {\n        NewMoney($newId, Str($amount), \"New user deposit\")\n        SetPubKey($newId, StringToBytes($NewPubkey))\n        $result = $newId \n    }\n}",
+            "Value": "contract NewUser {\n    data {\n        NewPubkey string\n    }\n    conditions {\n        $id = PubToID($NewPubkey)\n        if $id == 0 {\n            error LangRes(\"@1wrong_pub\", \"en\")\n        }\n        if DBFind(\"keys\").Columns(\"id\").WhereId($id).One(\"id\") != nil {\n            error LangRes(\"@1template_user_exists\", \"en\")\n        }\n    }\n    action {\n        $pub = HexToPub($NewPubkey)\n        $account = IdToAddress($id)\n        $amount = Money(1000) * Money(1000000000000000000)\n        DBInsert(\"keys\", {\"id\": $id, \"account\": $account, \"pub\": $pub, \"amount\": $amount, \"ecosystem\": 1})\n    }\n}",
             "Type": "contracts"
         },
         {