Near-One · karim-en · Jan 12, 2026 · Jul 3, 2025 · Jul 3, 2025 · Jul 8, 2025
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Makefile b/Makefile
@@ -1,6 +1,8 @@
+.PHONY: zcash-bridge
+
 RFLAGS="-C link-arg=-s"
 
-build: lint satoshi-bridge nbtc mock-chain-signatures mock-btc-light-client mock-dapp
+build: lint satoshi-bridge zcash-bridge nbtc mock-chain-signatures mock-btc-light-client mock-dapp
 
 lint:
 	@cargo fmt --all
@@ -9,6 +11,9 @@ lint:
 satoshi-bridge: contracts/satoshi-bridge
 	$(call local_build_wasm,satoshi-bridge,satoshi_bridge)
 
+zcash-bridge: contracts/satoshi-bridge
+	$(call local_build_zcash_wasm)
+
 nbtc: contracts/nbtc
 	$(call local_build_wasm,nbtc,nbtc)
 
@@ -28,6 +33,7 @@ count:
 release:
 	$(call build_release_wasm,satoshi-bridge,satoshi_bridge)
 	$(call build_release_wasm,nbtc,nbtc)
+	$(call build_release_zcash_wasm)
 
 clean:
 	cargo clean
@@ -51,4 +57,18 @@ define build_release_wasm
 	@rustup target add wasm32-unknown-unknown
 	@cargo near build reproducible-wasm --manifest-path ./contracts/${PACKAGE_NAME}/Cargo.toml
 	@cp target/near/${WASM_NAME}/$(WASM_NAME).wasm ./res/$(WASM_NAME)_release.wasm
-endef
+endef
+
+define build_release_zcash_wasm
+	@mkdir -p res
+	@rustup target add wasm32-unknown-unknown
+	@cargo near build reproducible-wasm --manifest-path ./contracts/satoshi-bridge/Cargo.toml --variant zcash
+	@cp target/near/satoshi_bridge/satoshi_bridge.wasm ./res/zcash_connector_release.wasm
+endef
+
+define local_build_zcash_wasm
+    @mkdir -p res
+    @rustup target add wasm32-unknown-unknown
+    @cargo near build non-reproducible-wasm --manifest-path ./contracts/satoshi-bridge/Cargo.toml --locked --no-abi --no-default-features --features zcash
+    @cp target/near/satoshi_bridge/satoshi_bridge.wasm ./res/zcash.wasm
+endef
diff --git a/contracts/mock-btc-light-client/src/lib.rs b/contracts/mock-btc-light-client/src/lib.rs
@@ -81,4 +81,9 @@ impl Contract {
     pub fn verify_transaction_inclusion(&self, #[serializer(borsh)] args: ProofArgs) -> bool {
         true
     }
+
+    pub fn get_last_block_height(&self) -> u32 {
+        // Return a reasonable mock block height for Zcash testnet
+        1000
+    }
 }
diff --git a/contracts/nbtc/Cargo.toml b/contracts/nbtc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nbtc"
-version = "0.1.0"
+version = "0.2.0"
 edition.workspace = true
 publish.workspace = true
 repository.workspace = true

diff --git a/contracts/nbtc/src/lib.rs b/contracts/nbtc/src/lib.rs
@@ -26,8 +26,6 @@ pub struct Contract {
     metadata: LazyOption<FungibleTokenMetadata>,
 }
 
-const DATA_IMAGE_SVG_NEAR_ICON: &str = "data:image/svg+xml,%3Csvg%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2032%2032%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cg%20clip-path%3D%22url(%23clip0_2351_779)%22%3E%3Cpath%20d%3D%22M16%2032C24.8366%2032%2032%2024.8366%2032%2016C32%207.16344%2024.8366%200%2016%200C7.16344%200%200%207.16344%200%2016C0%2024.8366%207.16344%2032%2016%2032Z%22%20fill%3D%22%2300E99F%22%2F%3E%3Cpath%20d%3D%22M16.0006%2028.2858C22.7858%2028.2858%2028.2863%2022.7853%2028.2863%2016.0001C28.2863%209.21486%2022.7858%203.71436%2016.0006%203.71436C9.21535%203.71436%203.71484%209.21486%203.71484%2016.0001C3.71484%2022.7853%209.21535%2028.2858%2016.0006%2028.2858Z%22%20stroke%3D%22black%22%2F%3E%3Cpath%20d%3D%22M27.1412%2016C27.1412%2022.1541%2022.1524%2027.1429%2015.9983%2027.1429C9.84427%2027.1429%204.85547%2022.1541%204.85547%2016C4.85547%209.84598%209.84427%204.85718%2015.9983%204.85718C22.1524%204.85718%2027.1412%209.84598%2027.1412%2016Z%22%20stroke%3D%22black%22%20stroke-width%3D%220.5%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16.2167%2011.1743C15.9198%2011.1643%2015.6095%2011.1622%2015.2868%2011.1668V9.32056H13.8907V11.2217C13.1583%2011.2659%2012.3792%2011.3332%2011.5625%2011.4149V12.811H12.9586V18.8607H11.7952V20.4895H13.8893V22.5836H15.2854V20.4895H16.2161V22.5836H17.3795V20.4895C18.4654%2020.4119%2020.6836%2019.7915%2020.8698%2017.93C21.0559%2016.0686%2019.7064%2015.6032%2019.0083%2015.6032C19.5512%2015.3705%2020.544%2014.5328%2020.1717%2013.0436C19.9215%2012.043%2019.0072%2011.5204%2017.6128%2011.2984V9.32164H16.2167V11.1743ZM18.0737%2013.9723C18.0737%2012.8554%2016.2122%2012.7313%2015.2815%2012.8088V15.1356C16.2122%2015.2132%2018.0737%2015.0891%2018.0737%2013.9723ZM15.2826%2016.5322V18.8591C16.2133%2018.9366%2018.3075%2018.859%2018.3075%2017.6956C18.3075%2016.2994%2016.2133%2016.4547%2015.2826%2016.5322Z%22%20fill%3D%22black%22%2F%3E%3C%2Fg%3E%3Cdefs%3E%3CclipPath%20id%3D%22clip0_2351_779%22%3E%3Crect%20width%3D%2232%22%20height%3D%2232%22%20fill%3D%22white%22%2F%3E%3C%2FclipPath%3E%3C%2Fdefs%3E%3C%2Fsvg%3E";
-
 const GAS_FOR_RESOLVE_TRANSFER: Gas = Gas::from_tgas(5);
 const GAS_FOR_FT_TRANSFER_CALL: Gas = Gas::from_tgas(30);
 
