initial working version with testnet smart contracts running

Author: skutcher

frontend/src/app.rs

@@ -13,7 +13,7 @@ pub fn App() -> Element {
     // Signal for transaction status
     let tx_status = use_signal(|| "".to_string());
 
-    let contract_address = "0xYourContractAddressHere";
+    let contract_address = "0x998abeb3E57409262aE5b751f60747921B33613E";
 
     rsx! {
         div {
@@ -54,7 +54,7 @@ pub fn App() -> Element {
                     let mut tx_status = tx_status.clone();
                     spawn_local(async move {
                         tx_status.set("Wrapping...".to_string());
-                        let res = wrap_tokens(contract_address, &underlying.read(), &amount.read()).await;
+                        let res = wrap_tokens(contract_address, &underlying.read(), &amount.read(), &wrapped.read()).await.as_string().unwrap_or_default();
                         tx_status.set(format!("Wrap done: {:?}", res));
                     });
                 },
@@ -76,7 +76,7 @@ pub fn App() -> Element {
                     let mut tx_status = tx_status.clone();
                     spawn_local(async move {
                         tx_status.set("Unwrapping...".to_string());
-                        let res = unwrap_tokens(contract_address, &wrapped.read(), &amount.read()).await;
+                        let res = unwrap_tokens(contract_address, &wrapped.read(), &amount.read(), &underlying.read()).await.as_string().unwrap_or_default();
                         tx_status.set(format!("Unwrap done: {:?}", res));
                     });
                 },

frontend/src/metamask.js

@@ -11,16 +11,43 @@ export async function connect_metamask() {
     return await signer.getAddress();
 }
 
-export async function wrap_tokens(contractAddress, underlying, amount) {
-    const abi = ["function wrap(address underlying, uint256 amount) external"];
-    const contract = new ethers.Contract(contractAddress, abi, signer);
-    const tx = await contract.wrap(underlying, amount);
-    return tx.wait();
+export async function wrap_tokens(contractAddress, dToken, amount, cAsset) {
+    try {
+        const abi = ["function wrap(address dTokent, uint256 amount, address cAsset) external"];
+        const approveAbi = ["function approve(address spender, uint256 amount) external returns (bool)"];
+        console.log("contractAddress:", contractAddress, " dToken:",dToken, " Amount:",amount," cAsset:", cAsset);
+        const erc20_contract = new ethers.Contract(dToken, approveAbi, signer);
+        const erc20_connected = erc20_contract.connect(signer);
+        const approve_tx = await erc20_connected.approve(contractAddress, amount);
+        await approve_tx.wait();
+        const contract = new ethers.Contract(contractAddress, abi, signer);
+        const connected = contract.connect(signer);
+        const tx = await connected.wrap(dToken, amount, cAsset);
+        await tx.wait();
+        return "Transaction successful";
+    } catch (err) {
+        console.error(err);
+        return `Error: ${err.reason || err.message}`;
+    }
+
 }
 
-export async function unwrap_tokens(contractAddress, wrapped, amount) {
-    const abi = ["function unwrap(address wrapped, uint256 amount) external"];
-    const contract = new ethers.Contract(contractAddress, abi, signer);
-    const tx = await contract.unwrap(wrapped, amount);
-    return tx.wait();
+export async function unwrap_tokens(contractAddress, cAsset, amount, dToken) {
+    try {
+        const abi = ["function unwrap(address cAsset, uint256 amount, address dToken) external"];
+        const approveAbi = ["function approve(address spender, uint256 amount) external returns (bool)"];
+        console.log("contractAddress:", contractAddress, " cAsset:", cAsset, " Amount:",amount, " dToken:",dToken);
+        const erc20_contract = new ethers.Contract(cAsset, approveAbi, signer);
+        const erc20_connected = erc20_contract.connect(signer);
+        const approve_tx = await erc20_connected.approve(contractAddress, amount);
+        await approve_tx.wait();
+        const contract = new ethers.Contract(contractAddress, abi, signer);
+        const connected = contract.connect(signer);
+        const tx = await connected.unwrap(cAsset, amount, dToken);
+        await tx.wait();
+        return "Transaction successful";
+    } catch (err) {
+        console.error(err);
+        return `Error: ${err.reason || err.message}`;
+    }
 }

frontend/src/metamask.rs

@@ -4,6 +4,6 @@ use wasm_bindgen::prelude::*;
 #[wasm_bindgen(module = "/src/metamask.js")]
 extern "C" {
     pub async fn connect_metamask() -> JsValue;
-    pub async fn wrap_tokens(contract: &str, underlying: &str, amount: &str) -> JsValue;
-    pub async fn unwrap_tokens(contract: &str, wrapped: &str, amount: &str) -> JsValue;
+    pub async fn wrap_tokens(contract: &str, dToken: &str, amount: &str, cAsset: &str,) -> JsValue;
+    pub async fn unwrap_tokens(contract: &str, cAsset: &str, amount: &str, dToken: &str) -> JsValue;
 }