create-stylus 0.1.14 → 0.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-stylus",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "author": "Q3 Labs",
   "license": "MIT",
   "repository": {

package/templates/base/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "rust-analyzer.linkedProjects": [
-    "./packages/stylus/your-contract/Cargo.toml"
+    "./packages/stylus/contracts/your-contract/Cargo.toml"
   ],
   "rust-analyzer.cargo.buildScripts.enable": true,
   "rust-analyzer.cargo.features": "all"

package/templates/base/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ss",
-  "version": "0.1.14",
+  "version": "0.1.15",
   "private": true,
   "workspaces": {
     "packages": [

package/templates/base/packages/nextjs/app/page.tsx

@@ -55,7 +55,7 @@ const Home: NextPage = () => {
                   backgroundColor: isDarkMode ? "white" : "#F0F0F0",
                 }}
               >
-                packages/stylus/your-contract/src
+                packages/stylus/contracts/your-contract/src
               </code>
             </p>
           </div>

package/templates/base/packages/stylus/contracts/Cargo.toml

@@ -0,0 +1,11 @@
+[workspace]
+resolver = "2"
+members = ["*"]
+exclude = ["target"]
+
+[profile.release]
+codegen-units = 1
+strip = true
+lto = true
+panic = "abort"
+opt-level = 3

package/templates/base/packages/stylus/contracts/Stylus.toml

@@ -0,0 +1,2 @@
+[workspace]
+networks = { arb1 = { endpoint = "https://arb1.arbitrum.io/rpc" }, sepolia = { endpoint = "https://sepolia-rollup.arbitrum.io/rpc" } }

package/templates/base/packages/stylus/{your-contract → contracts/your-contract}/Cargo.toml

@@ -37,12 +37,3 @@ path = "src/main.rs"
 [lib]
 crate-type = ["lib", "cdylib"]
 
-[profile.release]
-codegen-units = 1
-strip = true
-lto = true
-panic = "abort"
-
-# If you need to reduce the binary size, it is advisable to try other
-# optimization levels, such as "s" and "z"
-opt-level = 3

package/templates/base/packages/stylus/contracts/your-contract/Stylus.toml

@@ -0,0 +1,2 @@
+[contract]
+name = "your-contract"

package/templates/base/packages/stylus/package.json

@@ -11,7 +11,7 @@
     "deploy": "ts-node scripts/deploy_wrapper.ts",
     "info:networks": "ts-node scripts/test_network.ts",
     "export-abi": "ts-node scripts/export_abi.ts",
-    "clean-contracts": "git clean -xdf -e .env -e your-contract/ -e node_modules/",
+    "clean-contracts": "git clean -xdf -e .env -e contracts/ -e node_modules/",
     "test": "ts-node scripts/test.ts",
     "lint": "eslint scripts --ext .ts",
     "lint:fix": "eslint scripts --ext .ts --fix",

package/templates/base/packages/stylus/scripts/deploy.ts

@@ -29,18 +29,37 @@ export default async function deployScript(deployOptions: DeployOptions) {
   console.log(`📁 Deployment directory: ${config.deploymentDir}`);
   console.log(`\n`);
 
-  // Deploy a single contract
+  // Deploy a contract. Each deployStylusContract() call deploys ONE contract
+  // (its own tx + address) and, on success, automatically:
+  // 1. saves the address/tx to packages/stylus/deployments/
+  // 2. runs 'cargo stylus export-abi' and writes the ABI + address into
+  //    packages/nextjs/contracts/deployedContracts.ts (keyed by chainId + name),
+  //    so the Next.js frontend picks it up immediately.
   await deployStylusContract({
-    contract: "your-contract",
-    constructorArgs: [config.deployerAddress!],
+    contract: "your-contract", // folder name under packages/stylus/contracts/
+    constructorArgs: [config.deployerAddress!], // omit/empty if the contract has no #[constructor]
     ...deployOptions,
   });
-
-  // EXAMPLE: Deploy your contract with a custom name, uncomment to try
+  // ─── Deploying MULTIPLE contracts ─────────────────────────────────────────
+  // 1. Scaffold each new contract: yarn new-module <name>
+  //    (creates packages/stylus/contracts/<name>/ and auto-registers it via members=["*"])
+  // 2. Add one deployStylusContract() call per contract below. They deploy
+  //    sequentially in a single 'yarn deploy', and each is auto-added to
+  //    deployedContracts.ts. (Stylus deploys one contract per tx/address — there is
+  //    no single-tx multi-deploy; 'at once' means one command, not one transaction.)
+  //
+  // await deployStylusContract({
+  //   contract: "counter",
+  //   constructorArgs: ["42", config.deployerAddress!, true],
+  //   pass your #[constructor] args in order
+  //   ...deployOptions,
+  // });
+  //
+  // Deploy the SAME crate again under a different key using 'name':
   // await deployStylusContract({
   //   contract: "your-contract",
-  //   constructorArgs: [config.deployerAddress],
-  //   name: "my-contract",
+  //   name: "your-contract-v2",
+  //   constructorArgs: [config.deployerAddress!],
   //   ...deployOptions,
   // });
 

package/templates/base/packages/stylus/scripts/deploy_contract.ts

@@ -15,6 +15,7 @@ import { DeployOptions } from "./utils/type";
 import { buildDeployCommand } from "./utils/command";
 import { Abi, createPublicClient, createWalletClient, http } from "viem";
 import { privateKeyToAccount } from "viem/accounts";
+import * as path from "path";
 import { arbitrumNitro } from "../../nextjs/utils/scaffold-stylus/supportedChains";
 
 /**
@@ -39,7 +40,7 @@ export default async function deployStylusContract(
     const deployCommand = await buildDeployCommand(config, deployOptions);
     const deployOutput = await executeCommand(
       deployCommand,
-      deployOptions.contract!,
+      path.join("contracts", deployOptions.contract!),
       "Deploying contract with cargo stylus",
     );
 
@@ -127,7 +128,7 @@ export default async function deployStylusContract(
       try {
         const output = await executeCommand(
           `cargo stylus verify --endpoint=${getRpcUrlFromChain(config.chain)} --deployment-tx=${deploymentInfo.txHash}`,
-          deployOptions.contract!,
+          path.join("contracts", deployOptions.contract!),
           "Verifying contract with cargo stylus",
         );
         console.log(output);

package/templates/base/packages/stylus/scripts/export_abi.ts

@@ -16,7 +16,9 @@ export async function exportStylusAbi(
 ) {
   console.log("📄 Starting Stylus ABI export...");
 
-  const config = getExportConfig(contractFolder, contractName, chainId);
+  // Resolve the actual filesystem path (contracts live under contracts/)
+  const fsPath = path.join("contracts", contractFolder);
+  const config = getExportConfig(fsPath, contractName, chainId);
 
   if (!config.contractAddress) {
     console.error(
@@ -36,8 +38,9 @@ export async function exportStylusAbi(
     ensureDeploymentDirectory(config.deploymentDir);
 
     // Export ABI
-    const exportCommand = `cargo stylus export-abi --output='../${config.deploymentDir}/${config.contractFolder}' --json`;
-    await executeCommand(exportCommand, contractFolder, "Exporting ABI");
+    // cwd is now contracts/<contract>/, so ../../ reaches packages/stylus/
+    const exportCommand = `cargo stylus export-abi --output='../../${config.deploymentDir}/${config.contractFolder}' --json`;
+    await executeCommand(exportCommand, fsPath, "Exporting ABI");
 
     console.log(
       `📄 ABI file location: ${config.deploymentDir}/${config.contractFolder}`,
@@ -73,12 +76,13 @@ export async function exportStylusAbi(
 
 if (require.main === module) {
   // Get contract folder from command line args, default to 'your-contract'
-  const contractFolder = process.argv[2] || "your-contract";
+  const rawContract = process.argv[2] || "your-contract";
+  const contractFolder = path.join("contracts", rawContract);
   if (!fs.existsSync(contractFolder)) {
     console.error(`❌ Contract folder does not exist: ${contractFolder}`);
     process.exit(1);
   }
-  exportStylusAbi(contractFolder, contractFolder).catch(
+  exportStylusAbi(rawContract, rawContract).catch(
     (error) => {
       console.error("Fatal error:", error);
       process.exit(1);

package/templates/base/packages/stylus/scripts/new_module.sh

@@ -1,6 +1,5 @@
 #!/bin/bash
 
-# Check if module name is provided
 if [ -z "$1" ]; then
     echo "Error: Module name is required"
     echo "Usage: $0 <module_name>"
@@ -8,28 +7,138 @@ if [ -z "$1" ]; then
 fi
 
 MODULE_NAME="$1"
+MODULE_NAME_UNDERSCORE=$(echo "$MODULE_NAME" | tr '-' '_')
+# Convert underscore_separated to PascalCase (e.g. counter_test -> CounterTest)
+MODULE_NAME_PASCAL=$(echo "$MODULE_NAME_UNDERSCORE" | perl -pe 's/(^|_)(.)/\u$2/g')
 
-CARGO_CMD="cargo stylus new \"$MODULE_NAME\""
-
-echo "Creating new module: $MODULE_NAME"
-
-if output=$(eval $CARGO_CMD 2>&1); then
-    cd "$MODULE_NAME"
-    # Remove unnecessary files
-    rm -rf .git .github ci .gitignore examples licenses .env.example header.png README.md
-    # Update Cargo.toml name field to $MODULE_NAME
-    if [ -f Cargo.toml ]; then
-        sed -i "s/^name = \".*\"/name = \"$MODULE_NAME\"/" Cargo.toml
-    fi
-    # Update main.rs module name in print_from_args call
-    if [ -f src/main.rs ]; then
-        MODULE_NAME_UNDERSCORE=$(echo "$MODULE_NAME" | tr '-' '_')
-        sed -i "s/^[[:space:]]*stylus_hello_world::print_from_args();/\t$MODULE_NAME_UNDERSCORE::print_from_args();/" src/main.rs
-    fi
-    cargo generate-lockfile
-    echo "New module created successfully"
-else
-    echo "Error: Failed to create new module with '$CARGO_CMD'"
-    echo "$output"
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WORKSPACE_ROOT="$(cd "$SCRIPT_DIR/../contracts" && pwd)"
+MODULE_DIR="$WORKSPACE_ROOT/$MODULE_NAME"
+
+if [ -d "$MODULE_DIR" ]; then
+    echo "Error: Directory '$MODULE_NAME' already exists"
     exit 1
 fi
+
+echo "Creating new workspace member: $MODULE_NAME"
+
+mkdir -p "$MODULE_DIR/src"
+mkdir -p "$MODULE_DIR/.cargo"
+
+# Write .cargo/config.toml
+cat > "$MODULE_DIR/.cargo/config.toml" << 'CONFIGEOF'
+[target.wasm32-unknown-unknown]
+rustflags = [
+  "-C", "link-arg=-zstack-size=32768",
+  "-C", "target-feature=-reference-types",
+  "-C", "target-feature=+bulk-memory",
+]
+
+[target.aarch64-apple-darwin]
+rustflags = [
+"-C", "link-arg=-undefined",
+"-C", "link-arg=dynamic_lookup",
+]
+
+[target.x86_64-apple-darwin]
+rustflags = [
+"-C", "link-arg=-undefined",
+"-C", "link-arg=dynamic_lookup",
+]
+CONFIGEOF
+
+# Write Cargo.toml
+cat > "$MODULE_DIR/Cargo.toml" << CARGOEOF
+[package]
+name = "$MODULE_NAME"
+version = "0.1.0"
+edition = "2021"
+license = "MIT OR Apache-2.0"
+keywords = ["arbitrum", "ethereum", "stylus", "alloy"]
+description = "Stylus contract scaffolded by scaffold-stylus"
+
+[dependencies]
+alloy-primitives = "=0.8.20"
+alloy-sol-types = "=0.8.20"
+stylus-sdk = "0.9.0"
+hex = { version = "0.4", default-features = false }
+openzeppelin-stylus = "0.3.0"
+
+[dev-dependencies]
+alloy-primitives = { version = "=0.8.20", features = ["sha3-keccak"] }
+tokio = { version = "1.12.0", features = ["full"] }
+ethers = "2.0"
+eyre = "0.6.8"
+stylus-sdk = { version = "0.9.0", features = ["stylus-test"] }
+
+[features]
+default = ["mini-alloc"]
+export-abi = ["openzeppelin-stylus/export-abi"]
+debug = ["stylus-sdk/debug"]
+mini-alloc = ["stylus-sdk/mini-alloc"]
+
+[[bin]]
+name = "$MODULE_NAME"
+path = "src/main.rs"
+
+[lib]
+crate-type = ["lib", "cdylib"]
+CARGOEOF
+
+# Write src/lib.rs
+cat > "$MODULE_DIR/src/lib.rs" << LIBEOF
+#![cfg_attr(not(any(test, feature = "export-abi")), no_main)]
+#![cfg_attr(not(any(test, feature = "export-abi")), no_std)]
+
+#[macro_use]
+extern crate alloc;
+
+use alloc::vec::Vec;
+use stylus_sdk::{alloy_primitives::U256, prelude::*};
+
+sol_storage! {
+    #[entrypoint]
+    pub struct $MODULE_NAME_PASCAL {
+        uint256 number;
+    }
+}
+
+#[public]
+impl $MODULE_NAME_PASCAL {
+    pub fn number(&self) -> U256 {
+        self.number.get()
+    }
+
+    pub fn set_number(&mut self, new_number: U256) {
+        self.number.set(new_number);
+    }
+}
+LIBEOF
+
+# Write src/main.rs
+cat > "$MODULE_DIR/src/main.rs" << MAINEOF
+#![cfg_attr(not(any(test, feature = "export-abi")), no_main)]
+
+#[cfg(not(any(test, feature = "export-abi")))]
+#[no_mangle]
+pub extern "C" fn main() {}
+
+#[cfg(feature = "export-abi")]
+fn main() {
+    ${MODULE_NAME_UNDERSCORE}::print_from_args();
+}
+MAINEOF
+
+# Write Stylus.toml
+cat > "$MODULE_DIR/Stylus.toml" << STYLUSEOF
+[contract]
+name = "$MODULE_NAME"
+STYLUSEOF
+
+echo "New workspace member '$MODULE_NAME' created successfully"
+echo ""
+echo "Next steps:"
+echo "  1. Write your contract logic in $MODULE_NAME/src/lib.rs"
+echo "  2. Deploy: yarn deploy --network sepolia --contract $MODULE_NAME"
+echo ""
+echo "Note: members=['*'] in contracts/Cargo.toml auto-discovers new modules — no manual wiring needed."

package/templates/base/packages/stylus/scripts/test.ts

@@ -118,26 +118,22 @@ async function hasCargoToml(dirPath: string): Promise<boolean> {
  * Find all Cargo projects in the stylus directory
  */
 async function findCargoProjects(): Promise<string[]> {
-  const stylusDir = path.resolve(__dirname, "..");
+  const contractsDir = path.resolve(__dirname, "..", "contracts");
   const cargoProjects: string[] = [];
 
   try {
-    const entries = await fs.readdir(stylusDir, { withFileTypes: true });
+    const entries = await fs.readdir(contractsDir, { withFileTypes: true });
 
     for (const entry of entries) {
       if (entry.isDirectory()) {
         const dirName = entry.name;
 
         // Skip excluded directories
-        if (
-          dirName === "scripts" ||
-          dirName === "deployments" ||
-          dirName === "node_modules"
-        ) {
+        if (dirName === "target") {
           continue;
         }
 
-        const dirPath = path.join(stylusDir, dirName);
+        const dirPath = path.join(contractsDir, dirName);
 
         if (await hasCargoToml(dirPath)) {
           cargoProjects.push(dirPath);

package/templates/base/packages/stylus/scripts/utils/contract.ts

@@ -43,7 +43,7 @@ export function getContractNameFromCargoToml(contractFolder: string): string {
 }
 
 export function isContractHasConstructor(contractFolder: string): boolean {
-  const contractPath = path.resolve(contractFolder, "src/lib.rs");
+  const contractPath = path.resolve("contracts", contractFolder, "src/lib.rs");
   if (!fs.existsSync(contractPath)) {
     throw new Error(`lib.rs not found in contract folder: ${contractPath}`);
   }
@@ -75,7 +75,7 @@ export function getExportConfig(
   }
 
   return {
-    contractFolder,
+    contractFolder: path.basename(contractFolder || ""),
     contractName,
     deploymentDir,
     contractAddress: deploymentData.address as Address,

package/templates/base/packages/stylus/scripts/utils/deployment.ts

@@ -33,7 +33,7 @@ export function getDeploymentConfig(
     try {
       contractName =
         deployOptions.name ||
-        getContractNameFromCargoToml(deployOptions.contract);
+        getContractNameFromCargoToml(path.join("contracts", deployOptions.contract!));
     } catch (e) {
       throw new Error(`❌ Could not read contract name from Cargo.toml: ${e}`);
     }

package/templates/base/readme.md

@@ -67,13 +67,13 @@ Check the [Rust installation guide](https://www.rust-lang.org/tools/install) for
 Then install the Stylus CLI tools:
 
 ```bash
-cargo install --force --locked cargo-stylus@0.6.3
+cargo install --force --locked cargo-stylus@0.10.2
 ```
 
 **Prerequisite:**
 
-- `cargo-stylus` version `0.6.3`
-- `rustc` version match with `packages/stylus/your-contract/rust-toolchain.toml`
+- `cargo-stylus` version `0.10.2`
+- `rustc` version match with `packages/stylus/contracts/rust-toolchain.toml`
 
 Set default `toolchain` match `rust-toolchain.toml` and add the `wasm32-unknown-unknown` build target to your Rust compiler:
 
@@ -133,7 +133,7 @@ In your second terminal:
 yarn deploy
 ```
 
-This command deploys a test smart contract to the local network. The contract is located in `packages/stylus/your-contract/src` and can be modified to suit your needs. The `yarn deploy` command uses the deploy script located in `packages/stylus/scripts` to deploy the contract to the network. You can also customize the deploy script .
+This command deploys a test smart contract to the local network. The contract is located in `packages/stylus/contracts/your-contract/src` and can be modified to suit your needs. The `yarn deploy` command uses the deploy script located in `packages/stylus/scripts` to deploy the contract to the network. You can also customize the deploy script .
 
 ### 6. Start your NextJS app
 
@@ -153,7 +153,7 @@ yarn stylus:test
 
 ## Development Workflow
 
-- Edit your smart contract `lib.rs` in `packages/stylus/your-contract/src`
+- Edit your smart contract `lib.rs` in `packages/stylus/contracts/your-contract/src`
 - Edit your frontend in `packages/nextjs/app`
 - Edit your deployment scripts in `packages/stylus/scripts`
 
@@ -169,14 +169,16 @@ Use the following command to create a new contract and customize it as needed:
 yarn new-module <contract-name>
 ```
 
-The generated contract will be located in `packages/stylus/<contract-name>`.
+The generated contract will be located in `packages/stylus/contracts/<contract-name>`.
+
+**Workspace structure:** `packages/stylus/contracts` is a Cargo workspace with `members = ["*"]`. `yarn new-module <name>` (via `scripts/new_module.sh`) scaffolds the new contract under `contracts/` — the glob auto-discovers it, no manual wiring needed.
 
 ### Step 2: Validate Your Contract Before Deployment
 
 Before deploying, it's recommended to validate your contract size using `cargo stylus check`:
 
 ```bash
-cd packages/stylus/<contract-name>
+cd packages/stylus/contracts/<contract-name>
 cargo stylus check
 ```