Isolate wallet-contract from workspace

near · Dec 7, 2023 · ca2211f · ca2211f
1 parent 17a7072
commit ca2211f
Show file tree

Hide file tree

Showing 9 changed files with 1,688 additions and 598 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/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",

diff --git a/integration-tests/Cargo.toml b/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",

diff --git a/runtime/near-wallet-contract/Cargo.toml b/runtime/near-wallet-contract/Cargo.toml
@@ -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",
+]
diff --git a/runtime/near-wallet-contract/res/nightly_wallet_contract.wasm b/runtime/near-wallet-contract/res/nightly_wallet_contract.wasm
diff --git a/runtime/near-wallet-contract/res/wallet_contract.wasm b/runtime/near-wallet-contract/res/wallet_contract.wasm