fix: change some names and add necessary fields to indexing agreements

Author: pcarranzav

.sqlx/query-05cd59d0d9e64a7c6f7d4560a97e6b79fd38523fbcef88b2dd169720b4e9188e.json

@@ -56,10 +56,10 @@ sol! {
     #[derive(Debug, RlpEncodable, RlpDecodable, PartialEq)]
     struct SubgraphIndexingVoucherMetadata {
         uint256 pricePerBlock; // wei GRT
-        bytes32 protocolNetwork; // eip199:1 format
-        // differentiate based on indexed chain
-        bytes32 chainId; // eip199:1 format
-        string deployment_ipfs_hash;
+        uint256 pricePerEntity; // wei GRT
+        string subgraphDeploymentId; // e.g. "Qmbg1qF4YgHjiVfsVt6a13ddrVcRtWyJQfD4LA3CwHM29f" - TODO consider using bytes32
+        string protocolNetwork; // e.g. "eip155:42161"
+        string chainId; // e.g. "eip155:1"
     }
 
     #[derive(Debug, RlpEncodable, RlpDecodable, PartialEq)]
@@ -77,7 +77,7 @@ sol! {
         // data service that will initiate payment collection.
         address service;
         // signer of the cancellation, can be signed by either party.
-        address cancellled_by;
+        address cancelledBy;
         // should only be usable within a limited period of time.
         uint64 timestamp;
         bytes metadata;
@@ -197,7 +197,7 @@ impl SignedCancellationRequest {
             .recover_address_from_prehash(&self.request.eip712_signing_hash(domain))
             .map_err(|err| DipsError::InvalidSignature(err.to_string()))?;
 
-        if signer.ne(&self.request.cancellled_by) {
+        if signer.ne(&self.request.cancelledBy) {
             return Err(DipsError::UnexpectedSigner);
         }
 
@@ -291,9 +291,10 @@ mod test {
 
         let metadata = SubgraphIndexingVoucherMetadata {
             pricePerBlock: U256::from(10000_u64),
-            protocolNetwork: FixedBytes::left_padding_from("arbitrum-one".as_bytes()),
-            chainId: FixedBytes::left_padding_from("mainnet".as_bytes()),
-            deployment_ipfs_hash: deployment_id,
+            pricePerEntity: U256::from(100_u64),
+            protocolNetwork: "eip155:42161",
+            chainId: "eip155:1",
+            subgraphDeploymentId: deployment_id,
         };
 
         let voucher = IndexingAgreementVoucher {
@@ -343,9 +344,10 @@ mod test {
 
         let metadata = SubgraphIndexingVoucherMetadata {
             pricePerBlock: U256::from(10000_u64),
-            protocolNetwork: FixedBytes::left_padding_from("arbitrum-one".as_bytes()),
-            chainId: FixedBytes::left_padding_from("mainnet".as_bytes()),
-            deployment_ipfs_hash: deployment_id,
+            pricePerEntity: U256::from(100_u64),
+            protocolNetwork: "eip155:42161",
+            chainId: "eip155:1",
+            subgraphDeploymentId: deployment_id,
         };
 
         let voucher = IndexingAgreementVoucher {
@@ -384,9 +386,10 @@ mod test {
 
         let metadata = SubgraphIndexingVoucherMetadata {
             pricePerBlock: U256::from(10000_u64),
-            protocolNetwork: FixedBytes::left_padding_from("arbitrum-one".as_bytes()),
-            chainId: FixedBytes::left_padding_from("mainnet".as_bytes()),
-            deployment_ipfs_hash: deployment_id,
+            pricePerEntity: U256::from(100_u64),
+            protocolNetwork: "eip155:42161",
+            chainId: "eip155:1",
+            subgraphDeploymentId: deployment_id,
         };
 
         let voucher = IndexingAgreementVoucher {
@@ -428,9 +431,10 @@ mod test {
 
         let metadata = SubgraphIndexingVoucherMetadata {
             pricePerBlock: U256::from(10000_u64),
-            protocolNetwork: FixedBytes::left_padding_from("arbitrum-one".as_bytes()),
-            chainId: FixedBytes::left_padding_from("mainnet".as_bytes()),
-            deployment_ipfs_hash: deployment_id,
+            pricePerEntity: U256::from(100_u64),
+            protocolNetwork: "eip155:42161",
+            chainId: "eip155:1",
+            subgraphDeploymentId: deployment_id,
         };
 
         struct Case<'a> {
@@ -479,7 +483,7 @@ mod test {
                 payee: payee_addr,
                 service: Address(FixedBytes::ZERO),
                 metadata: metadata.eip712_hash_struct().to_owned().into(),
-                cancellled_by: signer.address(),
+                cancelledBy: signer.address(),
                 timestamp,
             };
             let domain = eip712_domain(0, Address::ZERO);

.sqlx/query-78fbff2889a77201ec01cd18fc83d4e7e63037d56e86bd7c462c8f8adc0cfac8.json

@@ -19,7 +19,7 @@ pub struct PsqlAgreementStore {
 #[async_trait]
 impl AgreementStore for PsqlAgreementStore {
     async fn get_by_id(&self, id: Uuid) -> anyhow::Result<Option<SignedIndexingAgreementVoucher>> {
-        let item = sqlx::query!("SELECT * FROM dips_agreements WHERE id=$1", id,)
+        let item = sqlx::query!("SELECT * FROM indexing_agreements WHERE id=$1", id,)
             .fetch_one(&self.pool)
             .await;
 
@@ -43,7 +43,7 @@ impl AgreementStore for PsqlAgreementStore {
         let now = Utc::now();
 
         sqlx::query!(
-            "INSERT INTO dips_agreements VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,null,null)",
+            "INSERT INTO indexing_agreements VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,null,null)",
             id,
             agreement.signature.as_ref(),
             bs,

crates/dips/src/lib.rs

@@ -1,2 +1,2 @@
 -- Add down migration script here
-DROP TABLE IF EXISTS dips_agreements;
+DROP TABLE IF EXISTS indexing_agreements;

crates/service/src/database/dips.rs

@@ -1,14 +1,21 @@
 -- Add up migration script here
 
-CREATE TABLE IF NOT EXISTS dips_agreements (
+CREATE TABLE IF NOT EXISTS indexing_agreements (
     id UUID PRIMARY KEY,
     signature BYTEA NOT NULL, 
     signed_payload BYTEA NOT NULL,
 
-    protocol CHAR(40) NOT NULL,
-    service BYTEA NOT NULL,
-    payee BYTEA NOT NULL,
-    payer BYTEA NOT NULL,
+    protocol_network VARCHAR(255) NOT NULL,
+    chain_id VARCHAR(255) NOT NULL,
+    price_per_block NUMERIC(39) NOT NULL,
+    price_per_entity NUMERIC(39) NOT NULL,
+    subgraph_deployment_id VARCHAR(255) NOT NULL,
+
+    service CHAR(40) NOT NULL,
+    payee CHAR(40) NOT NULL,
+    payer CHAR(40) NOT NULL,
+
+    current_allocation_id CHAR(40) NOT NULL,
 
     created_at TIMESTAMP WITH TIME ZONE NOT NULL,
     updated_at TIMESTAMP WITH TIME ZONE NOT NULL,
@@ -17,4 +24,4 @@ CREATE TABLE IF NOT EXISTS dips_agreements (
     signed_cancellation_payload BYTEA
 );
 
-CREATE UNIQUE INDEX IX_UNIQ_SIGNATURE_AGREEMENT on dips_agreements(signature); 
+CREATE UNIQUE INDEX IX_UNIQ_SIGNATURE_AGREEMENT on indexing_agreements(signature);