Merge pull request #30 from hyperledger-solang/develop

feat(soroban): support compile, deploy and invoke

Author: salaheldinsoliman

.gitignore

@@ -148,7 +148,6 @@ flycheck_*.el
 *.tif
 
 # Scalable Vector Graphics
-*.svg
 *.svgz
 
 # Portable Document Format
@@ -507,4 +506,4 @@ $RECYCLE.BIN/
 
 package-lock.json
 
-packages/_generated/*/src
+packages/_generated/*/src

DeployAndRun1.png

@@ -1,5 +1,5 @@
 # Start from a rust base image
-FROM rust:1.83.0 as base
+FROM rust:1.86.0 as base
 
 # Set the current directory
 WORKDIR /app
@@ -20,13 +20,16 @@ RUN cargo install cargo-make
 RUN apt-get --yes update
 RUN apt-get --yes upgrade
 ENV NVM_DIR /usr/local/nvm
-ENV NODE_VERSION v18.16.1
+ENV NODE_VERSION v22.14.0
 RUN mkdir -p /usr/local/nvm && apt-get update && echo "y" | apt-get install curl
 RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash
 RUN /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION"
 ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/bin
 ENV PATH $NODE_PATH:$PATH
 
+# Create public directory if it doesn't exist
+RUN mkdir -p /app/packages/frontend/public
+
 # Install dependencies
 RUN cargo make deps-wasm
 RUN cargo make deps-npm
@@ -35,6 +38,7 @@ RUN cargo make deps-npm
 RUN cargo make build-server
 RUN cargo make build-bindings
 RUN cargo make build-app
+RUN cargo make build-frontend
 RUN cargo make build-backend
 
 
@@ -45,8 +49,21 @@ FROM nestybox/ubuntu-jammy-systemd-docker:latest
 
 # Copy the built files
 COPY --from=builder /app/packages/app/dist /app/packages/app/dist
+COPY --from=builder /app/packages/frontend/.next /app/packages/frontend/.next
+COPY --from=builder /app/packages/frontend/public /app/packages/frontend/public
+COPY --from=builder /app/packages/frontend/package.json /app/packages/frontend/package.json
 COPY --from=builder /app/target/release/backend /app/target/release/backend
 
+# Install Node.js in the final image for running Next.js
+RUN apt-get update && apt-get install -y curl
+ENV NVM_DIR /usr/local/nvm
+ENV NODE_VERSION v22.14.0
+RUN mkdir -p /usr/local/nvm
+RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.2/install.sh | bash
+RUN /bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION && nvm use --delete-prefix $NODE_VERSION"
+ENV NODE_PATH $NVM_DIR/versions/node/$NODE_VERSION/bin
+ENV PATH $NODE_PATH:$PATH
+
 # Startup scripts
 COPY sysbox/on-start.sh /usr/bin
 RUN chmod +x /usr/bin/on-start.sh

Dockerfile

@@ -4,7 +4,7 @@ skip_core_tasks = true
 
 [tasks.deps-wasm]
 script = '''
-cargo install -f wasm-bindgen-cli --version 0.2.99
+cargo install wasm-bindgen-cli
 '''
 
 [tasks.deps-npm]
@@ -14,7 +14,7 @@ npm install
 
 [tasks.deps-docker]
 script = '''
-docker pull ghcr.io/hyperledger/solang@sha256:8776a9bd756664f7bf8414710d1a799799bf6fedc1c8f9f0bda17e76749dea7a 
+docker pull ghcr.io/hyperledger-solang/solang:latest
 '''
 
 [tasks.deps]
