diff --git a/rgb-cln/src/plugin.rs b/rgb-cln/src/plugin.rs
index c1fd6c1..d588c8a 100644
--- a/rgb-cln/src/plugin.rs
+++ b/rgb-cln/src/plugin.rs
@@ -82,6 +82,7 @@ pub fn build_plugin() -> anyhow::Result<Plugin<State>> {
         notification: [ ],
         methods: [
             rgb_balance,
+            rgb_fundchannel,
         ],
         hooks: [],
     };
@@ -96,6 +97,11 @@ pub fn rgb_balance(plugin: &mut Plugin<State>, requet: Value) -> Result<Value, P
     walletrpc::rgb_balance(plugin, requet)
 }
 
+#[rpc_method(rpc_name = "fundrgbchannel", description = "Funding a RGB Channel")]
+fn rgb_fundchannel(plugin: &mut Plugin<State>, request: Value) -> Result<Value, PluginError> {
+    walletrpc::fund_rgb_channel(plugin, request)
+}
+
 fn read_secret(file: fs::File, network: &str) -> anyhow::Result<ExtendedPrivKey> {
     let buffer = io::BufReader::new(file);
     let network = vlsbtc::Network::from_str(network)?;
@@ -190,3 +196,5 @@ impl RPCCommand<State> for OnFundingChannelTx {
         Ok(json::json!({ "result": json::to_value(&result)? }))
     }
 }
+
+// FIXME: add an hook that will add rgb onchain address to the wallet.
diff --git a/rgb-cln/src/plugin/walletrpc.rs b/rgb-cln/src/plugin/walletrpc.rs
index 6dd21df..d36abef 100644
--- a/rgb-cln/src/plugin/walletrpc.rs
+++ b/rgb-cln/src/plugin/walletrpc.rs
@@ -12,7 +12,6 @@ use clightningrpc_plugin::error;
 use clightningrpc_plugin::errors::PluginError;
 use clightningrpc_plugin::plugin::Plugin;
 
-use rgb_common::lib::wallet::Balance;
 // TODO this should be hidden inside the common crate
 use rgb_common::types::RgbInfo;
 
@@ -25,6 +24,7 @@ pub struct RGBBalanceRequest {
 
 /// Return the balance of an RGB assert
 pub fn rgb_balance(plugin: &mut Plugin<State>, request: Value) -> Result<Value, PluginError> {
+    log::info!("rgbbalances call with body `{request}`");
     let request: RGBBalanceRequest = json::from_value(request).map_err(|err| error!("{err}"))?;
     let balance = plugin
         .state
@@ -37,7 +37,7 @@ pub fn rgb_balance(plugin: &mut Plugin<State>, request: Value) -> Result<Value,
 #[derive(Deserialize, Serialize)]
 pub struct RGBFundChannelRequest {
     peer_id: String,
-    amount_msat: String,
+    amount_msat: u64,
     asset_id: String,
 }
 
@@ -46,25 +46,33 @@ pub fn fund_rgb_channel(plugin: &mut Plugin<State>, request: Value) -> Result<Va
     let request: RGBFundChannelRequest = json::from_value(request)?;
 
     // check if the asset id is valit
-    let contract_id = ContractId::from_str(&request.asset_id).map_err(|err| error!("{err}"))?;
+    let contract_id = ContractId::from_str(&request.asset_id)
+        .map_err(|err| error!("decoding contract id return error: `{err}`"))?;
+    log::info!("opening channel for contract id {contract_id}");
 
+    // Our plugin is not async :/ so this will create a deadlock!
+    /*
     let assert_balance: Balance = plugin
         .state
         .call(
-            "rpcbalance",
+            "rgbbalances",
             RGBBalanceRequest {
                 asset_id: request.asset_id.clone(),
             },
         )
         .map_err(|err| error!("{err}"))?;
 
+     */
     // FIXME: Check if we are connected with the peer otherwise connect to them
 
     // FIXME: we need the magic of core lightning here
-    let balance = request
-        .amount_msat
-        .parse::<u64>()
+    let balance = request.amount_msat;
+    let assert_balance = plugin
+        .state
+        .manager()
+        .assert_balance(contract_id.to_string())
         .map_err(|err| error!("{err}"))?;
+    log::info!("rgbalance {:?}", balance);
 
     if balance < assert_balance.spendable {
         return Err(error!(
@@ -75,7 +83,13 @@ pub fn fund_rgb_channel(plugin: &mut Plugin<State>, request: Value) -> Result<Va
 
     let fundchannel: json::Value = plugin
         .state
-        .call("fundchannel", json::json!({}))
+        .call(
+            "fundchannel",
+            json::json!({
+                "id": request.peer_id,
+                "amount": balance.to_string(),
+            }),
+        )
         .map_err(|err| error!("{err}"))?;
     let channel_id = fundchannel["channel_id"].to_string();
     log::info!("RGB channel id `{channel_id}` created");