Merge pull request #89 from AplaProject/develop

Develop

Author: syypoo

basic.json

@@ -53,7 +53,7 @@
         {
             "Name": "full_nodes",
             "Conditions": "ContractConditions(\"@1DeveloperCondition\")",
-            "Value": "contract full_nodes {\n    data {\n        Value string\n    }\n\n    conditions {\n        if Size($Value) == 0 {\n            warning \"Value was not received\"\n        }\n\n        var full_nodes_arr array\n        full_nodes_arr = JSONDecode($Value)\n\n        var len_arr int\n        len_arr = Len(full_nodes_arr)\n\n        if len_arr == 0 {\n            warning \"Wrong array structure\"\n        }\n\n        var i int\n        while(i < len_arr){\n            var node_map map \n            node_map = full_nodes_arr[i]\n\n            var public_key string\n            var tcp_address string\n            var api_address string\n            var key_id string\n\n            public_key = node_map[\"public_key\"]\n            tcp_address = node_map[\"tcp_address\"]\n            api_address = node_map[\"api_address\"]\n            key_id = node_map[\"key_id\"]\n\n            if Size(public_key) == 0 {\n                warning \"Public key was not received\"\n            }\n            if Size(tcp_address) == 0 {\n                warning \"TCP address was not received\"\n            }\n            if Size(api_address) == 0 {\n                warning \"API address was not received\"\n            }\n            if Size(key_id) == 0 {\n                warning \"Key ID was not received\"\n            }\n\n            i = i + 1\n        }\n    }\n}",
+            "Value": "contract full_nodes {\n    data {\n        Value string\n    }\n\n    conditions {\n        if Size($Value) == 0 {\n            warning \"Value was not received\"\n        }\n\n        var full_nodes_arr array\n        full_nodes_arr = JSONDecode($Value)\n\n        var len_arr int\n        len_arr = Len(full_nodes_arr)\n\n        if len_arr == 0 {\n            warning \"Wrong array structure\"\n        }\n\n        var i int\n        while(i < len_arr){\n            var node_map map\n            node_map = full_nodes_arr[i]\n\n            var public_key string\n            var tcp_address string\n            var api_address string\n            var key_id string\n\n            public_key = node_map[\"public_key\"]\n            tcp_address = node_map[\"tcp_address\"]\n            api_address = node_map[\"api_address\"]\n            key_id = node_map[\"key_id\"]\n\n            if Size(public_key) == 0 {\n                warning \"Public key was not received\"\n            }\n            if Size(tcp_address) == 0 {\n                warning \"TCP address was not received\"\n            }\n            if Size(api_address) == 0 {\n                warning \"API address was not received\"\n            }\n            if Size(key_id) == 0 {\n                warning \"Key ID was not received\"\n            }\n\n            i = i + 1\n        }\n    }\n}",
             "Type": "contracts"
         },
         {

conditions.json

@@ -0,0 +1 @@
+Shops,Financial and professional services,Restaurants and cafes,Drinking establishments,Hot food takeaways,Drinking establishments with expanded food provision,Business,General industrial,Storage or distribution,Hotels,Residential institutions,Secure Residential Institution,Dwellinghouses,Houses in multiple occupation,Non-residential institutions,Assembly and leisure

ecosystem_apps/land_registry.json

@@ -0,0 +1 @@
+lr_no_issues,lr_attention_required

…_params/voting_sysparams_template_id.csv …nd_registry/app_params/lr_admin_role.csvsrc/basic/app_params/voting_sysparams_template_id.csv renamed to ecosystem_apps/land_registry/app_params/lr_admin_role.csv src/basic/app_params/voting_sysparams_template_id.csv renamed to ecosystem_apps/land_registry/app_params/lr_admin_role.csv

@@ -0,0 +1 @@
+Municipal,Regional,Federal