Merge pull request #860 from tonlabs/IgorKoval/upd-default-cap

Upd DEFAULT_CAPABILITIES

Cargo.toml

@@ -9,7 +9,7 @@ license-file = 'LICENSE.md'
 name = 'tvm_linker'
 readme = 'README.md'
 repository = 'https://github.com/tonlabs/TVM-linker'
-version = '0.20.4'
+version = '0.20.5'
 
 [[bin]]
 name = 'tvm_linker'
@@ -33,11 +33,11 @@ serde_json = '1.0'
 sha2 = '0.10'
 simplelog = '0.6'
 serde = { features = [ 'derive' ], version = '1.0' }
-ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.129' }
+ton_abi = { git = 'https://github.com/tonlabs/ever-abi.git', tag = '2.3.130' }
 ton_block = { features = [ 'gosh' ], git = 'https://github.com/tonlabs/ever-block.git', tag = '1.9.88' }
 ton_labs_assembler = { features = [ 'gosh' ], git = 'https://github.com/tonlabs/ever-assembler.git', tag = '1.2.130' }
 ton_types = { git = 'https://github.com/tonlabs/ever-types.git', tag = '2.0.18' }
-ton_vm = { features = [ 'gosh' ], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.189' }
+ton_vm = { features = [ 'gosh' ], git = 'https://github.com/tonlabs/ever-vm.git', tag = '1.8.190' }
 
 [dev-dependencies]
 assert_cmd = '2.0.5'

README.md

@@ -114,7 +114,7 @@ Use `--decode-c6` to see output actions in user-friendly format.
 Use `--balance <value>` to define account balance in nanograms. It will be available  at the bottom of initial stake and in SmartContractInfo tuple from c7 register .
 
 Use `--config <tvc_file>` to define the config parameters to run VM with. The TVC file is a state of the config smart-contract. 
-The capabilities field of the config defines the VM mode of operation. If the config parameter is omitted, the capabilities default value of 0x42E is used. 
+The capabilities field of the config defines the VM mode of operation. If the config parameter is omitted, the capabilities default value of 0x880116ae is used. 
 For the available capability codes consult [here](https://github.com/tonlabs/ton-labs-block/blob/master/src/config_params.rs#L336)
 
 Note: configuration smart-contract resides at the address: -1:5555555555555555555555555555555555555555555555555555555555555555

src/main.rs

@@ -64,7 +64,7 @@ use resolver::resolve_name;
 use testcall::{call_contract, MsgInfo, TestCallParams, TraceLevel};
 use disasm::commands::disasm_command;
 
-const DEFAULT_CAPABILITIES:u64 = 0x42E;   // Default capabilities in the main network
+ const DEFAULT_CAPABILITIES:u64 = 0x880116ae; // Default capabilities on the main network
 
 fn main() -> std::result::Result<(), i32> {
     linker_main().map_err(|err_str| {

src/program.rs

@@ -387,7 +387,7 @@ pub fn get_now() -> u32 {
 
 #[cfg(test)]
 mod tests {
-    use crate::abi;
+    use crate::{abi, DEFAULT_CAPABILITIES};
     use crate::testcall::{load_config, load_debug_info, call_contract, MsgInfo, TestCallParams};
     use crate::{printer::get_version_mycode_aware, program::load_stateinit};
     use crate::testcall::TraceLevel;
@@ -441,7 +441,7 @@ mod tests {
                 action_decoder,
                 trace_level,
                 debug_info,
-                capabilities: 0x42E, // default
+                capabilities: DEFAULT_CAPABILITIES,
             }
         )?;
         if is_vm_success {

test_suite.py

@@ -108,7 +108,7 @@ def compile2(source_name, directory = "tests_sol", lib_file = STDLIB_SOL):
 SIGN = None
 
 def error(msg):
-	print "ERROR!", msg
+	print("ERROR!", msg)
 	quit(1)
 
 def exec_and_parse(cmd, expected_ec):
@@ -123,7 +123,7 @@ def exec_and_parse(cmd, expected_ec):
 	ec = getExitCode()
 
 	if ec != expected_ec:
-		print cmd
+		print(cmd)
 		with open('exec_log.tmp', 'r') as f:
 			print(f.read())
 
@@ -184,7 +184,7 @@ def expect_output(regex):
 	for l in lines:
 		match = re.search(regex, l)
 		if match:
-			print "> ", match.group(0)
+			print( "> ", match.group(0))
 			return
 
 	with open('exec_log.tmp', 'r') as f: