Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,473 changes: 955 additions & 518 deletions Cargo.lock

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ resolver = "2"
opt-level = 3

[workspace.dependencies]
alloy = { version = "0.2.1", features = [
alloy = { version = "0.6.2", features = [
"kzg",
"signer-mnemonic",
], default-features = false }
Expand Down Expand Up @@ -38,14 +38,12 @@ sqlx = { version = "0.8.2", features = [
tracing = { version = "0.1.40", default-features = false }
bigdecimal = "0.4.3"
build-info = "0.0.39"
tap_core = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "3fe6bc2", default-features = false }
tap_core = { git = "https://github.com/LNSD/timeline-aggregation-protocol", rev = "a02e63e", default-features = false }
tracing-subscriber = { version = "0.3", features = [
"json",
"env-filter",
"ansi",
], default-features = false }
thegraph-core = { git = "https://github.com/edgeandnode/toolshed", rev = "85ee00b", features = [
"subgraph-client",
] }
thegraph-core = "0.8.1"
thegraph-graphql-http = "0.2.0"
graphql_client = { version = "0.14.0", features = ["reqwest-rustls"] }
2 changes: 1 addition & 1 deletion common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ prometheus.workspace = true
thegraph-core.workspace = true
axum.workspace = true
lazy_static.workspace = true
thegraph-graphql-http.workspace = true
thegraph-graphql-http = { workspace = true, features = ["http-client-reqwest"] }
build-info.workspace = true
graphql_client.workspace = true

Expand Down
2 changes: 1 addition & 1 deletion common/src/allocations/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

use alloy::primitives::U256;
use serde::{Deserialize, Deserializer};
use thegraph_core::{Address, DeploymentId};
use thegraph_core::{alloy::primitives::Address, DeploymentId};

pub mod monitor;

Expand Down
2 changes: 1 addition & 1 deletion common/src/allocations/monitor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use super::Allocation;
use crate::{prelude::SubgraphClient, watcher::new_watcher};
use alloy::primitives::{TxHash, B256, U256};
use graphql_client::GraphQLQuery;
use thegraph_core::{Address, DeploymentId};
use thegraph_core::{alloy::primitives::Address, DeploymentId};
use tokio::sync::watch::Receiver;

type BigInt = U256;
Expand Down
4 changes: 3 additions & 1 deletion common/src/attestations/signer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ use alloy::{
local::{coins_bip39::English, MnemonicBuilder, PrivateKeySigner},
},
};
use thegraph_core::{attestation, Address, Attestation, ChainId, DeploymentId};
use thegraph_core::{
alloy::primitives::Address, alloy::primitives::ChainId, attestation, Attestation, DeploymentId,
};

use crate::prelude::Allocation;

Expand Down
4 changes: 2 additions & 2 deletions common/src/attestations/signers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use bip39::Mnemonic;
use std::sync::Arc;
use std::{collections::HashMap, sync::Mutex};
use thegraph_core::{Address, ChainId};
use thegraph_core::alloy::primitives::{Address, ChainId};
use tokio::sync::watch::Receiver;
use tracing::warn;

Expand Down Expand Up @@ -45,7 +45,7 @@ fn modify_sigers(
attestation_signers_map: &'static Mutex<HashMap<Address, AttestationSigner>>,
allocations: &HashMap<Address, Allocation>,
dispute_manager: &Address,
) -> HashMap<thegraph_core::Address, AttestationSigner> {
) -> HashMap<Address, AttestationSigner> {
let mut signers = attestation_signers_map.lock().unwrap();
// Remove signers for allocations that are no longer active or recently closed
signers.retain(|id, _| allocations.contains_key(id));
Expand Down
2 changes: 1 addition & 1 deletion common/src/indexer_service/http/indexer_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use std::{
time::Duration,
};
use tap_core::{manager::Manager, receipt::checks::CheckList, tap_eip712_domain};
use thegraph_core::{Address, Attestation, DeploymentId};
use thegraph_core::{alloy::primitives::Address, Attestation, DeploymentId};
use thiserror::Error;
use tokio::net::TcpListener;
use tokio::signal;
Expand Down
2 changes: 1 addition & 1 deletion common/src/test_vectors.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ use tap_core::{
signed_message::EIP712SignedMessage,
tap_eip712_domain,
};
use thegraph_core::{Address, DeploymentId};
use thegraph_core::{alloy::primitives::Address, DeploymentId};

use crate::prelude::{Allocation, AllocationStatus, SubgraphDeployment};

Expand Down
2 changes: 1 addition & 1 deletion config/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
alloy.workspace = true
serde.workspace = true
thegraph-core.workspace = true
thegraph-core = { workspace = true, features = ["serde"] }
tracing.workspace = true
bigdecimal = { workspace = true, features = ["serde"] }
bip39 = { version = "2.0.0", features = ["rand"] }
Expand Down
8 changes: 4 additions & 4 deletions tap-agent/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ bigdecimal = { workspace = true, features = ["serde"] }
graphql_client.workspace = true

ruint = { version = "1.12.3", features = [
"num-traits",
"num-traits",
], default-features = false }
futures-util = { version = "0.3.28", default-features = false }
jsonrpsee = { version = "0.24.0", features = ["http-client", "tracing"] }
tap_aggregator = { git = "https://github.com/semiotic-ai/timeline-aggregation-protocol", rev = "eb8447e" }
jsonrpsee = { version = "0.24", features = ["http-client", "tracing"] }
tap_aggregator = { git = "https://github.com/LNSD/timeline-aggregation-protocol", rev = "db05763" }
ractor = { version = "0.13", features = [
"async-trait",
"async-trait",
], default-features = false }
futures = { version = "0.3.30", default-features = false }

Expand Down
2 changes: 1 addition & 1 deletion tap-agent/src/tap/context/rav.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use std::str::FromStr;

use super::{error::AdapterError, TapAgentContext};
use alloy::signers::Signature;
use alloy::primitives::PrimitiveSignature as Signature;
use alloy::{hex::ToHexExt, primitives::Address};
use bigdecimal::num_bigint::{BigInt, ToBigInt};
use bigdecimal::ToPrimitive;
Expand Down