Skip to content
Merged
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
12 changes: 6 additions & 6 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ All types of contributions are encouraged and valued. See the [Table of Contents

> If you want to ask a question, we assume that you have read the available [Documentation]().

Before you ask a question, it is best to search for existing [Issues](https://github.com/graphprotocol/timeline-aggregation-protocol/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.
Before you ask a question, it is best to search for existing [Issues](https://github.com/graphprotocol/graph-tally/issues) that might help you. In case you have found a suitable issue and still need clarification, you can write your question in this issue. It is also advisable to search the internet for answers first.

If you then still feel the need to ask a question and need clarification, we recommend the following:

- Open an [Issue](https://github.com/graphprotocol/timeline-aggregation-protocol/issues/new).
- Open an [Issue](https://github.com/graphprotocol/graph-tally/issues/new).
- Provide as much context as you can about what you're running into.
- Provide project and platform versions (nodejs, npm, etc), depending on what seems relevant.

Expand Down Expand Up @@ -68,7 +68,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform

- Make sure that you are using the latest version.
- Determine if your bug is really a bug and not an error on your side e.g. using incompatible environment components/versions (Make sure that you have read the [documentation](). If you are looking for support, you might want to check [this section](#i-have-a-question)).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/graphprotocol/timeline-aggregation-protocol/issues?q=label%3Abug).
- To see if other users have experienced (and potentially already solved) the same issue you are having, check if there is not already a bug report existing for your bug or error in the [bug tracker](https://github.com/graphprotocol/graph-tally/issues?q=label%3Abug).
- Also make sure to search the internet (including Stack Overflow) to see if users outside of the GitHub community have discussed the issue.
- Collect information about the bug:
- Stack trace (Traceback)
Expand All @@ -85,7 +85,7 @@ A good bug report shouldn't leave others needing to chase you up for more inform

We use GitHub issues to track bugs and errors. If you run into an issue with the project:

- Open an [Issue](https://github.com/graphprotocol/timeline-aggregation-protocol/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Open an [Issue](https://github.com/graphprotocol/graph-tally/issues/new). (Since we can't be sure at this point whether it is a bug or not, we ask you not to talk about a bug yet and not to label the issue.)
- Explain the behavior you would expect and the actual behavior.
- Please provide as much context as possible and describe the *reproduction steps* that someone else can follow to recreate the issue on their own. This usually includes your code. For good bug reports you should isolate the problem and create a reduced test case.
- Provide the information you collected in the previous section.
Expand All @@ -107,13 +107,13 @@ This section guides you through submitting an enhancement suggestion for Graph T

- Make sure that you are using the latest version.
- Read the [documentation]() carefully and find out if the functionality is already covered, maybe by an individual configuration.
- Perform a [search](https://github.com/graphprotocol/timeline-aggregation-protocol/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Perform a [search](https://github.com/graphprotocol/graph-tally/issues) to see if the enhancement has already been suggested. If it has, add a comment to the existing issue instead of opening a new one.
- Find out whether your idea fits with the scope and aims of the project. It's up to you to make a strong case to convince the project's developers of the merits of this feature. Keep in mind that we want features that will be useful to the majority of our users and not just a small subset. If you're just targeting a minority of users, consider writing an add-on/plugin library.

<!-- omit in toc -->
#### How Do I Submit a Good Enhancement Suggestion?

Enhancement suggestions are tracked as [GitHub issues](https://github.com/graphprotocol/timeline-aggregation-protocol/issues).
Enhancement suggestions are tracked as [GitHub issues](https://github.com/graphprotocol/graph-tally/issues).

- Use a **clear and descriptive title** for the issue to identify the suggestion.
- Provide a **step-by-step description of the suggested enhancement** in as many details as possible.
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.1.0"
edition = "2021"
rust-version = "1.91"
license = "Apache-2.0"
repository = "https://github.com/graphprotocol/timeline-aggregation-protocol"
repository = "https://github.com/graphprotocol/graph-tally"

[workspace.dependencies]
anyhow = { version = "1.0.98" }
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Graph Tally (Timeline Aggregation Protocol)
# Graph Tally

| Crate | Latest Version |
| ------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| **graph_tally_aggregator** | [![GHCR](https://img.shields.io/github/v/release/graphprotocol/timeline-aggregation-protocol?filter=graph_tally_aggregator-*&label=ghcr.io)](https://github.com/graphprotocol/timeline-aggregation-protocol/pkgs/container/graph_tally_aggregator) |
| **graph_tally_core** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/timeline-aggregation-protocol?filter=graph_tally_core-*)](https://github.com/graphprotocol/timeline-aggregation-protocol/releases) |
| **graph_tally_eip712_message** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/timeline-aggregation-protocol?filter=graph_tally_eip712_message-*)](https://github.com/graphprotocol/timeline-aggregation-protocol/releases) |
| **graph_tally_graph** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/timeline-aggregation-protocol?filter=graph_tally_graph-*)](https://github.com/graphprotocol/timeline-aggregation-protocol/releases) |
| **graph_tally_receipt** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/timeline-aggregation-protocol?filter=graph_tally_receipt-*)](https://github.com/graphprotocol/timeline-aggregation-protocol/releases) |
| **graph_tally_aggregator** | [![GHCR](https://img.shields.io/github/v/release/graphprotocol/graph-tally?filter=graph_tally_aggregator-*&label=ghcr.io)](https://github.com/graphprotocol/graph-tally/pkgs/container/graph_tally_aggregator) |
| **graph_tally_core** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/graph-tally?filter=graph_tally_core-*)](https://github.com/graphprotocol/graph-tally/releases) |
| **graph_tally_eip712_message** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/graph-tally?filter=graph_tally_eip712_message-*)](https://github.com/graphprotocol/graph-tally/releases) |
| **graph_tally_graph** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/graph-tally?filter=graph_tally_graph-*)](https://github.com/graphprotocol/graph-tally/releases) |
| **graph_tally_receipt** | [![GitHub Release](https://img.shields.io/github/v/release/graphprotocol/graph-tally?filter=graph_tally_receipt-*)](https://github.com/graphprotocol/graph-tally/releases) |

## Overview

Expand Down Expand Up @@ -80,4 +80,4 @@ system being off-chain.

Contributions are welcome! Please submit a pull request or open an issue to
discuss potential changes.
Also, make sure to follow the [Contributing Guide](https://github.com/graphprotocol/timeline-aggregation-protocol/blob/main/CONTRIBUTING.md).
Also, make sure to follow the [Contributing Guide](https://github.com/graphprotocol/graph-tally/blob/main/CONTRIBUTING.md).
4 changes: 2 additions & 2 deletions crates/aggregator/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ As described in the [gateway README section on Graph Tally](https://github.com/e
## Settings

```txt
A JSON-RPC service for the Timeline Aggregation Protocol that lets clients request an aggregate receipt from a list of
A JSON-RPC service for Graph Tally that lets clients request an aggregate receipt from a list of
individual receipts.

Usage: graph_tally_aggregator [OPTIONS] --private-key <PRIVATE_KEY>
Expand Down Expand Up @@ -164,7 +164,7 @@ We define these warning codes:
"0.1"
]
},
"message": "The API version 0.0 will be deprecated. Please check https://github.com/graphprotocol/timeline_aggregation_protocol for more information."
"message": "The API version 0.0 will be deprecated. Please check https://github.com/graphprotocol/graph-tally for more information."
}
]
}
Expand Down
6 changes: 3 additions & 3 deletions crates/aggregator/src/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -437,15 +437,15 @@ pub async fn run_server(
// Create a `TcpListener` using tokio.
let listener = TcpListener::bind(&format!("0.0.0.0:{port}"))
.await
.expect("Failed to bind to tap-aggregator port");
.expect("Failed to bind to graph_tally_aggregator port");

let addr = listener.local_addr()?;
let handle = tokio::spawn(async move {
if let Err(e) = axum::serve(listener, Shared::new(service))
.with_graceful_shutdown(shutdown_handler())
.await
{
log::error!("Tap Aggregator error: {e}");
log::error!("Graph Tally Aggregator error: {e}");
}
});

Expand Down Expand Up @@ -936,7 +936,7 @@ mod tests {
/// that to fit about 250 receipts. We also test with 300 receipts, which should
/// exceed the limit.
/// We conclude that a limit of 10MB should fit about 25k receipts, and thus
/// the TAP spec will require that the aggregator supports up to 15k receipts
/// the Graph Tally spec will require that the aggregator supports up to 15k receipts
/// per aggregation request as a safe limit.
#[rstest]
#[tokio::test]
Expand Down
2 changes: 1 addition & 1 deletion crates/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ pub fn graph_tally_eip712_domain(
}

#[cfg(test)]
mod tap_tests {
mod tests {
use std::str::FromStr;

use graph_tally_graph::{Receipt, ReceiptAggregateVoucher};
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions crates/core/src/manager/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,6 @@
pub mod adapters;
#[cfg(feature = "in_memory")]
pub mod context;
mod tap_manager;
mod core;

pub use tap_manager::Manager;
pub use core::Manager;
2 changes: 1 addition & 1 deletion crates/core/src/rav_request.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//! Request to Tap Aggregator
//! Request to Graph Tally Aggregator

use graph_tally_receipt::rav::AggregationError;
use thegraph_core::alloy::sol_types::SolStruct;
Expand Down
2 changes: 1 addition & 1 deletion crates/graph/src/rav.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ sol! {
address serviceProvider;
// The address of the data service the RAV was issued to
address dataService;
// The RAV timestamp, indicating the latest TAP Receipt in the RAV
// The RAV timestamp, indicating the latest Graph Tally Receipt in the RAV
uint64 timestampNs;
// Total amount owed to the service provider since the beginning of the
// payer-service provider relationship, including all debt that is already paid for.
Expand Down
2 changes: 1 addition & 1 deletion crates/integration_tests/tests/indexer_mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ where
.create_rav_request(&Context::new(), time_stamp_buffer, None)
.await?;

// To-do: Need to add previous RAV, when tap_manager supports replacing receipts
// To-do: Need to add previous RAV, when Manager supports replacing receipts
let params = rpc_params!(
&aggregator_client.1,
&rav_request
Expand Down
8 changes: 4 additions & 4 deletions crates/integration_tests/tests/showcase.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// These tests simulate a Sender sending query requests and receipts to one or two Indexers.
// The tests use a mock Indexer server running a tap_manager instance and a graph_tally_aggregator to handle RAV requests.
// The tests use a mock Indexer server running a Manager instance and a graph_tally_aggregator to handle RAV requests.
// An Indexer checks and stores receipts. After receiving a specific number of receipts, the Indexer sends a RAV request to the aggregator.
use std::{
collections::{HashMap, HashSet},
Expand Down Expand Up @@ -211,7 +211,7 @@ fn indexer_2_context(context: ContextFixture) -> ContextFixture {
}

// Helper fixture to generate a batch of receipts to be sent to the Indexer.
// Messages are formatted according to TAP spec and signed according to EIP-712.
// Messages are formatted according to Graph Tally spec and signed according to EIP-712.
#[fixture]
fn requests_1(
keys_sender: PrivateKeySigner,
Expand Down Expand Up @@ -665,7 +665,7 @@ async fn test_manager_wrong_requestor_keys(

#[rstest]
#[tokio::test]
async fn test_tap_manager_rav_timestamp_cuttoff(
async fn test_manager_rav_timestamp_cutoff(
#[future] two_indexers_test_servers: Result<
(
ServerHandle,
Expand Down Expand Up @@ -701,7 +701,7 @@ async fn test_tap_manager_rav_timestamp_cuttoff(
client_1.request("request", (receipt_1,)).await;

// The first receipt in the second batch has the same timestamp as the last receipt in the first batch.
// TAP manager should ignore this receipt when creating the second RAV request.
// Manager should ignore this receipt when creating the second RAV request.
// The indexer_mock will throw an error if the number of receipts in RAV request is less than the expected number.
// An error is expected when requesting the second RAV.
if counter == 2 * receipt_threshold_1 {
Expand Down
2 changes: 1 addition & 1 deletion crates/receipt/src/checks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ mod tests {

fn create_test_domain_separator() -> Eip712Domain {
eip712_domain! {
name: "TAP",
name: "GraphTallyCollector",
version: "1",
chain_id: 1,
verifying_contract: Address:: from([0x11u8; 20]),
Expand Down
Loading