feat!: worker.dev_create_account, worker.dev_deploy create subaccounts of root account instead of tla (sandbox, testnet)

workspaces/src/network/mod.rs

@@ -24,7 +24,5 @@ pub use self::mainnet::Mainnet;
 pub use self::sandbox::Sandbox;
 pub use self::server::{pick_unused_port, ValidatorKey};
 pub use self::testnet::Testnet;
-pub use self::variants::{
-    AllowDevAccountCreation, NetworkClient, NetworkInfo, TopLevelAccountCreator,
-};
+pub use self::variants::{AllowDevAccountCreation, DevAccountCreator, NetworkClient, NetworkInfo};
 pub use config::set_sandbox_genesis;

workspaces/src/network/sandbox.rs

@@ -9,7 +9,7 @@ use near_sandbox_utils as sandbox;
 
 use super::builder::{FromNetworkBuilder, NetworkBuilder};
 use super::server::ValidatorKey;
-use super::{AllowDevAccountCreation, NetworkClient, NetworkInfo, TopLevelAccountCreator};
+use super::{AllowDevAccountCreation, DevAccountCreator, NetworkClient, NetworkInfo};
 use crate::error::SandboxErrorCode;
 use crate::network::server::SandboxServer;
 use crate::network::Info;
@@ -131,8 +131,8 @@ impl FromNetworkBuilder for Sandbox {
 impl AllowDevAccountCreation for Sandbox {}
 
 #[async_trait]
-impl TopLevelAccountCreator for Sandbox {
-    async fn create_tla(
+impl DevAccountCreator for Sandbox {
+    async fn create_dev_account(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,
@@ -151,7 +151,7 @@ impl TopLevelAccountCreator for Sandbox {
         })
     }
 
-    async fn create_tla_and_deploy(
+    async fn create_dev_account_and_deploy(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,

workspaces/src/network/testnet.rs

@@ -7,9 +7,10 @@ use url::Url;
 
 use near_primitives::views::ExecutionStatusView;
 
+use crate::error::ErrorKind;
 use crate::network::builder::{FromNetworkBuilder, NetworkBuilder};
 use crate::network::Info;
-use crate::network::{AllowDevAccountCreation, NetworkClient, NetworkInfo, TopLevelAccountCreator};
+use crate::network::{AllowDevAccountCreation, DevAccountCreator, NetworkClient, NetworkInfo};
 use crate::result::{Execution, ExecutionDetails, ExecutionFinalResult, ExecutionOutcome, Result};
 use crate::rpc::{client::Client, tool};
 use crate::types::{AccountId, InMemorySigner, NearToken, SecretKey};
@@ -18,7 +19,7 @@ use crate::{Account, Contract, CryptoHash, Network, Worker};
 /// URL to the testnet RPC node provided by near.org.
 pub const RPC_URL: &str = "https://rpc.testnet.near.org";
 
-/// URL to the helper contract used to create top-level-accounts (TLA) provided by near.org.
+/// URL to the helper contract used to create named accounts provided by near.org.
 pub const HELPER_URL: &str = "https://helper.testnet.near.org";
 
 /// URL to the testnet archival RPC node provided by near.org.
@@ -67,15 +68,25 @@ impl std::fmt::Debug for Testnet {
 impl AllowDevAccountCreation for Testnet {}
 
 #[async_trait]
-impl TopLevelAccountCreator for Testnet {
-    async fn create_tla(
+impl DevAccountCreator for Testnet {
+    async fn create_dev_account(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,
         sk: SecretKey,
         // TODO: return Account only, but then you don't get metadata info for it...
     ) -> Result<Execution<Account>> {
         let url = Url::parse(HELPER_URL).unwrap();
+        //only registrar can create tla on testnet, so must concatenate random created id with .testnet
+        let id = if self.info().name.eq("testnet") {
+            AccountId::from_str(format!("{}.testnet", id.as_str()).as_str())
+                .map_err(|e| ErrorKind::DataConversion.custom(e))?
+        } else {
+            return Err(ErrorKind::Other.message(format!(
+                "Invalid network. Expected testnet, but got {}",
+                self.info().name
+            )));
+        };
         tool::url_create_account(url, id.clone(), sk.public_key()).await?;
         let signer = InMemorySigner::from_secret_key(id, sk);
 
@@ -104,15 +115,15 @@ impl TopLevelAccountCreator for Testnet {
         })
     }
 
-    async fn create_tla_and_deploy(
+    async fn create_dev_account_and_deploy(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,
         sk: SecretKey,
         wasm: &[u8],
     ) -> Result<Execution<Contract>> {
         let signer = InMemorySigner::from_secret_key(id.clone(), sk.clone());
-        let account = self.create_tla(worker, id.clone(), sk).await?;
+        let account = self.create_dev_account(worker, id.clone(), sk).await?;
 
         let outcome = self.client().deploy(&signer, &id, wasm.into()).await?;
 

workspaces/src/network/variants.rs

@@ -16,15 +16,15 @@ pub trait NetworkInfo {
 }
 
 #[async_trait]
-pub trait TopLevelAccountCreator {
-    async fn create_tla(
+pub trait DevAccountCreator {
+    async fn create_dev_account(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,
         sk: SecretKey,
     ) -> Result<Execution<Account>>;
 
-    async fn create_tla_and_deploy(
+    async fn create_dev_account_and_deploy(
         &self,
         worker: Worker<dyn Network>,
         id: AccountId,
@@ -39,12 +39,16 @@ pub trait AllowDevAccountCreation {}
 
 impl<T> Worker<T>
 where
-    T: DevNetwork + TopLevelAccountCreator + 'static,
+    T: DevNetwork + DevAccountCreator + 'static,
 {
-    pub async fn create_tla(&self, id: AccountId, sk: SecretKey) -> Result<Execution<Account>> {
+    pub async fn create_dev_account(
+        &self,
+        id: AccountId,
+        sk: SecretKey,
+    ) -> Result<Execution<Account>> {
         let res = self
             .workspace
-            .create_tla(self.clone().coerce(), id, sk)
+            .create_dev_account(self.clone().coerce(), id, sk)
             .await?;
 
         for callback in self.tx_callbacks.iter() {
@@ -54,15 +58,15 @@ where
         Ok(res)
     }
 
-    pub async fn create_tla_and_deploy(
+    pub async fn create_dev_account_and_deploy(
         &self,
         id: AccountId,
         sk: SecretKey,
         wasm: &[u8],
     ) -> Result<Execution<Contract>> {
         let res = self
             .workspace
-            .create_tla_and_deploy(self.clone().coerce(), id, sk, wasm)
+            .create_dev_account_and_deploy(self.clone().coerce(), id, sk, wasm)
             .await?;
 
         for callback in self.tx_callbacks.iter() {
@@ -92,13 +96,15 @@ where
     ///
     pub async fn dev_create_account(&self) -> Result<Account> {
         let (id, sk) = self.dev_generate().await;
-        let account = self.create_tla(id.clone(), sk).await?;
+        let account = self.create_dev_account(id.clone(), sk).await?;
         Ok(account.into_result()?)
     }
 
     pub async fn dev_deploy(&self, wasm: &[u8]) -> Result<Contract> {
         let (id, sk) = self.dev_generate().await;
-        let contract = self.create_tla_and_deploy(id.clone(), sk, wasm).await?;
+        let contract = self
+            .create_dev_account_and_deploy(id.clone(), sk, wasm)
+            .await?;
         Ok(contract.into_result()?)
     }
 }
@@ -110,9 +116,6 @@ pub trait Network: NetworkInfo + NetworkClient + Send + Sync {}
 impl<T> Network for T where T: NetworkInfo + NetworkClient + Send + Sync {}
 
 /// DevNetwork is a Network that can call into `dev_create` and `dev_deploy` to create developer accounts.
-pub trait DevNetwork: TopLevelAccountCreator + AllowDevAccountCreation + Network + 'static {}
+pub trait DevNetwork: DevAccountCreator + AllowDevAccountCreation + Network + 'static {}
 
-impl<T> DevNetwork for T where
-    T: TopLevelAccountCreator + AllowDevAccountCreation + Network + 'static
-{
-}
+impl<T> DevNetwork for T where T: DevAccountCreator + AllowDevAccountCreation + Network + 'static {}

workspaces/src/prelude.rs

@@ -1,3 +1,3 @@
 //! All traits that are essential to the ease of use of workspaces.
 
-pub use crate::network::TopLevelAccountCreator;
+pub use crate::network::DevAccountCreator;

workspaces/tests/account.rs

@@ -8,7 +8,7 @@ use std::path::Path;
 
 #[test(tokio::test)]
 async fn test_subaccount_creation() -> anyhow::Result<()> {
-    let worker = near_workspaces::sandbox().await?;
+    let worker = near_workspaces::testnet().await?;
     let account = worker.dev_create_account().await?;
 
     let sub = account

workspaces/tests/gas_meter.rs

@@ -15,7 +15,7 @@ async fn test_gas_meter_with_single_transaction() -> anyhow::Result<()> {
     let status_msg = {
         let (id, sk) = worker.dev_generate().await;
         let contract = worker
-            .create_tla_and_deploy(
+            .create_dev_account_and_deploy(
                 id.clone(),
                 sk,
                 include_bytes!("../../examples/res/status_message.wasm"),
@@ -29,7 +29,7 @@ async fn test_gas_meter_with_single_transaction() -> anyhow::Result<()> {
     // analogous to: worker.dev_create_account().await?;
     let account = {
         let (id, sk) = worker.dev_generate().await;
-        let account = worker.create_tla(id.clone(), sk).await?;
+        let account = worker.create_dev_account(id.clone(), sk).await?;
         total_gas += account.details.total_gas_burnt.as_gas();
 
         account.into_result()?
@@ -59,7 +59,7 @@ async fn test_gas_meter_with_multiple_transactions() -> anyhow::Result<()> {
     let status_msg = {
         let (id, sk) = worker.dev_generate().await;
         let contract = worker
-            .create_tla_and_deploy(
+            .create_dev_account_and_deploy(
                 id.clone(),
                 sk,
                 include_bytes!("../../examples/res/status_message.wasm"),
@@ -73,7 +73,7 @@ async fn test_gas_meter_with_multiple_transactions() -> anyhow::Result<()> {
     // analogous to: worker.dev_create_account().await?;
     let account = {
         let (id, sk) = worker.dev_generate().await;
-        let account = worker.create_tla(id.clone(), sk).await?;
+        let account = worker.create_dev_account(id.clone(), sk).await?;
         total_gas += account.details.total_gas_burnt.as_gas();
 
         account.into_result()?
@@ -112,7 +112,7 @@ async fn test_gas_meter_with_parallel_transactions() -> anyhow::Result<()> {
     let status_msg = {
         let (id, sk) = worker.dev_generate().await;
         let contract = worker
-            .create_tla_and_deploy(
+            .create_dev_account_and_deploy(
                 id.clone(),
                 sk,
                 include_bytes!("../../examples/res/status_message.wasm"),
@@ -126,7 +126,7 @@ async fn test_gas_meter_with_parallel_transactions() -> anyhow::Result<()> {
     // analogous to: worker.dev_create_account().await?;
     let account = {
         let (id, sk) = worker.dev_generate().await;
-        let account = worker.create_tla(id.clone(), sk).await?;
+        let account = worker.create_dev_account(id.clone(), sk).await?;
         total_gas += account.details.total_gas_burnt.as_gas();
 
         account.into_result()?
@@ -170,7 +170,7 @@ async fn test_gas_meter_with_multiple_transactions_and_view() -> anyhow::Result<
     let status_msg = {
         let (id, sk) = worker.dev_generate().await;
         let contract = worker
-            .create_tla_and_deploy(
+            .create_dev_account_and_deploy(
                 id.clone(),
                 sk,
                 include_bytes!("../../examples/res/status_message.wasm"),
@@ -184,7 +184,7 @@ async fn test_gas_meter_with_multiple_transactions_and_view() -> anyhow::Result<
     // analogous to: worker.dev_create_account().await?;
     let account = {
         let (id, sk) = worker.dev_generate().await;
-        let account = worker.create_tla(id.clone(), sk).await?;
+        let account = worker.create_dev_account(id.clone(), sk).await?;
         total_gas += account.details.total_gas_burnt.as_gas();
 
         account.into_result()?
@@ -233,7 +233,7 @@ async fn test_gas_meter_batch_tx() -> anyhow::Result<()> {
     let contract = {
         let (id, sk) = worker.dev_generate().await;
         let contract = worker
-            .create_tla_and_deploy(
+            .create_dev_account_and_deploy(
                 id.clone(),
                 sk,
                 include_bytes!("../../examples/res/status_message.wasm"),
@@ -291,7 +291,7 @@ async fn test_gas_meter_create_account_transaction() -> anyhow::Result<()> {
     // analogous to: worker.dev_create_account().await?;
     let account = {
         let (id, sk) = worker.dev_generate().await;
-        let account = worker.create_tla(id.clone(), sk).await?;
+        let account = worker.create_dev_account(id.clone(), sk).await?;
         total_gas += account.details.total_gas_burnt.as_gas();
 
         account.into_result()?