Merge pull request #5350 from mpapierski/vm2-discoverability

VM2 discoverability

Author: mpapierski

.github/workflows/casper-node.yml

@@ -68,6 +68,6 @@ jobs:
 
       - name: vm2 tests
         run: |
-          ./vm2-build-contracts.sh
+          make build-vm2-contracts-rs
           cargo test -p casper-executor-wasm
           cargo test -p casper-contract-sdk

Cargo.lock

@@ -51,11 +51,6 @@ exclude = ["utils/nctl/remotes/casper-client-rs"]
 
 resolver = "2"
 
-# Include debug symbols in the release build of `casper-engine-tests` so that `simple-transfer` will yield useful
-# perf data.
-[profile.release.package.casper-engine-tests]
-debug = true
-
 [profile.release]
 codegen-units = 1
 lto = true

Cargo.toml

@@ -25,8 +25,7 @@ build-contract-rs/%:
 	cd smart_contracts/contracts && RUSTFLAGS=$(RUSTC_FLAGS) $(CARGO) build --verbose --release $(filter-out --release, $(CARGO_FLAGS)) --package $*
 
 build-vm2-contract-rs/%:
-	RUSTFLAGS=$(RUSTC_FLAGS) $(CARGO) run -p vm2-cargo-casper --bin vm2-cargo-casper -- build-schema --allow-skipping-abi-schema --package $*
-	cd smart_contracts/contracts/vm2 && RUSTFLAGS=$(RUSTC_FLAGS) $(CARGO) build --verbose --release $(filter-out --release, $(CARGO_FLAGS)) --package $*
+	RUSTFLAGS=$(RUSTC_FLAGS) $(CARGO) run -p vm2-cargo-casper --bin vm2-cargo-casper -- build --allow-skipping-abi-schema --package $*
 
 .PHONY: build-vm2-contracts-rs
 build-vm2-contracts-rs: $(patsubst %, build-vm2-contract-rs/%, $(VM2_CONTRACTS))

Makefile

@@ -763,7 +763,8 @@ where
             | StoredValue::MessageTopic(_)
             | StoredValue::Message(_)
             | StoredValue::Prepayment(_)
-            | StoredValue::EntryPoint(_) => Ok(()),
+            | StoredValue::EntryPoint(_)
+            | StoredValue::TypeDef(_) => Ok(()),
         }
     }
 

execution_engine/src/runtime_context/mod.rs

@@ -663,14 +663,14 @@ fn faucet_costs() {
     // This test will fail if execution costs vary.  The expected costs should not be updated
     // without understanding why the cost has changed.  If the costs do change, it should be
     // reflected in the "Costs by Entry Point" section of the faucet crate's README.md.
-    const EXPECTED_FAUCET_INSTALL_COST: u64 = 149_415_277_468;
+    const EXPECTED_FAUCET_INSTALL_COST: u64 = 151_604_674_976;
     const EXPECTED_FAUCET_INSTALL_COST_ALT: u64 = 149_230_872_143;
 
-    const EXPECTED_FAUCET_SET_VARIABLES_COST: u64 = 79_455_975;
+    const EXPECTED_FAUCET_SET_VARIABLES_COST: u64 = 79_484_390;
 
-    const EXPECTED_FAUCET_CALL_BY_INSTALLER_COST: u64 = 2_652_626_533;
+    const EXPECTED_FAUCET_CALL_BY_INSTALLER_COST: u64 = 2_652_651_263;
 
-    const EXPECTED_FAUCET_CALL_BY_USER_COST: u64 = 2_558_318_531;
+    const EXPECTED_FAUCET_CALL_BY_USER_COST: u64 = 2_558_372_626;
 
     let installer_account = AccountHash::new([1u8; 32]);
     let user_account: AccountHash = AccountHash::new([2u8; 32]);

execution_engine_testing/tests/src/test/explorer/faucet.rs

@@ -16,6 +16,7 @@ casper-executor-wasm-common = { version = "0.1.3", path = "../wasm_common" }
 casper-executor-wasm-host = { version = "0.1.3", path = "../wasm_host" }
 casper-executor-wasm-interface = { version = "0.1.3", path = "../wasm_interface" }
 casper-executor-wasmer-backend = { version = "0.1.3", path = "../wasmer_backend" }
+casper-contract-sdk = { version = "0.1.3", path = "../../smart_contracts/vm2/sdk" }
 casper-storage = { version = "3.0.0", path = "../../storage" }
 casper-types = { version = "7.0.0", path = "../../types", features = ["std"] }
 casper-execution-engine = { version = "8.1.1", path = "../../execution_engine", features = [
@@ -42,4 +43,4 @@ casper-executor-wasm ={ path = "../wasm", features = ["testing"] }
 casper-wasm = "1.0.0"
 
 [features]
-testing = ["tempfile", "once_cell", "fs_extra", "serde_json", "itertools"]
+testing = ["tempfile", "once_cell", "fs_extra", "serde_json", "itertools"]