wip

Author: ilyar

Makefile

@@ -0,0 +1,15 @@
+debot-browser/pkg:
+	cd builder && cargo run --release
+demo/node_modules:
+	cd demo && npm install
+release-pkg: debot-browser/pkg
+	cd debot-browser/pkg && npm publish --access public
+gh-local:
+	git clone --depth=1 --branch=demo git@github.com:ever-guild/debot-browser.git gh-local
+release-demo: debot-browser/pkg demo/node_modules gh-local
+	cd demo && npm run build
+	git -C gh-local rm -rf .
+	git clean -C gh-local -fxd
+	cp -r demo/dist/ gh-pages/
+start: debot-browser/pkg test-server/node_modules
+	cd test-server && npm run start

README.md

@@ -1,9 +1,6 @@
 <div align="center">
-
-  <h1><code>Cli Debot Browser</code></h1>
-
-  <strong>A standalone console Debot Browser written in Rust and compiled as WebAssembly.</strong>
-
+  <h1><code>Debot browser</code></h1>
+  <strong>A standalone console Debot browser written in Rust and compiled as WebAssembly.</strong>
 </div>
 
 ## How to use

debot-browser/Cargo.toml

@@ -1,26 +1,24 @@
 [package]
-authors = ["TON Labs <support@tonlabs.io>"]
+authors = ["Ever Guild"]
 edition = "2018"
 name = "debot-browser"
-version = "0.5.5"
-description = "Standalone cli DeBot Browser"
-repository = "https://github.com/tonlabs/rust-debot-browser"
+version = "0.6.0-rc.0"
+description = "Standalone debot browser"
+repository = "https://github.com/ever-guild/debot-browser"
 license = "Apache-2.0"
 keywords = [
     "debot browser",
     "debot",
     "browser",
     "wasm",
-    "tonlabs",
-    "Surf",
-    "Everscale",
+    "tvm",
 ]
 
 [lib]
 crate-type = ["cdylib", "rlib"]
 
 [features]
-default = [] # "console_error_panic_hook", 
+default = [] # "console_error_panic_hook",
 
 [dependencies.web-sys]
 version = "0.3"
@@ -34,32 +32,27 @@ base64 = '0.10.1'
 # all the `std::fmt` and `std::panicking` infrastructure, so isn't great for
 # code size when deploying.
 console_error_panic_hook = { version = "0.1.6", optional = true }
