merge: resolve conflicts with upstream/main

Author: susanyusuf

.husky/pre-push

@@ -1,2 +1,11 @@
 #!/usr/bin/env sh
-npm test
+set -e
+
+# Keep the pre-push hook developer-friendly on machines without Rust installed.
+npm run test --prefix soroban-client
+
+if command -v cargo >/dev/null 2>&1; then
+  cargo test --manifest-path soroban-contract/Cargo.toml --all-targets --all-features
+else
+  echo "[pre-push] cargo not found; skipping Rust tests"
+fi

CLI.md

@@ -0,0 +1,64 @@
+# `tokenbound` CLI
+
+Command-line tool to streamline **deployment, upgrade, and management** of the CrowdPass Soroban contracts.
+
+## Prerequisites
+
+- Node.js 18+
+- Soroban CLI installed (`soroban`)
+
+## Install
+
+From the repo root:
+
+```bash
+npm install
+```
+
+## Deploy contracts
+
+```bash
+npm run tokenbound -- deploy --network testnet --source deployer
+```
+
+Outputs a deployment JSON (default): `soroban-contract/deployments/<network>.json`
+
+## Generic invoke
+
+```bash
+npm run tokenbound -- invoke --id C... --fn version --source deployer
+```
+
+Pass raw function arguments after `--args`:
+
+```bash
+npm run tokenbound -- invoke --id C... --fn get_event --args --event_id 1 --source deployer
+```
+
+## Upgrade management (upgradeable contracts)
+
+Schedule an upgrade (timelocked):
+
+```bash
+npm run tokenbound -- upgrade --id C... --source deployer schedule --new-wasm-hash <hash>
+```
+
+Commit / cancel:
+
+```bash
+npm run tokenbound -- upgrade --id C... --source deployer commit
+npm run tokenbound -- upgrade --id C... --source deployer cancel
+```
+
+Pause / unpause:
+
+```bash
+npm run tokenbound -- upgrade --id C... --source deployer pause
+npm run tokenbound -- upgrade --id C... --source deployer unpause
+```
+
+Transfer admin:
+
+```bash
+npm run tokenbound -- upgrade --id C... --source deployer transfer-admin --new-admin G...
+```

DEPLOYMENT.md

@@ -13,81 +13,119 @@ Ensure you have the following installed:
 - Stellar CLI
 - A funded Stellar testnet account (via Friendbot)
 
+### Recommended: Use the `tokenbound` CLI (cross-platform)
+
+This repo includes a Node-based CLI that wraps the Soroban CLI and automates the dependency-ordered deployment.
+
+From the repo root:
+
+```bash
+npm install
+npm run tokenbound -- deploy --network testnet --source deployer
+```
+
+Deployment output is written to `soroban-contract/deployments/<network>.json` by default.
+
 ### Install Soroban CLI
+
 ```bash
 cargo install --locked soroban-cli
 ```
 
 ### Add WASM target
+
 ```bash
 rustup target add wasm32-unknown-unknown
 ```
+
 ### 2. Setup Environment
+
 Create environment variables:
+
 ```bash
 export NETWORK=testnet
 export SOROBAN_RPC_URL="https://soroban-testnet.stellar.org"
 export ADMIN_SECRET_KEY="S..."
 export ADMIN_ADDRESS="G..."
 ```
+
 Fund your account:
+
 ```bash
 curl "https://friendbot.stellar.org?addr=$ADMIN_ADDRESS"
 ```
 
 ### 3. Build Contracts
+
 From the root directory:
+
 ```bash
 cargo build --target wasm32-unknown-unknown --release
 ```
+
 Optimise contracts:
+
 ```bash
 soroban contract optimize --wasm target/wasm32-unknown-unknown/release/*.wasm
 ```
 
 ### 4. Deployment Order
+
 Deploy contracts in the following order:
+
 1. `ticket_factory`
 2. `event_manager`
 3. `tba_registry`
 
 ### 5. Deploy Contracts
+
 **Deploy Ticket Factory**
+
 ```bash
 soroban contract deploy \
   --wasm <path_to_ticket_factory.wasm> \
   --source $ADMIN_SECRET_KEY \
   --rpc-url $SOROBAN_RPC_URL
 ```
+
 Save the returned Contract ID:
+
 ```bash
 export TICKET_FACTORY_ID="C..."
 ```
+
 **Deploy Event Manager**
+
 ```bash
 soroban contract deploy \
   --wasm <path_to_event_manager.wasm> \
   --source $ADMIN_SECRET_KEY \
   --rpc-url $SOROBAN_RPC_URL
 ```
+
 ```bash
 export EVENT_MANAGER_ID="C..."
 ```
+
 **Deploy TBA Registry**
+
 ```bash
 soroban contract deploy \
   --wasm <path_to_tba_registry.wasm> \
   --source $ADMIN_SECRET_KEY \
   --rpc-url $SOROBAN_RPC_URL
 ```
+
 ```bash
 export TBA_REGISTRY_ID="C..."
 ```
 
 ### 6. Contract Initialization
+
 Initialize each contract with required parameters.
 
 Example:
+
 ```bash
 soroban contract invoke \
   --id $TICKET_FACTORY_ID \
@@ -96,42 +134,51 @@ soroban contract invoke \
   -- initialize \
   --admin $ADMIN_ADDRESS
 ```
+
 Repeat for other contracts using their respective parameters.
 
 ### 7. Verification Steps
+
 After deployment:
+
 - Confirm contract IDs are returned
 - Call a read method:
+
 ```bash
 soroban contract invoke \
   --id $TICKET_FACTORY_ID \
   --source $ADMIN_SECRET_KEY \
   --rpc-url $SOROBAN_RPC_URL \
   -- some_view_function
 ```
+
 - Ensure no errors are returned
 - Check events on Soroban explorer
 
-
 ### 8. Troubleshooting
+
 **Contract fails to deploy**
+
 - Ensure account has enough XLM
 - Check RPC URL
 
 **WASM not found**
+
 - Ensure build step completed successfully
 
 **Initialization fails**
+
 - Ensure correct parameters are passed
 - Check contract already initialized
 
 **CLI errors**
+
 ```bash
 soroban --version
 ```
 
 ### 9. Notes
+
 - Always deploy in the correct order
 - Store contract IDs securely
 - Never expose secret keys in code
-

package-lock.json

@@ -1,6 +1,9 @@
 {
   "name": "tokenbound-impl",
   "private": true,
+  "bin": {
+    "tokenbound": "scripts/tokenbound-cli.mjs"
+  },
   "scripts": {
     "prepare": "husky",
     "precommit": "lint-staged && npm run precommit:rust",
@@ -11,7 +14,11 @@
     "format:check": "npm run format:check:js && npm run format:check:rust",
     "format:check:js": "prettier --check .",
     "format:check:rust": "cargo fmt --manifest-path soroban-contract/Cargo.toml --all --check",
-    "test": "npm run test --prefix soroban-client && cargo test --manifest-path soroban-contract/Cargo.toml --all-targets --all-features"
+    "test": "npm run test --prefix soroban-client && cargo test --manifest-path soroban-contract/Cargo.toml --all-targets --all-features",
+    "tokenbound": "node scripts/tokenbound-cli.mjs"
+  },
+  "dependencies": {
+    "commander": "^14.0.1"
   },
   "devDependencies": {
     "husky": "^9.1.7",