Kinomap

Cargo.toml

@@ -19,7 +19,7 @@ members = [
     "kinode/packages/chess/chess",
     "kinode/packages/homepage/homepage",
     "kinode/packages/kino_updates/widget",
-    "kinode/packages/kns_indexer/kns_indexer", "kinode/packages/kns_indexer/get_block", "kinode/packages/kns_indexer/state",
+    "kinode/packages/kimap_indexer/kimap_indexer", "kinode/packages/kimap_indexer/get_block", "kinode/packages/kimap_indexer/state",
     "kinode/packages/settings/settings",
     "kinode/packages/terminal/terminal",
     "kinode/packages/terminal/alias", "kinode/packages/terminal/cat", "kinode/packages/terminal/echo", "kinode/packages/terminal/hi", "kinode/packages/terminal/kfetch", "kinode/packages/terminal/kill", "kinode/packages/terminal/m", "kinode/packages/terminal/top",

kinode/packages/app_store/app_store/Cargo.toml

@@ -7,11 +7,11 @@ edition = "2021"
 simulation-mode = []
 
 [dependencies]
-alloy-primitives = "0.7.0"
-alloy-sol-types = "0.7.0"
+alloy-primitives = "0.7.6"
+alloy-sol-types = "0.7.6"
 anyhow = "1.0"
 bincode = "1.3.3"
-kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", tag = "v0.8.0" }
+kinode_process_lib = { git = "https://github.com/kinode-dao/process_lib", rev = "f8500a6" }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

kinode/packages/app_store/app_store/src/lib.rs

@@ -51,20 +51,16 @@ pub const VFS_TIMEOUT: u64 = 5; // 5s
 pub const APP_SHARE_TIMEOUT: u64 = 120; // 120s
 
 #[cfg(not(feature = "simulation-mode"))]
-const CONTRACT_ADDRESS: &str = "0x52185B6a6017E6f079B994452F234f7C2533787B"; // optimism
+const KIMAP_ADDRESS: &str = "0x7290Aa297818d0b9660B2871Bb87f85a3f9B4559"; // optimism
 #[cfg(feature = "simulation-mode")]
-const CONTRACT_ADDRESS: &str = "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"; // local
+const KIMAP_ADDRESS: &str = "0x0165878A594ca255338adfa4d48449f69242Eb8F"; // note temp kimap address!
 
 #[cfg(not(feature = "simulation-mode"))]
-const CONTRACT_FIRST_BLOCK: u64 = 118_590_088;
+const KIMAP_FIRST_BLOCK: u64 = 118_590_088;
 #[cfg(feature = "simulation-mode")]
-const CONTRACT_FIRST_BLOCK: u64 = 1;
+const KIMAP_FIRST_BLOCK: u64 = 1;
 
-const EVENTS: [&str; 3] = [
-    "AppRegistered(uint256,string,bytes,string,bytes32)",
-    "AppMetadataUpdated(uint256,string,bytes32)",
-    "Transfer(address,address,uint256)",
-];
+const EVENTS: [&str; 1] = ["Note(bytes32,bytes32,bytes,bytes,bytes)"];
 
 // internal types
 
@@ -93,7 +89,7 @@ fn init(our: Address) {
 
     http_api::init_frontend(&our);
 
-    println!("indexing on contract address {}", CONTRACT_ADDRESS);
+    println!("indexing on contract address {}", KIMAP_ADDRESS);
 
     // create new provider with request-timeout of 60s
     // can change, log requests can take quite a long time.

kinode/packages/app_store/app_store/src/utils.rs

@@ -1,13 +1,15 @@
 use {
-    crate::kinode::process::main::OnchainMetadata,
-    crate::state::{AppStoreLogError, PackageState, SerializedState, State},
-    crate::{CONTRACT_ADDRESS, EVENTS, VFS_TIMEOUT},
+    crate::{
+        kinode::process::main::OnchainMetadata,
+        state::{AppStoreLogError, PackageState, SerializedState, State},
+        EVENTS, KIMAP_ADDRESS, VFS_TIMEOUT,
+    },
+    alloy_primitives::keccak256,
     kinode_process_lib::{
         eth, get_blob, get_state, http, kernel_types as kt, println, vfs, Address, LazyLoadBlob,
         PackageId, ProcessId, Request,
     },
-    std::collections::HashSet,
-    std::str::FromStr,
+    std::{collections::HashSet, str::FromStr},
 };
 
 // quite annoyingly, we must convert from our gen'd version of PackageId
@@ -58,26 +60,29 @@ pub fn fetch_state(our: Address, provider: eth::Provider) -> State {
     if let Some(state_bytes) = get_state() {
         match serde_json::from_slice::<SerializedState>(&state_bytes) {
             Ok(state) => {
-                if state.contract_address == CONTRACT_ADDRESS {
+                if state.contract_address == KIMAP_ADDRESS {
                     return State::from_serialized(our, provider, state);
                 } else {
                     println!(
                         "state contract address mismatch! expected {}, got {}",
-                        CONTRACT_ADDRESS, state.contract_address
+                        KIMAP_ADDRESS, state.contract_address
                     );
                 }
             }
             Err(e) => println!("failed to deserialize saved state: {e}"),
         }
     }
-    State::new(our, provider, CONTRACT_ADDRESS.to_string()).expect("state creation failed")
+    State::new(our, provider, KIMAP_ADDRESS.to_string()).expect("state creation failed")
 }
 
 pub fn app_store_filter(state: &State) -> eth::Filter {
+    let notes = vec![keccak256("~metadata-uri"), keccak256("~metadata-hash")];
+
     eth::Filter::new()
         .address(eth::Address::from_str(&state.contract_address).unwrap())
         .from_block(state.last_saved_block)
         .events(EVENTS)
+        .topic3(notes)
 }
 
 /// create a filter to fetch app store event logs from chain and subscribe to new events

kinode/packages/app_store/pkg/manifest.json

@@ -33,6 +33,7 @@
         ],
         "grant_capabilities": [
             "eth:distro:sys",
+	    "net:distro:sys",
             "http_client:distro:sys",
             "http_server:distro:sys",
             "kns_indexer:kns_indexer:sys",
@@ -41,4 +42,4 @@
         ],
         "public": false
     }
-]
+]