Merge branch 'master' of https://github.com/paritytech/parity into wa…

…rp_sync_on_light_client

* 'master' of https://github.com/paritytech/parity:
  ethcore: add transition flag for transaction permission contract (openethereum#9275)
  Remove all dapp permissions related settings (openethereum#9120)
  Improve return data truncate logic (openethereum#9254)
  Update wasm-tests hash (openethereum#9295)
  Implement KIP4: create2 for wasm (openethereum#9277)
  Fix loop start value (openethereum#9285)
  Avoid using $HOME if not necessary (openethereum#9273)
  Fix path to parity.h (openethereum#9274)

ethcore/evm/src/interpreter/memory.rs

@@ -119,14 +119,19 @@ impl Memory for Vec<u8> {
 	fn into_return_data(mut self, offset: U256, size: U256) -> ReturnData {
 		let mut offset = offset.low_u64() as usize;
 		let size = size.low_u64() as usize;
+
 		if !is_valid_range(offset, size) {
-			return ReturnData::empty()
+			return ReturnData::empty();
 		}
+
 		if self.len() - size > MAX_RETURN_WASTE_BYTES {
-			{ let _ =  self.drain(..offset); }
-			self.truncate(size);
-			self.shrink_to_fit();
-			offset = 0;
+			if offset == 0 {
+				self.truncate(size);
+				self.shrink_to_fit();
+			} else {
+				self = self[offset..(offset + size)].to_vec();
+				offset = 0;
+			}
 		}
 		ReturnData::new(self, offset, size)
 	}

ethcore/evm/src/tests.rs

@@ -746,6 +746,7 @@ fn test_calls(factory: super::Factory) {
 
 	assert_set_contains(&ext.calls, &FakeCall {
 		call_type: FakeCallType::Call,
+		create_scheme: None,
 		gas: U256::from(2556),
 		sender_address: Some(address.clone()),
 		receive_address: Some(code_address.clone()),
@@ -755,6 +756,7 @@ fn test_calls(factory: super::Factory) {
 	});
 	assert_set_contains(&ext.calls, &FakeCall {
 		call_type: FakeCallType::Call,
+		create_scheme: None,
 		gas: U256::from(2556),
 		sender_address: Some(address.clone()),
 		receive_address: Some(address.clone()),

ethcore/res/tx_permission_tests/contract_ver_2_genesis.json

@@ -17,7 +17,8 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x69",
 		"gasLimitBoundDivisor": "0x0400",
-		"transactionPermissionContract": "0x0000000000000000000000000000000000000005"
+		"transactionPermissionContract": "0x0000000000000000000000000000000000000005",
+		"transactionPermissionContractTransition": "1"
 	},
 	"genesis": {
 		"seal": {

ethcore/res/tx_permission_tests/deprecated_contract_genesis.json

@@ -17,7 +17,8 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x69",
 		"gasLimitBoundDivisor": "0x0400",
-		"transactionPermissionContract": "0x0000000000000000000000000000000000000005"
+		"transactionPermissionContract": "0x0000000000000000000000000000000000000005",
+		"transactionPermissionContractTransition": "1"
 	},
 	"genesis": {
 		"seal": {