Isolate wallet-contract from workspace

Cargo.toml

@@ -60,7 +60,6 @@ members = [
     "runtime/near-vm-runner",
     "runtime/near-vm-runner/fuzz",
     "runtime/near-wallet-contract",
-    "runtime/near-wallet-contract/wallet-contract",
     "runtime/runtime",
     "runtime/runtime-params-estimator",
     "runtime/runtime-params-estimator/estimator-warehouse",
@@ -229,7 +228,6 @@ near-primitives-core = { path = "core/primitives-core" }
 near-rosetta-rpc = { path = "chain/rosetta-rpc" }
 near-rpc-error-core = { path = "tools/rpctypegen/core" }
 near-rpc-error-macro = { path = "tools/rpctypegen/macro" }
-near-sdk = "4.1.1"
 near-stable-hasher = { path = "utils/near-stable-hasher" }
 near-state-parts = { path = "tools/state-parts" }
 near-state-parts-dump-check = { path = "tools/state-parts-dump-check" }

integration-tests/Cargo.toml

@@ -107,6 +107,7 @@ nightly = [
   "near-telemetry/nightly",
   "near-undo-block/nightly",
   "near-vm-runner/nightly",
+  "near-wallet-contract/nightly",
   "nearcore/nightly",
   "node-runtime/nightly",
   "testlib/nightly",
@@ -132,6 +133,7 @@ nightly_protocol = [
   "near-telemetry/nightly_protocol",
   "near-undo-block/nightly_protocol",
   "near-vm-runner/nightly_protocol",
+  "near-wallet-contract/nightly_protocol",
   "nearcore/nightly_protocol",
   "node-runtime/nightly_protocol",
   "testlib/nightly_protocol",

integration-tests/src/tests/client/features/delegate_action.rs

@@ -970,18 +970,18 @@ fn meta_tx_call_wallet_contract(authorized: bool) {
     let other_public_key = SecretKey::from_seed(KeyType::SECP256K1, "test2").public_key();
 
     // Although ETH-implicit account can be zero-balance, we pick 1 here in order to make transfer later from this account.
-    let initial_amount = 1u128;
-    let actions = vec![Action::Transfer(TransferAction { deposit: initial_amount })];
+    let transfer_amount = 1u128;
+    let actions = vec![Action::Transfer(TransferAction { deposit: transfer_amount })];
+    // Create ETH-implicit account by funding it.
     node.user()
         .meta_tx(sender.clone(), eth_implicit_account.clone(), relayer.clone(), actions)
         .unwrap()
         .assert_success();
 
     let target = carol_account();
-    let transfer_amount = 1u128;
     let initial_balance = node.view_balance(&target).expect("failed looking up balance");
 
-    // TODO(eth-implicit) When `Wallet Contract` is complete, append appropriate values to the RLP stream.
+    // TODO(eth-implicit) Append appropriate values to the RLP stream when proper `Wallet Contract` is implemented.
     let mut stream = RlpStream::new_list(3);
     stream.append(&target.as_str());
     // The RLP trait `Encodable` is not implemented for `u128`. We must encode it as bytes.
@@ -1038,10 +1038,16 @@ fn meta_tx_call_wallet_contract(authorized: bool) {
 
 #[test]
 fn meta_tx_call_wallet_contract_authorized() {
+    if !checked_feature!("stable", EthImplicitAccounts, PROTOCOL_VERSION) {
+        return;
+    }
     meta_tx_call_wallet_contract(true);
 }
 
 #[test]
 fn meta_tx_call_wallet_contract_unauthorized() {
+    if !checked_feature!("stable", EthImplicitAccounts, PROTOCOL_VERSION) {
+        return;
+    }
     meta_tx_call_wallet_contract(false);
 }

runtime/near-vm/tests/lib/compiler-test-derive/src/lib.rs.orig

@@ -1,5 +1,8 @@
+<<<<<<< HEAD
+=======
 #[cfg(not(test))]
 extern crate proc_macro;
+>>>>>>> 27e96cad2 (compiler-test-derive: Switch to proc_macro exclusively)
 use proc_macro::TokenStream;
 use quote::quote;
 use std::path::PathBuf;

runtime/near-wallet-contract/Cargo.toml

@@ -4,7 +4,7 @@ version.workspace = true
 authors.workspace = true
 edition.workspace = true
 rust-version.workspace = true
-description = "Builds and exposes a temporary Wallet Contract wasm file."
+description = "Builds and exposes Wallet Contract code."
 repository.workspace = true
 license.workspace = true
 publish = false
@@ -20,4 +20,10 @@ wasm-encoder.workspace = true
 wasm-smith.workspace = true
 
 [features]
-nightly = []
+nightly_protocol = [
+  "near-vm-runner/nightly_protocol",
+]
+nightly = [
+  "nightly_protocol",
+  "near-vm-runner/nightly",
+]