@@ -111,14 +111,14 @@ dependencies = ["test-backend", "test-app", "test-frontend"]
 
 [tasks.docker-build]
 script = '''
-docker build -t solang-playground .  
+docker build -t solang-playground .
 '''
 
 [tasks.docker-run]
 script = '''
 docker run \
 	  --runtime=sysbox-runc \
-	  --name playground \
+	  --name playground-makee \
 	  --detach \
 	  --volume /tmp:/tmp \
 	  --publish 9000:9000 \

Makefile.toml

@@ -0,0 +1 @@
+{"ids":{"Standalone Network ; February 2017":"CCRITMVLLETIV3VGOA4AL74UE3UG7DI4N652J32YNLALGJ3ARYXRGE3F"}}

crates/backend/.stellar/contract-ids/hello_world.json

@@ -22,3 +22,4 @@ regex = "1.10"
 typescript-type-def = "0.5"
 actix-web = "4.5"
 actix-files = "0.6"
+actix-cors = "0.7.1"

crates/backend/Cargo.toml

@@ -11,6 +11,7 @@ use actix_web::{
 };
 
 use backend::{route_compile, Opts};
+use actix_cors::Cors;
 
 pub struct FrontendState {
     pub frontend_folder: String,
@@ -51,15 +52,23 @@ async fn main() -> std::io::Result<()> {
         let frontend_folder = opts.frontend_folder.clone();
 
         let mut app = App::new()
-            .service(web::resource("/health").to(health))
-            // Enable GZIP compression
-            .wrap(middleware::Compress::default())
-            .wrap(
-                DefaultHeaders::new()
-                    .add(("Cross-Origin-Opener-Policy", "same-origin"))
-                    .add(("Cross-Origin-Embedder-Policy", "require-corp")),
-            )
-            .route("/compile", post().to(route_compile));
+        .wrap(
+            Cors::default()
+                .allow_any_origin()   // allows all origins, including localhost
+                .allow_any_method()   // allows GET, POST, etc.
+                .allow_any_header()   // allows all headers
+                .supports_credentials() // allow cookies/auth if needed
+                .max_age(3600),         // preflight cache duration
+        )
+        .service(web::resource("/health").to(health))
+        // Enable GZIP compression
+        .wrap(middleware::Compress::default())
+        .wrap(
+            DefaultHeaders::new()
+                .add(("Cross-Origin-Opener-Policy", "same-origin"))
+                .add(("Cross-Origin-Embedder-Policy", "require-corp")),
+        )
+        .route("/compile", post().to(|body| route_compile(body)));
 
         // Serve frontend files if configured via CLI
         match frontend_folder {

crates/backend/src/main.rs

@@ -14,7 +14,8 @@ use tokio::process::Command;
 use crate::services::{CompilationRequest, CompilationResult};
 
 const TIMEOUT: Duration = Duration::from_secs(60);
-const DOCKER_IMAGE_BASE_NAME: &str = "ghcr.io/hyperledger/solang";
+// const DOCKER_IMAGE_BASE_NAME: &str = "ghcr.io/hyperledger-solang/solang@sha256:e6f687910df5dd9d4f5285aed105ae0e6bcae912db43e8955ed4d8344d49785d";
+const DOCKER_IMAGE_BASE_NAME: &str = "ghcr.io/hyperledger-solang/solang:latest";
 const DOCKER_WORKDIR: &str = "/builds/contract/";
 const DOCKER_OUTPUT: &str = "/playground-result";
 
@@ -29,11 +30,12 @@ macro_rules! docker_command {
 
 /// Builds the compile command using solang docker image
 pub fn build_compile_command(input_file: &Path, output_dir: &Path) -> Command {
+    println!("ip file: {:?}\nop dir: {:?}", input_file, output_dir);
     // Base docker command
     let mut cmd = docker_command!(
         "run",
         "--detach",
-        "--rm",
+        // "--rm",
         "-it",
         "--cap-drop=ALL",
         "--cap-add=DAC_OVERRIDE",
@@ -65,15 +67,12 @@ pub fn build_compile_command(input_file: &Path, output_dir: &Path) -> Command {
     cmd.arg("--volume").arg(&mount_output_dir);
 
     // Using the solang image
-    cmd.arg(format!(
-        "{}@sha256:8776a9bd756664f7bf8414710d1a799799bf6fedc1c8f9f0bda17e76749dea7a",
-        DOCKER_IMAGE_BASE_NAME
-    ));
+    cmd.arg(DOCKER_IMAGE_BASE_NAME);
 
     // Building the compile command
     let remove_command = format!("rm -rf {}*.wasm {}*.contract", DOCKER_OUTPUT, DOCKER_OUTPUT);
     let compile_command = format!(
-        "solang compile --target polkadot -o /playground-result {} > /playground-result/stdout.log 2> /playground-result/stderr.log",
+        "solang compile --target soroban -o /playground-result {} > /playground-result/stdout.log 2> /playground-result/stderr.log",
         file_name
     );
     let sh_command = format!("{} && {}", remove_command, compile_command);
@@ -102,7 +101,9 @@ impl Sandbox {
 
         fs::set_permissions(&output_dir, PermissionsExt::from_mode(0o777))
             .context("failed to set output permissions")?;
-
+        
+        File::create(&input_file).context("failed to create input file")?;
+        
         Ok(Sandbox {
             scratch,
             input_file,
@@ -115,14 +116,15 @@ impl Sandbox {
         self.write_source_code(&req.source)?;
 
         let command = build_compile_command(&self.input_file, &self.output_dir);
-        println!("Executing command: \n{:#?}", command);
+        // println!("Executing command: \n{:#?}", command);
 
         let output = run_command(command)?;
+        println!("out: {:?}", output);
         let file = fs::read_dir(&self.output_dir)
             .context("failed to read output directory")?
             .flatten()
             .map(|entry| entry.path())
-            .find(|path| path.extension() == Some(OsStr::new("contract")));
+            .find(|path| path.extension() == Some(OsStr::new("wasm")));
 
         // The file `stdout.log` is in the same directory as the contract file
         let compile_log_stdout_file_path = fs::read_dir(&self.output_dir)
@@ -187,9 +189,16 @@ impl Sandbox {
 
     /// A helper function to write the source code to the input file
     fn write_source_code(&self, code: &str) -> Result<()> {
+        println!("writing to {:?}", self.input_file);
         fs::write(&self.input_file, code).context("failed to write source code")?;
+        match fs::read_to_string(&self.input_file) {
+            Ok(content) => println!("Successfully read: {:?}", content),
+            Err(e) => eprintln!("Error reading file: {}", e),
+        }
         fs::set_permissions(&self.input_file, PermissionsExt::from_mode(0o777))
             .context("failed to set source permissions")?;
+        let s: String = code.chars().take(40).collect();
+        println!("Code: {:?}", s);
         println!("Wrote {} bytes of source to {}", code.len(), self.input_file.display());
         Ok(())
     }
@@ -204,7 +213,7 @@ fn read(path: &Path) -> Result<Option<Vec<u8>>> {
     };
     let mut f = BufReader::new(f);
     let metadata = fs::metadata(path).expect("failed to read metadata");
-
+    println!("meta: {:?}", metadata);
     let mut buffer = vec![0; metadata.len() as usize];
     f.read_exact(&mut buffer).expect("buffer overflow");
     Ok(Some(buffer))
@@ -219,14 +228,15 @@ async fn run_command(mut command: Command) -> Result<std::process::Output> {
     use std::os::unix::process::ExitStatusExt;
 
     let timeout = TIMEOUT;
-    println!("executing command!");
+    println!("executing command: {:?}", command);
     let output = command.output().await.context("failed to start compiler")?;
 
     let stdout = String::from_utf8_lossy(&output.stdout);
     let id = stdout.lines().next().context("missing compiler ID")?.trim();
     let stderr = &output.stderr;
-
+    
     let mut command = docker_command!("wait", id);
+    println!("ID: {:?}\nwait: {:?}", id, command);
 
     let timed_out = match tokio::time::timeout(timeout, command.output()).await {
         Ok(Ok(o)) => {
@@ -239,17 +249,19 @@ async fn run_command(mut command: Command) -> Result<std::process::Output> {
     };
 
     let mut command = docker_command!("logs", id);
+    println!("logs: {:?}", command);
     let mut output = command.output().await.context("failed to get output from compiler")?;
-
-    let mut command = docker_command!(
-        "rm", // Kills container if still running
-        "--force", id
-    );
-    command.stdout(std::process::Stdio::null());
-    command.status().await.context("failed to remove compiler")?;
+    println!("op: {:?}", output);
+    // let mut command = docker_command!(
+    //     "rm", // Kills container if still running
+    //     "--force", id
+    // );
+    // println!("rm: {:?}", command);
+    // command.stdout(std::process::Stdio::null());
+    // command.status().await.context("failed to remove compiler")?;
 
     let code = timed_out.context("compiler timed out")?;
-
+    println!("timedout: {:?}", code);
     output.status = code;
     output.stderr = stderr.to_owned();
 

crates/backend/src/services/sandbox.rs

@@ -13,12 +13,12 @@ mod tests {
 
     use super::*;
 
-    const INITIALIZE_REQUEST: &str = r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"clientInfo":{"name":"demo-language-client"},"capabilities":{},"rootUri":null}}"#;
-    const INITIALIZE_EXPECTED_RESPONSE: &str = r#"{"jsonrpc":"2.0","result":{"capabilities":{"completionProvider":{"resolveProvider":false,"triggerCharacters":["."]},"declarationProvider":true,"definitionProvider":true,"documentFormattingProvider":true,"executeCommandProvider":{"commands":[]},"hoverProvider":true,"implementationProvider":true,"referencesProvider":true,"renameProvider":true,"signatureHelpProvider":{},"textDocumentSync":2,"typeDefinitionProvider":true,"workspace":{"workspaceFolders":{"changeNotifications":true,"supported":true}},"workspaceSymbolProvider":true}},"id":1}"#;
+    const INITIALIZE_REQUEST: &'static str = r#"{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"clientInfo":{"name":"demo-language-client"},"capabilities":{},"rootUri":null}}"#;
+    const INITIALIZE_EXPECTED_RESPONSE: &'static str = r#"{"jsonrpc":"2.0","result":{"capabilities":{"completionProvider":{"resolveProvider":false,"triggerCharacters":["."]},"declarationProvider":true,"definitionProvider":true,"documentFormattingProvider":true,"executeCommandProvider":{"commands":[]},"hoverProvider":true,"implementationProvider":true,"referencesProvider":true,"renameProvider":true,"signatureHelpProvider":{},"textDocumentSync":2,"typeDefinitionProvider":true,"workspace":{"workspaceFolders":{"changeNotifications":true,"supported":true}},"workspaceSymbolProvider":true}},"id":1}"#;
 
     const INITALIZED: &str = r#"{"jsonrpc":"2.0","method":"initialized","params":{}}"#;
 
-    const TEXTDOCUMENT_DIDOPEN: &str = r#" {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
+    const TEXTDOCUMENT_DIDOPEN: &'static str = r#" {"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
 
     const DIAGNOSTIC_REQUEST: &str = r#"{"jsonrpc":"2.0","id":3,"method":"textDocument/diagnostic","params":{"textDocument":{"uri":"inmemory://demo.js","languageId":"solidity","version":0,"text":"    // SPDX-License-Identifier: MIT\n    pragma solidity >=0.6.12 <0.9.0;\n    contract HelloWorld {\n      /**\n       * @dev Prints Hello World string\n       */\n      function print() public pure returns (string memory) {\n        return \"Hello World!\";\n      }\n    }\n"}}}"#;
 

crates/browser/tests/server_tests.rs

@@ -45,19 +45,19 @@ impl<T: CodeLocation> OptionalCodeLocation for Vec<T> {
     }
 }
 
-impl<T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &T {
+impl<'a, T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &'a T {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
 }
 
-impl<T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &mut T {
+impl<'a, T: ?Sized + OptionalCodeLocation> OptionalCodeLocation for &'a mut T {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
 }
 
-impl<T: ?Sized + ToOwned + OptionalCodeLocation> OptionalCodeLocation for Cow<'_, T> {
+impl<'a, T: ?Sized + ToOwned + OptionalCodeLocation> OptionalCodeLocation for Cow<'a, T> {
     fn loc_opt(&self) -> Option<Loc> {
         (**self).loc_opt()
     }
@@ -160,19 +160,19 @@ impl CodeLocation for Loc {
     }
 }
 
-impl<T: ?Sized + CodeLocation> CodeLocation for &T {
+impl<'a, T: ?Sized + CodeLocation> CodeLocation for &'a T {
     fn loc(&self) -> Loc {
         (**self).loc()
     }
 }
 
-impl<T: ?Sized + CodeLocation> CodeLocation for &mut T {
+impl<'a, T: ?Sized + CodeLocation> CodeLocation for &'a mut T {
     fn loc(&self) -> Loc {
         (**self).loc()
     }
 }
 
-impl<T: ?Sized + ToOwned + CodeLocation> CodeLocation for Cow<'_, T> {
+impl<'a, T: ?Sized + ToOwned + CodeLocation> CodeLocation for Cow<'a, T> {
     fn loc(&self) -> Loc {
         (**self).loc()
     }