Add tests for create2 in creator

README.md

@@ -8,8 +8,8 @@ Growing collection of varios WASM compilable contract examples, both source and
 ### Rust
 
 - Rust with `wasm32-unknown-unknown` target
-- wasm-build util, run `cargo install pwasm-utils` to install
-- bash to run `./build.sh`
+- wasm-build util, run `cargo install pwasm-utils-cli` to install
+- bash to run `./build-all.sh`
 
 ### C/C++
 - to be updated

build-all.sh

@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
 ./build-rust-test.sh alloc
 ./build-rust-test.sh call
 ./build-rust-test.sh call_code
 ./build-rust-test.sh call_static
-./build-rust-test.sh creator
+./build-rust-test.sh creator kip4
 ./build-rust-test.sh dispersion
 ./build-rust-test.sh empty
 ./build-rust-test.sh externs

build-rust-test.sh

@@ -1,10 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
 TEST_NAME=$1
+ADDITIONAL_FEATURES=$2
 
-cargo run --manifest-path ./gen/Cargo.toml -- $TEST_NAME
+cargo run --manifest-path ./gen/Cargo.toml -- $TEST_NAME $ADDITIONAL_FEATURES
 RUSTFLAGS="-C link-arg=-z  -C link-arg=stack-size=65536" CARGO_TARGET_DIR=./target cargo build --manifest-path=./target/tests/$TEST_NAME/Cargo.toml --release --target=wasm32-unknown-unknown
-wasm-build ./target $TEST_NAME --target wasm32-unknown-unknown
-cp ./target/$TEST_NAME.wasm ./compiled
+wasm-build ./target $TEST_NAME --save-raw ./target/$TEST_NAME.raw.wasm --target wasm32-unknown-unknown
+cp ./target/$TEST_NAME.raw.wasm ./compiled/$TEST_NAME.wasm

build-wat.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 

gen/main.rs

