create-near-app 6.1.0 → 6.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-near-app",
-  "version": "6.1.0",
+  "version": "6.2.0",
   "description": "Quickly scaffold your dApp on NEAR Blockchain",
   "main": "index.js",
   "engines": {

package/templates/contracts/rs/rust-toolchain.toml

@@ -1,2 +1,4 @@
 [toolchain]
-channel = "1.69"
+channel = "1.73.0"
+components = ["rustfmt"]
+targets = ["wasm32-unknown-unknown"]

package/templates/contracts/ts/package.json

@@ -9,7 +9,7 @@
   "scripts": {
     "build": "near-sdk-js build src/contract.ts build/hello_near.wasm",
     "deploy": "near dev-deploy --wasmFile build/hello_near.wasm",
-    "test": "$npm_execpath run build && cd sandbox-ts && $npm_execpath run test -- ../build/hello_near.wasm",
+    "test": "$npm_execpath run build && cd sandbox-ts && $npm_execpath run test -- -- ../build/hello_near.wasm",
     "postinstall": "cd sandbox-ts && $npm_execpath install"
   },
   "dependencies": {

package/templates/sandbox-tests/sandbox-rs/Cargo.toml

@@ -5,18 +5,10 @@ publish = false
 edition = "2021"
 
 [dev-dependencies]
-anyhow = "1.0"
-borsh = "0.9"
-maplit = "1.0"
-near-units = "0.2.0"
 tokio = { version = "1.18.1", features = ["full"] }
-tracing = "0.1"
-tracing-subscriber = { version = "0.3.11", features = ["env-filter"] }
-workspaces = "0.6.0"
-pkg-config = "0.3.1"
+near-workspaces = "0.9.0"
 serde_json = { version = "1.0", features = ["arbitrary_precision"] }
-# arbitrary_precision enabled for u128 types that workspaces requires for Balance types
 
 [[example]]
 name = "sandbox"
-path = "src/tests.rs"
+path = "src/tests.rs"

package/templates/sandbox-tests/sandbox-rs/src/tests.rs

@@ -1,65 +1,64 @@
-use std::{env, fs};
-use near_units::parse_near;
+use near_workspaces::{types::NearToken, Account, Contract};
 use serde_json::json;
-use workspaces::{Account, Contract};
-
+use std::{env, fs};
+ 
 #[tokio::main]
-async fn main() -> anyhow::Result<()> {
+async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let wasm_arg: &str = &(env::args().nth(1).unwrap());
     let wasm_filepath = fs::canonicalize(env::current_dir()?.join(wasm_arg))?;
-
-    let worker = workspaces::sandbox().await?;
+ 
+    let worker = near_workspaces::sandbox().await?;
     let wasm = std::fs::read(wasm_filepath)?;
     let contract = worker.dev_deploy(&wasm).await?;
-
+ 
     // create accounts
     let account = worker.dev_create_account().await?;
     let alice = account
-        .create_subaccount( "alice")
-        .initial_balance(parse_near!("30 N"))
+        .create_subaccount("alice")
+        .initial_balance(NearToken::from_near(30))
         .transact()
         .await?
         .into_result()?;
-
+ 
     // begin tests
     test_default_message(&alice, &contract).await?;
     test_changes_message(&alice, &contract).await?;
     Ok(())
 }
-
+ 
 async fn test_default_message(
     user: &Account,
     contract: &Contract,
-) -> anyhow::Result<()> {
+) -> Result<(), Box<dyn std::error::Error>> {
     let greeting: String = user
-        .call( contract.id(), "get_greeting")
+        .call(contract.id(), "get_greeting")
         .args_json(json!({}))
         .transact()
         .await?
         .json()?;
-
+ 
     assert_eq!(greeting, "Hello".to_string());
     println!("      Passed ✅ gets default greeting");
     Ok(())
 }
-
+ 
 async fn test_changes_message(
     user: &Account,
     contract: &Contract,
-) -> anyhow::Result<()> {
+) -> Result<(), Box<dyn std::error::Error>> {
     user.call(contract.id(), "set_greeting")
         .args_json(json!({"greeting": "Howdy"}))
         .transact()
         .await?
         .into_result()?;
-
+ 
     let greeting: String = user
         .call(contract.id(), "get_greeting")
         .args_json(json!({}))
         .transact()
         .await?
         .json()?;
-
+ 
     assert_eq!(greeting, "Howdy".to_string());
     println!("      Passed ✅ changes greeting");
     Ok(())