Move the POC of cosmwasm to a separate repository (#126)

octopus-network · Sep 9, 2024 · ebcebad · ebcebad
1 parent 4f337f1
commit ebcebad
Show file tree

Hide file tree

Showing 35 changed files with 5 additions and 5,038 deletions.
diff --git a/canister_ids.json b/canister_ids.json
@@ -14,9 +14,6 @@
   "cosmwasm_proxy": {
     "ic": "ncfbq-kyaaa-aaaar-qah3a-cai"
   },
-  "cosmwasm_route_osmosis_testnet": {
-    "ic": "nfehe-haaaa-aaaar-qah3q-cai"
-  },
   "icp_customs": {
     "ic": "nlgkm-4qaaa-aaaar-qah2q-cai"
   },

diff --git a/customs/icp/src/lib.rs b/customs/icp/src/lib.rs
@@ -92,8 +92,8 @@ async fn process_tickets() {
         Ok(tickets) => {
             for (seq, ticket) in &tickets {
                 match handle_redeem_ticket(ticket).await {
-                    Ok(_) => {
-                        log!(P0, "[process tickets] process successful for ticket{}", ticket);
+                    Ok(block_index) => {
+                        log!(P0, "[process tickets] process successful for ticket{}, block_index: {}", ticket, block_index);
                         mutate_state(|s| s.next_ticket_seq = seq+1)
                     },
                     Err(e) => {

diff --git a/customs/icp/src/updates/generate_ticket.rs b/customs/icp/src/updates/generate_ticket.rs
@@ -6,8 +6,9 @@ use icrc_ledger_types::{
 };
 use ic_ledger_types::{AccountIdentifier, Subaccount as IcSubaccount, Tokens, DEFAULT_SUBACCOUNT, MAINNET_LEDGER_CANISTER_ID};
 use num_traits::cast::ToPrimitive;
-use omnity_types::{Ticket, TxAction};
+use omnity_types::{ic_log::P0, Ticket, TxAction};
 use serde::Serialize;
+use ic_canister_log::log;
 
 use crate::{hub, state::{get_counterparty, get_token_principal, is_icp, read_state}, utils::convert_u128_u64, ICP_TRANSFER_FEE};
 
@@ -94,6 +95,7 @@ pub async fn generate_ticket(
     )
     .await
     .map_err(|err| GenerateTicketError::SendTicketErr(format!("{}", err)))?;
+    log!(P0, "Success to generate ticket: {}", ticket_id);
     Ok(GenerateTicketOk { ticket_id })
 }
 

diff --git a/dfx.json b/dfx.json
@@ -70,18 +70,6 @@
         }
       ]
     },
-    "cosmwasm_route_osmosis_testnet": {
-      "gzip": true,
-      "candid": "route/cosmwasm/cosmwasm_route.did",
-      "wasm": "route/cosmwasm/target/wasm32-unknown-unknown/release/cosmwasm_route.wasm",
-      "package": "cosmwasm_route",
-      "type": "custom",
-      "metadata": [
-        {
-          "name": "candid:service"
-        }
-      ]
-    },
     "cosmwasm_proxy": {
       "gzip": true,
       "candid": "proxy/cosmwasm/cosmwasm_proxy.did",