Create solana-sdk-wasm crate

Cargo.toml

@@ -86,6 +86,7 @@ members = [
     "sdk",
     "sdk-ids",
     "sdk-macro",
+    "sdk-wasm-js",
     "secp256k1-program",
     "secp256k1-recover",
     "secp256r1-program",

program/Cargo.toml

@@ -109,10 +109,7 @@ arbitrary = { workspace = true, features = ["derive"] }
 solana-logger = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook = { workspace = true }
-console_log = { workspace = true }
 getrandom = { workspace = true, features = ["js", "wasm-bindgen"] }
-wasm-bindgen = { workspace = true }
 
 [dev-dependencies]
 array-bytes = { workspace = true }
@@ -128,7 +125,7 @@ all-features = true
 rustdoc-args = ["--cfg=docsrs"]
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["rlib"]
 
 [features]
 default = ["borsh"]

program/src/lib.rs

@@ -94,16 +94,22 @@
 //!
 //! ```toml
 //! [lib]
-//! crate-type = ["cdylib", "rlib"]
+//! crate-type = ["cdylib"]
 //!
 //! [features]
 //! no-entrypoint = []
 //! ```
 //!
-//! Note that a Solana program must specify its crate-type as "cdylib", and
-//! "cdylib" crates will automatically be discovered and built by the `cargo
-//! build-bpf` command. Solana programs also often have crate-type "rlib" so
-//! they can be linked to other Rust crates.
+//! Note that a Solana program must specify its crate-type as "cdylib", to
+//! be discovered and built by the `cargo-build-sbf` command as a deployable program.
+//! Solana programs also often have crate-type "rlib" so they can be linked to other Rust crates.
+//! Avoid using "rlib" and "cdylib" crates together, since their combined usage precludes
+//! compiler optimizations that may decrease program size and CU usage.
+//!
+//! Prefer writing a separate package if it is supposed to be used as a library for other Solana
+//! programs (i.e. a "rlib" only crate). This would be normally the case for defining account
+//! types and helpers that are used by both clients and program. When creating a Rust project
+//! intended to be a program ready for deployment, use only the "cdylib" crate type.
 //!
 //! # On-chain vs. off-chain compilation targets
 //!
@@ -516,7 +522,6 @@ pub mod syscalls;
 pub mod system_instruction;
 pub mod system_program;
 pub mod sysvar;
-pub mod wasm;
 
 #[deprecated(since = "2.2.0", note = "Use `solana-big-mod-exp` crate instead")]
 pub use solana_big_mod_exp as big_mod_exp;
@@ -581,8 +586,6 @@ pub use solana_sysvar::program_stubs;
 pub mod vote {
     pub use solana_vote_interface::*;
 }
-#[cfg(target_arch = "wasm32")]
-pub use wasm_bindgen::prelude::wasm_bindgen;
 pub use {
     solana_account_info::{self as account_info, debug_account_data},
     solana_clock as clock,

scripts/build-sbf.sh

@@ -23,6 +23,7 @@ exclude_list=(
   "quic-definitions"
   "rent-collector"
   "reserved-account-keys"
+  "sdk-wasm-js"
   "secp256k1-program"
   "secp256r1-program"
   "system-transaction"

scripts/test-wasm.sh

@@ -5,10 +5,6 @@ here="$(dirname "$0")"
 src_root="$(readlink -f "${here}/..")"
 cd "${src_root}"
 
-for dir in program sdk ; do
-  (
-    cd "$dir"
-    npm install
-    npm test
-  )
-done
+cd sdk-wasm-js
+npm install
+npm test

sdk-wasm-js/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "solana-sdk-wasm-js"
+description = "Solana SDK Wasm JS"
+documentation = "https://docs.rs/solana-sdk-wasm-js"
+version = "2.2.2"
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+solana-instruction = { workspace = true, features = ["std"] }
+solana-program = { workspace = true }
+solana-sdk = { workspace = true }
+
+[target.'cfg(target_arch = "wasm32")'.dependencies]
+console_error_panic_hook = { workspace = true }
+console_log = { workspace = true }
+wasm-bindgen = { workspace = true }
+log = { workspace = true }
+js-sys = { workspace = true }
+
+[lib]
+crate-type = ["cdylib"]
+
+[lints]
+workspace = true
+
+[package.metadata.docs.rs]
+targets = ["wasm32-unknown-unknown"]
+all-features = true
+rustdoc-args = ["--cfg=docsrs"]

sdk-wasm-js/README.md

@@ -0,0 +1,17 @@
+<p align="center">
+  <a href="https://solana.com">
+    <img alt="Solana" src="https://i.imgur.com/IKyzQ6T.png" width="250" />
+  </a>
+</p>
+
+# Solana SDK WASM JS
+
+Use the Solana SDK WASM JS crate to build a JS package with `wasm-pack` usable in Node or browser environments.
+See the [Solana Program Crate](https://crates.io/crates/solana-program) instead for on-chain programs, and, the [Solana SDK Crate](https://crates.io/crates/solana-sdk) for client-side
+applications.
+
+More information about Solana is available in the [Solana documentation](https://solana.com/docs).
+
+The [Solana Program Organization](https://github.com/solana-program) provides examples of how to use this crate.
+
+Still have questions?  Ask us on [Stack Exchange](https://sola.na/sse)

program/src/wasm/mod.rs → sdk-wasm-js/src/lib.rs

@@ -2,7 +2,25 @@
 #![cfg(target_arch = "wasm32")]
 #[deprecated(since = "2.2.0", note = "Use solana_instruction::wasm instead.")]
 pub use solana_instruction::wasm as instructions;
-use wasm_bindgen::prelude::*;
+use {::log::Level, wasm_bindgen::prelude::*};
+pub use {
+    solana_program::*,
+    solana_sdk::{
+        // These imports exist in both solana_sdk and solana_program, so we use
+        // direct imports to suppress ambiguous re-export warnings.
+        declare_deprecated_id,
+        declare_id,
+        entrypoint,
+        entrypoint_deprecated,
+        example_mocks,
+        feature,
+        hash,
+        program_utils,
+        pubkey,
+        *,
+    },
+};
+
 // This module is intentionally left empty. The wasm system instruction impl can be
 // found in the `solana-system-interface` crate.
 pub mod system_instruction {}
@@ -15,7 +33,7 @@ pub fn solana_program_init() {
 
     INIT.call_once(|| {
         std::panic::set_hook(Box::new(console_error_panic_hook::hook));
-        console_log::init_with_level(log::Level::Info).unwrap();
+        console_log::init_with_level(Level::Info).unwrap();
     });
 }
 

sdk/.gitignore

@@ -1,4 +1,2 @@
 /farf/
-/node_modules/
-/package-lock.json
 /target/

sdk/Cargo.toml

@@ -176,8 +176,6 @@ thiserror = { workspace = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.1.1", features = ["wasm-bindgen"] }
-js-sys = { workspace = true }
-wasm-bindgen = { workspace = true }
 
 [dev-dependencies]
 curve25519-dalek = { workspace = true }
@@ -197,7 +195,7 @@ all-features = true
 rustdoc-args = ["--cfg=docsrs"]
 
 [lib]
-crate-type = ["cdylib", "rlib"]
+crate-type = ["rlib"]
 
 [lints]
 workspace = true

sdk/src/lib.rs

@@ -41,8 +41,6 @@ pub mod commitment_config {
 }
 #[cfg(not(target_os = "solana"))]
 pub use solana_program::program_stubs;
-#[cfg(target_arch = "wasm32")]
-pub use solana_program::wasm_bindgen;
 pub use solana_program::{
     account_info, big_mod_exp, blake3, bpf_loader, bpf_loader_deprecated, clock, config,
     custom_heap_default, custom_panic_default, debug_account_data, declare_deprecated_sysvar_id,
@@ -191,7 +189,6 @@ pub mod signature;
 pub mod signer;
 pub mod transaction;
 pub mod transport;
-pub mod wasm;
 
 #[deprecated(since = "2.1.0", note = "Use `solana-account` crate instead")]
 pub use solana_account as account;