diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index e976414db..f5bc4969d 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -7,7 +7,6 @@ on: jobs: deploy: runs-on: ubuntu-latest - if: github.ref == 'refs/heads/main' timeout-minutes: 60 steps: diff --git a/Cargo.lock b/Cargo.lock index 74b35d70f..358103fed 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3212,7 +3212,7 @@ dependencies = [ [[package]] name = "kinode" -version = "0.8.2" +version = "0.8.3" dependencies = [ "aes-gcm", "alloy", diff --git a/Cargo.toml b/Cargo.toml index 260f70421..15c40cb9d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "kinode_lib" authors = ["KinodeDAO"] -version = "0.8.2" +version = "0.8.3" edition = "2021" description = "A general-purpose sovereign cloud computing platform" homepage = "https://kinode.org" diff --git a/lib/src/core.rs b/lib/src/core.rs index 35316e22c..2e4607002 100644 --- a/lib/src/core.rs +++ b/lib/src/core.rs @@ -3,6 +3,7 @@ use ring::signature; use rusqlite::types::{FromSql, FromSqlError, ToSql, ValueRef}; use serde::{Deserialize, Serialize}; use std::collections::{BTreeMap, HashMap, HashSet}; +use std::hash::{Hash, Hasher}; use thiserror::Error; lazy_static::lazy_static! { @@ -470,7 +471,7 @@ pub enum Message { Response((Response, Option)), } -#[derive(Clone, Debug, Hash, Serialize, Deserialize)] +#[derive(Clone, Debug, Serialize, Deserialize)] pub struct Capability { pub issuer: Address, pub params: String, @@ -488,6 +489,14 @@ impl PartialEq for Capability { } } +impl Hash for Capability { + fn hash(&self, state: &mut H) { + self.issuer.hash(state); + let params: serde_json::Value = serde_json::from_str(&self.params).unwrap_or_default(); + params.hash(state); + } +} + impl Capability { pub fn new(issuer: T, params: U) -> Self where diff --git a/my_nodes/home/tchotchke/.eth_providers b/my_nodes/home/tchotchke/.eth_providers deleted file mode 100644 index 363da60ef..000000000 --- a/my_nodes/home/tchotchke/.eth_providers +++ /dev/null @@ -1 +0,0 @@ -[{"chain_id":1,"trusted":false,"provider":{"Node":{"kns_update":{"name":"providerfren.os","owner":"","node":"","public_key":"0x54f5a8a4c625d5925e63ed3f0203b63e007e3f822d7858bd98b1fd9704c99451","ips":["147.135.114.167"],"ports":{"ws":9999},"routers":[]},"use_as_provider":true}}},{"chain_id":11155111,"trusted":false,"provider":{"Node":{"kns_update":{"name":"providerfren.os","owner":"","node":"","public_key":"0x54f5a8a4c625d5925e63ed3f0203b63e007e3f822d7858bd98b1fd9704c99451","ips":["147.135.114.167"],"ports":{"ws":9999},"routers":[]},"use_as_provider":true}}},{"chain_id":10,"trusted":true,"provider":{"RpcUrl":"wss://opt-mainnet.g.alchemy.com/v2/phOnE7X9A3mnzAVjfyR1idu1yYX1mqSL"}},{"chain_id":10,"trusted":false,"provider":{"Node":{"kns_update":{"name":"providerfren.os","owner":"","node":"","public_key":"0x54f5a8a4c625d5925e63ed3f0203b63e007e3f822d7858bd98b1fd9704c99451","ips":["147.135.114.167"],"ports":{"ws":9999},"routers":[]},"use_as_provider":true}}}] \ No newline at end of file