@@ -3,23 +3,26 @@ use std::path::PathBuf;
 
 fn main() {
 	let args = env::args().collect::<Vec<_>>();
-	if args.len() != 2 {
-		println!("Usage: {} gen <test.rs>", args[0]);
-		return;
-	}
-
-	let file_name = &args[1];
-
-	let toml = r#"
+	let (file_name, pwasm_ethereum_version, pwasm_std_version) = match args.len() {
+		2 => (&args[1], r#""0.5.0""#.to_string(), r#""0.9.0""#),
+		3 => (&args[1], format!(r#"{{ git = "https://github.com/paritytech/pwasm-ethereum", branch = "kip4", features = [{}] }}"#, args[2].split(",").map(|s| format!(r#""{}""#, s)).collect::<Vec<_>>().join(", ")), r#""0.10.0""#),
+		_ => {
+			println!("Usage: {} gen <test.rs>", args[0]);
+			return;
+		},
+	};
+
+	let toml = format!(r#"
 [package]
 name = "wasm-tests"
 version = "0.1.0"
 authors = ["NikVolf <[email protected]>"]
 
 [dependencies]
-pwasm-std = "0.9.0"
-pwasm-ethereum = "0.5.0"
-bigint = { version = "4", default-features = false }
+pwasm-std = {}
+pwasm-ethereum = {}
+bigint = {{ version = "4", default-features = false }}
+parity-hash = {{ version = "1", default-features = false }}
 
 [lib]
 name = "$file_name"
@@ -30,7 +33,7 @@ crate-type = ["cdylib"]
 panic = "abort"
 lto = true
 opt-level = "z"
-"#;
+"#, pwasm_std_version, pwasm_ethereum_version);
 
 	let target_toml = toml.replace("$file_name", file_name);
 

src/alloc.rs

@@ -12,4 +12,7 @@ pub fn call() {
 		data.extend_from_slice(&[5u8; 400*1024][..]);
 		data
 	});
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/call.rs

@@ -24,3 +24,6 @@ pub fn call() {
 
 	ret(&[]);
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/call_code.rs

@@ -37,3 +37,6 @@ pub fn call() {
 
 	ret(&res[..]);
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/call_static.rs

@@ -35,3 +35,6 @@ pub fn call() {
 	logger::debug("Exiting...");
 	ret(&res[..]);
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/creator.rs

@@ -2,16 +2,33 @@
 
 extern crate pwasm_std;
 extern crate pwasm_ethereum;
+extern crate bigint;
+extern crate parity_hash as hash;
 
 use pwasm_std::logger;
-use pwasm_ethereum::{input, ret, create, value};
+use pwasm_ethereum::{input, ret, create, create2, value};
+use bigint::U256;
+use hash::H256;
 
 #[no_mangle]
 pub fn call() {
-	if let Ok(addr) = create(value(), &input()) {
-		logger::debug("Created contractwith code");
-		ret(&addr[..]);
+	let mut r = [0u8; 40];
+	if let Ok(addr) = create(value() / U256::from(2), &input()) {
+		logger::debug("Created contract with code");
+		(&mut r[0..20]).copy_from_slice(&addr[..]);
 	} else {
 		logger::debug("Error creating contract");
 	}
+
+	if let Ok(addr) = create2(value() / U256::from(2), H256::default(), &input()) {
+		logger::debug("Created contract with code and salt");
+		(&mut r[0..20]).copy_from_slice(&addr[..]);
+	} else {
+		logger::debug("Error creating contract");
+	}
+
+	ret(&r[..]);
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/dispersion.rs

@@ -23,4 +23,7 @@ pub fn call() {
 	}
 
 	ret(&dispersed[..])
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/empty.rs

@@ -7,4 +7,7 @@ use pwasm_std::logger;
 #[no_mangle]
 pub fn call() {
 	logger::debug("Empty contract");
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/events.rs

@@ -20,4 +20,7 @@ pub fn call() {
 	ext::log(&[hash, H256::from(&reverse_hash[..])], &reverse_input);
 
 	ext::ret(&reverse_input);
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/externs.rs

@@ -34,3 +34,6 @@ pub fn call() {
 
 	ext::ret(&output);
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/identity.rs

@@ -5,4 +5,7 @@ extern crate pwasm_ethereum as ext;
 #[no_mangle]
 pub fn call() {
 	ext::ret(&ext::sender()[..]);
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/keccak.rs

@@ -10,3 +10,6 @@ use pwasm_ethereum::{ret, input};
 pub fn call() {
 	ret(&keccak(&input()));
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/logger.rs

@@ -32,3 +32,6 @@ pub fn call() {
 	set_key_from_addr(3, &ext::origin());
 	set_key_from_u256(4, ext::value());
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/math.rs

@@ -27,4 +27,7 @@ pub fn call() {
 
 		result_bytes
 	})
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/realloc.rs

@@ -15,4 +15,7 @@ pub fn call() {
 		}
 		data
 	});
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/rterr.rs

@@ -8,4 +8,7 @@ use pwasm_std::logger;
 pub fn call() {
 	logger::debug("Exception will occur here:");
 	unreachable!();
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/setter.rs

@@ -15,4 +15,7 @@ pub fn call() {
 		val.copy_from_slice(&ext::input()[32+i*64..64+i*64]);
 		ext::write(&key, &val);
 	}
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

src/storage_read.rs

@@ -18,3 +18,6 @@ pub fn call() {
 	let val: [u8; 32] = get_value_from_key(1);
 	ret(&val[..])
 }
+
+#[no_mangle]
+pub fn deploy() { }

src/suicidal.rs

@@ -17,4 +17,7 @@ pub fn call() {
 	} else {
 		ret(&input);
 	}
-}
+}
+
+#[no_mangle]
+pub fn deploy() { }

wasm-install.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # this script is intended to be used from .travis.yml.
 # Takes an environment variable WATERFALL_BUILD to download a