-hex = "0.3.2"
-js-sys = "0.3.55"
-lazy_static = "1.1.0"
-log = { version = "0.4.11", features = ["std"] }
-num-bigint = "0.4"
-num-traits = "0.2"
-serde = { version = "1.0", features = ["derive"] }
-serde_derive = "1.0"
-serde_json = "1.0"
-rand = "0.7.3"
-regex = "1.5.4"
-serde-wasm-bindgen = "0.3.1"
-tokio = { version = "0.2.13", features = [
-    "sync",
-    "stream",
-], default-features = false }
-
-ton_client = { git = 'https://github.com/tonlabs/TON-SDK.git', tag = '1.32.0', default-features = false, features = [
+hex = "0.4.3"
+js-sys = "0.3.62"
+lazy_static = "1.4.0"
+log = { version = "0.4.17", features = ["std"] }
+num-bigint = "0.4.3"
+num-traits = "0.2.15"
+serde = { version = "1.0.163", features = ["derive"] }
+serde_derive = "1.0.163"
+serde_json = "1.0.96"
+rand = "0.8.5"
+regex = "1.8.1"
+serde-wasm-bindgen = "0.5.0"
+tokio = "^1"
+wasm-bindgen = "0.2.85"
+wasm-bindgen-futures = "0.4.35"
+ton_client = { git = 'https://github.com/tonlabs/ever-sdk.git', tag = '1.42.1', default-features = false, features = [
     "wasm",
 ] }
 
-wasm-bindgen = "0.2.77"
-wasm-bindgen-futures = "0.4.27"
-
 [dev-dependencies]
-wasm-bindgen-test = "0.3.26"
+wasm-bindgen-test = "0.3.35"
 
 [package.metadata.wasm-pack.profile.release]
 wasm-opt = ['-Os']
@@ -71,4 +64,4 @@ opt-level = "s"
 
 [dependencies.clear_on_drop]
 features = ["no_cc"]
-version = "0.2"      #This version should match the version that the ed25519-dalek crate depends on.
+version = "0.2" # This version should match the version that the ed25519-dalek crate depends on.

debot-browser/README.md

@@ -1,15 +1,17 @@
+<p align="center">
+  <a href="https://github.com/ever-guild/debots">
+    <img src="https://raw.githubusercontent.com/ever-guild/debot/main/asset/debot.svg" height="60"/>
+  </a>
+</p>
 <h1 align="center">
-  <code>Standalone cli DeBot Browser</code>
+  <code>Debot browser</code>
 </h1>
 
 <p align="center">
-  Standalone DeBot Browser written in Rust and compiled as WebAssembly
-  <br />
-  <br />
-    
+  Standalone Debot browser written in Rust and compiled as WebAssembly
 </p>
 
-# Cli DeBot Browser
+# Debot Browser
 
 ## Purpose
 
@@ -19,8 +21,8 @@ Run any DeBot in your website using DeBot Browser as Service.
 
 To get started, install `debot-browser`:
 
-```sh
-npm i debot-browser
+```shell
+npm install @ever-guild/debot-browser
 ```
 
 Run DeBot:
@@ -158,4 +160,4 @@ let manifest = `{
     await browser.destroy_browser(browserHandle);
 
 });
-```
+```

debot-browser/src/crypto.rs

@@ -13,19 +13,7 @@
 use crate::helpers::{create_client_local, WORD_COUNT, HD_PATH};
 #[cfg(not(target_arch = "wasm32"))]
 use crate::helpers::read_keys;
-use ton_client::crypto::{
-    KeyPair,
-    mnemonic_from_random,
-    hdkey_xprv_from_mnemonic,
-    hdkey_secret_from_xprv,
-    nacl_sign_keypair_from_secret_key,
-    hdkey_derive_from_xprv_path,
-    ParamsOfHDKeySecretFromXPrv,
-    ParamsOfHDKeyDeriveFromXPrvPath,
-    ParamsOfHDKeyXPrvFromMnemonic,
-    ParamsOfNaclSignKeyPairFromSecret,
-    ParamsOfMnemonicFromRandom
-};
+use ton_client::crypto::{KeyPair, mnemonic_from_random, hdkey_xprv_from_mnemonic, hdkey_secret_from_xprv, nacl_sign_keypair_from_secret_key, hdkey_derive_from_xprv_path, ParamsOfHDKeySecretFromXPrv, ParamsOfHDKeyDeriveFromXPrvPath, ParamsOfHDKeyXPrvFromMnemonic, ParamsOfNaclSignKeyPairFromSecret, ParamsOfMnemonicFromRandom, MnemonicDictionary};
 
 #[cfg(not(target_arch = "wasm32"))]
 pub fn load_keypair(keys: &str) -> Result<KeyPair, String> {
@@ -48,7 +36,7 @@ pub fn gen_seed_phrase() -> Result<String, String> {
     mnemonic_from_random(
         client,
         ParamsOfMnemonicFromRandom {
-            dictionary: Some(1),
+            dictionary: Some(MnemonicDictionary::English),
             word_count: Some(WORD_COUNT),
             ..Default::default()
         },
@@ -62,7 +50,7 @@ pub fn generate_keypair_from_mnemonic(mnemonic: &str) -> Result<KeyPair, String>
     let hdk_master = hdkey_xprv_from_mnemonic(
         client.clone(),
         ParamsOfHDKeyXPrvFromMnemonic {
-            dictionary: Some(1),
+            dictionary: Some(MnemonicDictionary::English),
             word_count: Some(WORD_COUNT),
             phrase: mnemonic.to_string(),
             ..Default::default()

debot-browser/src/helpers.rs

@@ -14,7 +14,7 @@ use crate::config::Config;
 use std::sync::Arc;
 use ton_client::abi::{
     Abi, AbiConfig, AbiContract};
-use ton_client::crypto::{CryptoConfig};
+use ton_client::crypto::{CryptoConfig, MnemonicDictionary};
 use ton_client::{ClientConfig, ClientContext};
 
 pub const HD_PATH: &str = "m/44'/396'/0'/0/0";
@@ -53,7 +53,7 @@ pub fn create_client(conf: &Config) -> Result<TonClient, String> {
             message_expiration_timeout_grow_factor: 1.3,
         },
         crypto: CryptoConfig {
-            mnemonic_dictionary: 1,
+            mnemonic_dictionary: MnemonicDictionary::English,
             mnemonic_word_count: WORD_COUNT,
             hdkey_derivation_path: HD_PATH.to_string(),
         },

debot-browser/src/term_browser.rs

@@ -36,7 +36,7 @@ struct DebotEntry {
 
 /// Top level object. Created only once.
 pub struct TerminalBrowser {
-    /// Instance of SDK client. 
+    /// Instance of SDK client.
     pub client: TonClient,
     /// User Information used by UserInfo interface
     pub user_settings: SharedUserSettings,
@@ -51,7 +51,7 @@ pub struct TerminalBrowser {
     callbacks: Arc<Callbacks>,
     /// Set of intrefaces implemented by current DBrowser.
     interfaces: SupportedInterfaces,
-    /// Input chain Processor for Debot Manifest 
+    /// Input chain Processor for Debot Manifest
     processor: Arc<tokio::sync::RwLock<ChainProcessor>>,
     /// Indicates if Browser will interact with the user or not.
     interactive: bool,
@@ -66,7 +66,7 @@ impl TerminalBrowser {
         addr: String,
     ) -> Result<Self, String> {
         let processor = Arc::new(tokio::sync::RwLock::new(ChainProcessor::new()));
-        
+
         let callbacks = Arc::new(
             Callbacks::new(
                 client.clone(),
@@ -77,14 +77,14 @@ impl TerminalBrowser {
         let user_settings = make_shared_settings(user_settings);
 
         let interfaces = SupportedInterfaces::new(
-            client.clone(), 
+            client.clone(),
             user_settings.clone(),
             processor.clone(),
         );
 
         // TODO remove clone
         let main_debot_addr = addr.clone();
-        
+
         let mut browser = Self {
             client,
             user_settings,
@@ -121,7 +121,7 @@ impl TerminalBrowser {
         let abi_version = info.dabi_version.clone();
         let abi_ref = info.dabi.as_ref();
         let abi = load_abi(&abi_ref.ok_or(format!("DeBot ABI is not defined"))?)?;
-        
+
         if call_start {
             let mut run_debot = autorun;
             if !autorun {
@@ -233,7 +233,7 @@ impl TerminalBrowser {
 
             if wc == DEBOT_WC {
                 if id == BROWSER_ID {
-                    info!("Message from DeBot to Browser"); 
+                    info!("Message from DeBot to Browser");
                     self.set_exit_arg(msg, msg_src).await?;
                 } else {
                     self.call_interface(msg, &id, msg_src).await?;
@@ -251,13 +251,13 @@ impl TerminalBrowser {
         let (start, call_set, mut init_message) = {
             let mut processor = self.processor.write().await;
             processor.load_manifest(manifest);
-            ( 
+            (
                 processor.default_start(),
                 processor.initial_call_set(),
                 processor.initial_msg()
             )
         };
-        
+
         self.exit_arg = None;
 
         let abi = self.bots.get(&self.main_debot_addr)
@@ -297,7 +297,7 @@ impl TerminalBrowser {
         println!("DeBot Info:");
         fn print<'a>(field: &'a Option<String>) -> &'a str {
             field.as_ref().map(|v| v.as_str()).unwrap_or("None")
-        } 
+        }
         println!("Name   : {}", print(&info.name));
         println!("Version: {}", print(&info.version));
         println!("Author : {}", print(&info.author));
@@ -312,7 +312,7 @@ impl TerminalBrowser {
         let arg = if let Some(abi) = abi {
             let decoded = decode_message(
                 self.client.clone(),
-                ParamsOfDecodeMessage { abi, message },
+                ParamsOfDecodeMessage { abi, message, allow_partial: false, function_name: None, data_layout: None },
             ).await.map_err(|e| format!("{}", e))?;
             decoded.value.unwrap_or(json!({}))
         } else {

demo/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

demo/index.html

@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="https://raw.githubusercontent.com/ever-guild/debot/main/asset/debot.svg" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Debot browser</title>
+  </head>
+  <body>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>