@@ -53,7 +51,14 @@ pub struct PostAction {
 #[near]
 impl Contract {
     #[init]
-    pub fn new(controller: AccountId, bridge_id: AccountId) -> Self {
+    pub fn new(
+        controller: AccountId,
+        bridge_id: AccountId,
+        name: String,
+        symbol: String,
+        icon: Option<String>,
+        decimals: u8,
+    ) -> Self {
         require!(!env::state_exists(), "Already initialized");
         Self {
             controller,
@@ -63,12 +68,12 @@ impl Contract {
                 StorageKey::Metadata,
                 Some(&FungibleTokenMetadata {
                     spec: FT_METADATA_SPEC.to_string(),
-                    name: "Near WTC".to_string(),
-                    symbol: "NBTC".to_string(),
-                    icon: Some(DATA_IMAGE_SVG_NEAR_ICON.to_string()),
+                    name,
+                    symbol,
+                    icon,
                     reference: None,
                     reference_hash: None,
-                    decimals: 8,
+                    decimals,
                 }),
             ),
         }

diff --git a/contracts/satoshi-bridge/Cargo.toml b/contracts/satoshi-bridge/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "satoshi-bridge"
-version = "0.5.1"
+version = "0.6.0"
 edition.workspace = true
 publish.workspace = true
 repository.workspace = true
@@ -21,19 +21,46 @@ container_build_command = [
     "--no-abi",
 ]
 
+[package.metadata.near.reproducible_build.variant.zcash]
+container_build_command = [
+    "cargo",
+    "near",
+    "build",
+    "non-reproducible-wasm",
+    "--locked",
+    "--no-abi",
+    "--no-default-features",
+    "--features",
+    "zcash"
+]
+
 [dependencies]
 near-sdk.workspace = true
 near-contract-standards.workspace = true
 bitcoin.workspace = true
 hex.workspace = true
 near-plugins.workspace = true
 k256 = "0.13.1"
-ed25519-dalek="2.1.0"
-crypto-shared = { git = "https://github.com/near/mpc_old", rev = "0afee9004a1b1c3386940e60c28cff7cf1b5978c"}
+ed25519-dalek = "2.1.0"
+crypto-shared = { git = "https://github.com/near/mpc_old", rev = "0afee9004a1b1c3386940e60c28cff7cf1b5978c" }
+zcash_primitives = { version = "0.24.0", default-features = false, features = ["circuits", "transparent-inputs"], optional = true }
+zcash_transparent = { version = "0.4.0", features = ["transparent-inputs"], optional = true }
+orchard = { version = "0.11.0", default-features = false, optional = true }
+sapling-crypto = { version = "0.5.0", default-features = false, optional = true }
+zcash_protocol = { version = "0.6.1" }
+core2 = { version = "0.3", optional = true }
+zcash_address = { version = "0.9.0" }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 getrandom = { version = "0.2.12", features = ["custom"] }
 
 [dev-dependencies]
 near-workspaces = { version = "0.20", features = ["unstable"] }
 tokio = { version = "1.12.0", features = ["full"] }
+rand = "0.8"
+hex = "0.4"
+bs58 = "0.5"
+
+[features]
+default = []
+zcash = ["zcash_primitives", "zcash_transparent", "orchard", "core2", "sapling-crypto"]
diff --git a/contracts/satoshi-bridge/src/account.rs b/contracts/satoshi-bridge/src/account.rs
@@ -86,15 +86,15 @@ impl Contract {
             .accounts
             .get(account_id)
             .map(|o| o.into())
-            .expect("ACCOUNT NOT REGISTERED")
+            .unwrap_or_else(|| panic!("ERR_ACCOUNT_NOT_REGISTERED: {}", account_id))
     }
 
     pub fn internal_unwrap_mut_account(&mut self, account_id: &AccountId) -> &mut Account {
         self.data_mut()
             .accounts
             .get_mut(account_id)
             .map(|o| o.into())
-            .expect("ACCOUNT NOT REGISTERED")
+            .unwrap_or_else(|| panic!("ERR_ACCOUNT_NOT_REGISTERED: {}", account_id))
     }
 
     pub fn internal_unwrap_or_create_mut_account(