support deploy contracts with params (FISCO-BCOS#67)

check the user account (must be start with 0x)

Author: cyjseagull

Diff for: ci/ci_check.sh

@@ -86,9 +86,16 @@ function test_common_rpcInterface()
 function test_contract()
 {
     LOG_INFO "## test contract..."
+    # deploy contract with params
+    local contract_addr=$(execute_cmd "python console.py deploy HelloWorldTest testCase | grep "address:" | awk -F':' '{print \$3}' | awk '\$1=\$1'")
+    local ret=$(execute_cmd "python console.py call HelloWorldTest ${contract_addr} get |  grep testCase")
+    if [ "$ret" == "" ];then
+	LOG_ERROR "deploy contract HelloWorldTest with params failed, ret: ${ret}"
+    fi
+
     init_blockNumber=$(getBlockNumber)
     # deploy and get contract address
-    local contract_addr=$(execute_cmd "python console.py deploy HelloWorld save | grep "address:" | awk -F':' '{print \$3}' | awk '\$1=\$1'")
+    contract_addr=$(execute_cmd "python console.py deploy HelloWorld save | grep "address:" | awk -F':' '{print \$3}' | awk '\$1=\$1'")
     updated_blockNumber=$(getBlockNumber)
     if [ $(($init_blockNumber + 1)) -ne $((updated_blockNumber)) ];then
         LOG_ERROR "deploy contract failed for blockNumber hasn't increased"

Diff for: client/bcosclient.py

@@ -32,6 +32,7 @@
 from utils.contracts import get_function_info
 from utils.abi import itertools, get_fn_abi_types_single
 from eth_abi import decode_single
+from utils.contracts import get_aligned_function_data
 
 
 class BcosClient:
@@ -435,10 +436,17 @@ def sendRawTransaction(self, to_address, contract_abi, fn_name, args=None,
         if to_address != "":
             common.check_and_format_address(to_address)
         # 第三个参数是方法的abi，可以传入None，encode_transaction_data做了修改，支持通过方法+参数在整个abi里找到对应的方法abi来编码
+
         if bin_data is None:
             functiondata = encode_transaction_data(fn_name, contract_abi, None, args)
-        else:
+        # the args is None
+        elif args is None:
             functiondata = bin_data
+        # deploy with params
+        else:
+            fn_data = get_aligned_function_data(contract_abi, None, args)
+            functiondata = bin_data + fn_data[2:]
+
         if to_address is not None and len(to_address) > 0:
             from eth_utils import to_checksum_address
             to_address = to_checksum_address(to_address)

Diff for: client/common/common.py

@@ -76,6 +76,14 @@ def print_result(ret):
         print_info("    ", "{}".format(ret))
 
 
+def check_address_startwith_0x(address):
+    """
+    check the address: must be starts with 0x
+    """
+    if address.startswith("0x") is False:
+        raise ArgumentsError("invalid address {}, must be start with 0x".format(address))
+
+
 def check_and_format_address(address):
     """
     check address
@@ -216,7 +224,6 @@ def print_receipt_logs(logs):
             print("{}): log name: {} , data: {}".format(i, log['eventname'], log['eventdata']))
 
 
-
 def print_output_and_input(logs, output, txinput, contract_name, contract_path):
     """
     parse_output_from_abi
@@ -242,7 +249,7 @@ def print_output_and_input(logs, output, txinput, contract_name, contract_path):
         print_info("output result", output_result)
         log_result = dataParser.parse_event_logs(logs)
         print_receipt_logs(log_result)
-        #print_info("log result", log_result)
+        # print_info("log result", log_result)
 
     except Exception as e:
         raise BcosException("parse output failed for reason: {}".format(e))

Diff for: client/common/transaction_common.py

@@ -22,6 +22,7 @@
 from eth_utils import to_checksum_address
 from client.bcoserror import BcosError, CompileError, ArgumentsError, BcosException
 from client.common.transaction_exception import TransactionException
+from utils.abi import get_constructor_abi
 
 
 class TransactionCommon(bcosclient.BcosClient):
@@ -157,14 +158,22 @@ def format_args(self, fn_name, fn_args, needCover=False):
         self.gen_contract_abi(needCover)
         data_parser = DatatypeParser(self.contract_abi_path)
         contract_abi = data_parser.contract_abi
+        args = None
         if fn_args is None:
             return (contract_abi, fn_args)
         if fn_name in data_parser.func_abi_map_by_name.keys() is None:
             raise BcosException("invalid function: {}, the right function list:"
                                 .format(fn_name,
                                         ''.join(data_parser.func_abi_map_by_name.keys())))
-        inputabi = data_parser.func_abi_map_by_name[fn_name]["inputs"]
-        args = TransactionCommon.format_args_by_abi(fn_args, inputabi)
+        if fn_name is not None:
+            inputabi = data_parser.func_abi_map_by_name[fn_name]["inputs"]
+            args = TransactionCommon.format_args_by_abi(fn_args, inputabi)
+        # the constructor with params
+        elif fn_args is not None and contract_abi is not None:
+            abidata = get_constructor_abi(contract_abi)
+            if abidata is not None:
+                inputabi = abidata["inputs"]
+                args = TransactionCommon.format_args_by_abi(fn_args, inputabi)
         return (contract_abi, args)
 
     def call_and_decode(self, fn_name, fn_args=None):

Diff for: client/precompile/permission/permission_service.py

@@ -40,6 +40,7 @@ def grant(self, table_name, account_address):
         function insert(string table_name, string addr) public returns(int256);
         """
         common.check_and_format_address(account_address)
+        common.check_address_startwith_0x(account_address)
         fn_name = "insert"
         fn_args = [table_name, account_address]
         return self.client.send_transaction_getReceipt(fn_name, fn_args, self.gasPrice)
@@ -51,6 +52,7 @@ def revoke(self, table_name, account_address):
         function remove(string table_name, string addr) public returns(int256);
         """
         common.check_and_format_address(account_address)
+        common.check_address_startwith_0x(account_address)
         fn_name = "remove"
         fn_args = [table_name, account_address]
         return self.client.send_transaction_getReceipt(fn_name, fn_args, self.gasPrice)

Diff for: console.py

@@ -179,10 +179,7 @@ def usage(client_config):
 
     usagemsg.append('''checkaddr [address]
         将普通地址转为自校验地址,自校验地址使用时不容易出错
-        change address to checksum address according EIP55:
-        to_checksum_address: 0xf2c07c98a6829ae61f3cb40c69f6b2f035dd63fc
-        -> 0xF2c07c98a6829aE61F3cB40c69f6b2f035dD63FC
-        ''')
+        change address to checksum address according EIP55''')
     return usagemsg
 
 
@@ -410,15 +407,20 @@ def main(argv):
         # --------------------------------------------------------------------------------------------
         if cmd == "deploy":
             '''deploy abi bin file'''
-            if len(inputparams) > 2:
-                raise ArgumentsError(("deploy failed, expected at most 2 params,"
-                                      " provided: {}").format(len(inputparams)))
-            # must be at most 2 params
-            common.check_param_num(inputparams, 1, False)
+            # must be at least 2 params
+            common.check_param_num(inputparams, 1)
             contractname = inputparams[0].strip()
             gasPrice = 30000000
+            # need save address whether or not
+            needSaveAddress = False
+            args_len = len(inputparams)
+            if inputparams[-1] == "save":
+                needSaveAddress = True
+                args_len = len(inputparams) - 1
+            # get the args
+            fn_args = inputparams[1:args_len]
             trans_client = transaction_common.TransactionCommon("", contracts_dir, contractname)
-            result = trans_client.send_transaction_getReceipt(None, None, gasPrice, True)[0]
+            result = trans_client.send_transaction_getReceipt(None, fn_args, gasPrice, True)[0]
 
             print("deploy result  for [{}] is:\n {}".format(
                 contractname, json.dumps(result, indent=4)))
@@ -427,10 +429,9 @@ def main(argv):
             blocknum = int(result["blockNumber"], 16)
             ContractNote.save_contract_address(name, address)
             print("on block : {},address: {} ".format(blocknum, address))
-            if len(inputparams) == 2:
-                if inputparams[1] == "save":
-                    ContractNote.save_address(name, address, blocknum)
-                    print("address save to file: ", client_config.contract_info_file)
+            if needSaveAddress is True:
+                ContractNote.save_address(name, address, blocknum)
+                print("address save to file: ", client_config.contract_info_file)
             else:
                 print(
                     '''\nNOTE : if want to save new address as last

Diff for: contracts/HelloWorldTest.sol

@@ -0,0 +1,17 @@
+pragma solidity ^0.4.24;
+
+contract HelloWorldTest{
+    string name;
+
+    constructor(string _name) public{
+       name = _name;
+    }
+
+    function get() constant public returns(string){
+        return name;
+    }
+
+    function set(string n) public{
+    	name = n;
+    }
+}

Diff for: utils/contracts.py

@@ -45,6 +45,7 @@
 from utils.exceptions import (
     ValidationError,
 )
+from utils.abi import get_constructor_abi
 
 
 def find_matching_event_abi(abi, event_name=None, argument_names=None):
@@ -123,7 +124,7 @@ def find_matching_fn_abi(abi, fn_identifier=None, args=None, kwargs=None):
         raise ValidationError(message)
 
 
-def encode_abi( abi, arguments, data=None):
+def encode_abi(abi, arguments, data=None):
     argument_types = get_abi_input_types(abi)
 
     if not check_if_arguments_can_be_encoded(abi, arguments, {}):
@@ -214,6 +215,16 @@ def encode_transaction_data(
     return add_0x_prefix(encode_abi(fn_abi, fn_arguments, fn_selector))
 
 
+def get_aligned_function_data(contract_abi=None, fn_abi=None, args=None, kwargs=None):
+    if fn_abi is None:
+        fn_abi = get_constructor_abi(contract_abi)
+    if kwargs is None:
+        kwargs = {}
+    fn_arguments = merge_args_and_kwargs(fn_abi, args, kwargs)
+    _, aligned_fn_arguments = get_aligned_abi_inputs(fn_abi, fn_arguments)
+    return add_0x_prefix(encode_abi(fn_abi, fn_arguments, ""))
+
+
 def get_fallback_function_info(contract_abi=None, fn_abi=None):
     if fn_abi is None:
         fn_abi = get_fallback_func_abi(contract_abi)