moved air extras and token into module common

airstack-modules/graphql/airstack-domain-name-schema.graphql.ts

@@ -25,6 +25,12 @@ type AirEntityCounter @entity {
 	lastUpdatedAt: AirBlock!
 }
 
+type AirExtra @entity {
+  id: ID! # Concatenation of domainId and name
+  name: String!
+  value: String!
+}
+
 type AirAccount @entity {
   id: ID!
   address: String!
@@ -40,22 +46,22 @@ type AirDomain @entity {
   id: ID!                                               # The namehash of the name
   name: String                                          # The human readable name, if known. Unknown portions replaced with hash in square brackets (eg, foo.[1234].eth)
   labelName: String                                     # The human readable label name (imported from CSV), if known
-  labelHash: Bytes                                      # keccak256(labelName)
+  labelHash: String                                      # keccak256(labelName)
   tokenId: String                                      # dec(labelHash)
   parent: AirDomain                                        # The namehash (id) of the parent name
   subdomains: [AirDomain!]! @derivedFrom(field: "parent")  # Can count domains from length of array
   subdomainCount: BigInt!                                  # The number of subdomains
   resolvedAddress: AirAccount                           # Address logged from current resolver, if any
   owner: AirAccount!
   resolver: AirResolver
-  ttl: BigInt
   isPrimary: Boolean! # - NA                        # Is the primary domain for the resolved address
   expiryTimestamp: BigInt!
   registrationCost: BigInt!                            # Cost of domain registration in wei
   paymentToken: AirToken                              # Token used to pay for registration
   tokenAddress: AirToken!                               # Domain (eg: ens) token contract address
   createdAt: AirBlock!
 	lastUpdatedBlock: AirBlock #- NA
+  extras: [AirExtra!]
 }
 
 type AirDomainTransferTransaction implements AirDomainEvent @entity {
@@ -106,14 +112,14 @@ type AirResolver @entity {
   id: ID!                   # Concatenation of resolver address and namehash
   domain: AirDomain
   address: AirAccount!           # Address of resolver contract
-  resolvedAddress: AirAccount             # Current value of addr record (per events)
+  resolvedAddress: AirAccount             # Current value of resolved address record (per events)
 }
 
-type AirAddrChanged implements AirDomainEvent @entity {
+type AirResolvedAddressChanged implements AirDomainEvent @entity {
   id: ID!
   resolver: AirResolver!
-  previousResolvedAddress: AirAccount # previous addr record
-  newResolvedAddress: AirAccount! # new addr record
+  previousResolvedAddress: AirAccount # previous resolved address record
+  newResolvedAddress: AirAccount! # new resolved address record
   block: AirBlock!
   transactionHash: String!
   tokenId: String # dec(labelhash) - NA

airstack-modules/modules/airstack/common/index.ts

@@ -8,6 +8,8 @@ import {
   AirEntityCounter,
   AirMeta,
   AirAccount,
+  AirExtra,
+  AirToken,
 } from "../../../generated/schema";
 
 export const AIR_META_ID = "AIR_META";
@@ -18,9 +20,9 @@ export const BIG_INT_ZERO = BigInt.fromI32(0);
 
 export const SUBGRAPH_SCHEMA_VERSION = "1.0.0";
 
-export const SUBGRAPH_NAME = "ens";
-export const SUBGRAPH_VERSION = "v1";
-export const SUBGRAPH_SLUG = "ens-v1";
+export const SUBGRAPH_NAME = "AIRSTACK_SUBGRAPH";
+export const SUBGRAPH_VERSION = "AIRSTACK_SUBGRAPH";
+export const SUBGRAPH_SLUG = "AIRSTACK_SUBGRAPH";
 
 const AIR_NETWORK_MAP = new TypedMap<string, string>();
 AIR_NETWORK_MAP.set("arbitrum-one", "ARBITRUM_ONE");
@@ -175,3 +177,41 @@ export function getOrCreateAirAccount(chainId: string, address: string, block: A
   }
   return entity as AirAccount;
 }
+
+/**
+ * @dev this function does not save the returned entity
+ * @dev this function creates an air extra entity
+ * @param name air extra name
+ * @param value air extra value
+ * @param extraId air extra entity id
+ * @returns air extra entity
+ */
+export function createAirExtra(
+  name: string,
+  value: string,
+  id: string,
+): AirExtra {
+  let entity = AirExtra.load(id);
+  if (entity == null) {
+    entity = new AirExtra(id);
+    entity.name = name;
+    entity.value = value;
+  }
+  return entity as AirExtra;
+}
+
+/**
+ * @dev this function does not save the returned entity
+ * @dev this function gets or creates a new air token entity
+ * @param chainID chain id
+ * @param address token address
+ * @returns AirToken entity
+ */
+export function getOrCreateAirToken(chainID: string, address: string): AirToken {
+  let entity = AirToken.load(chainID + "-" + address);
+  if (entity == null) {
+    entity = new AirToken(chainID + "-" + address);
+    entity.address = address;
+  }
+  return entity as AirToken;
+}

airstack-modules/modules/airstack/domain-name/domain-name.ts

@@ -26,8 +26,8 @@ import {
   PrimaryDomain,
   AirExtra,
 } from "../../../generated/schema";
-import { AIR_EXTRA_TTL, AIR_SET_PRIMARY_DOMAIN_ENTITY_COUNTER_ID, AIR_DOMAIN_OWNER_CHANGED_ENTITY_COUNTER_ID, AIR_ADDR_CHANGED_ENTITY_COUNTER_ID, AIR_NAME_RENEWED_ENTITY_COUNTER_ID, AIR_NAME_REGISTERED_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_TTL_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_RESOLVER_ENTITY_COUNTER_ID, AIR_DOMAIN_TRANSFER_ENTITY_COUNTER_ID, ROOT_NODE, ZERO_ADDRESS, ETHEREUM_MAINNET_ID } from "./utils";
-import { BIGINT_ONE, BIG_INT_ZERO, EMPTY_STRING, getChainId, updateAirEntityCounter, getOrCreateAirBlock, getOrCreateAirAccount } from "../common";
+import { AIR_EXTRA_TTL, AIR_SET_PRIMARY_DOMAIN_ENTITY_COUNTER_ID, AIR_DOMAIN_OWNER_CHANGED_ENTITY_COUNTER_ID, AIR_ADDR_CHANGED_ENTITY_COUNTER_ID, AIR_NAME_RENEWED_ENTITY_COUNTER_ID, AIR_NAME_REGISTERED_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_TTL_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_RESOLVER_ENTITY_COUNTER_ID, AIR_DOMAIN_TRANSFER_ENTITY_COUNTER_ID, ZERO_ADDRESS, ETHEREUM_MAINNET_ID } from "./utils";
+import { BIGINT_ONE, BIG_INT_ZERO, EMPTY_STRING, getChainId, updateAirEntityCounter, getOrCreateAirBlock, getOrCreateAirAccount, createAirExtra, getOrCreateAirToken } from "../common";
 
 export namespace domain {
   /**
@@ -81,9 +81,9 @@ export namespace domain {
     domain.labelHash = labelHash;
     domain.tokenId = tokenId;
     domain.lastUpdatedBlock = airBlock.id;
-    recurseSubdomainCountDecrement(domain, chainId, airBlock, tokenAddress);
     parentDomain.save();
     domain.save();
+    recurseSubdomainCountDecrement(domain, chainId, airBlock, tokenAddress);
 
     let txn = getOrCreateAirDomainOwnerChangedTransaction(
       airBlock,
@@ -182,8 +182,8 @@ export namespace domain {
     }
     // do recursive subdomain count decrement
     domain.lastUpdatedBlock = airBlock.id;
-    recurseSubdomainCountDecrement(domain, chainId, airBlock, tokenAddress);
     domain.save();
+    recurseSubdomainCountDecrement(domain, chainId, airBlock, tokenAddress);
 
     // create new resolver transaction
     let tnx = getOrCreateAirDomainNewResolverTransaction(
@@ -223,16 +223,26 @@ export namespace domain {
     // get previous ttl
     let oldTTL: BigInt | null = null;
     // load extra entity for ttl
-    let extra = AirExtra.load(domainId.concat("-").concat(AIR_EXTRA_TTL));
+    let extraId = domainId.concat("-").concat(AIR_EXTRA_TTL);
+    let extra = AirExtra.load(extraId);
     if (extra != null) {
       // if exists, assign oldTTL and update value with newTTL
       oldTTL = BigInt.fromString(extra.value);
       extra.value = newTTL.toString();
     } else {
       // else create new extra entity for ttl
-      extra = createAirExtra(AIR_EXTRA_TTL, newTTL.toString(), domainId);
+      extra = createAirExtra(AIR_EXTRA_TTL, newTTL.toString(), extraId);
     }
     extra.save();
+    // update domain extras
+    let extrasArray = new Array<string>();
+    if (domain.extras == null) {
+      extrasArray.push(extra.id);
+    } else {
+      extrasArray = domain.extras!;
+      extrasArray.push(extra.id);
+    }
+    domain.extras = extrasArray;
     domain.lastUpdatedBlock = airBlock.id;
     domain.save();
     // create AirDomainNewTTLTransaction
@@ -581,29 +591,6 @@ export namespace domain {
   }
 
   // end of track functions and start of get or create and helper functions
-  /**
-   * @dev this function does not save the returned entity
-   * @dev this function creates an air extra entity
-   * @param name air extra name
-   * @param value air extra value
-   * @param domainId air domain id
-   * @returns air extra entity
-   */
-  function createAirExtra(
-    name: string,
-    value: string,
-    domainId: string,
-  ): AirExtra {
-    let id = domainId.concat("-").concat(name);
-    let entity = AirExtra.load(id);
-    if (entity == null) {
-      entity = new AirExtra(id);
-      entity.name = name;
-      entity.value = value;
-      entity.domain = domainId;
-    }
-    return entity as AirExtra;
-  }
 
   /**
    * @dev this function does not save the returned entity
@@ -1070,22 +1057,6 @@ export namespace domain {
     return domain.id
   }
 
-  /**
-   * @dev this function does not save the returned entity
-   * @dev this function gets or creates a new air token entity
-   * @param chainID chain id
-   * @param address token address
-   * @returns AirToken entity
-   */
-  function getOrCreateAirToken(chainID: string, address: string): AirToken {
-    let entity = AirToken.load(chainID + "-" + address);
-    if (entity == null) {
-      entity = new AirToken(chainID + "-" + address);
-      entity.address = address;
-    }
-    return entity as AirToken;
-  }
-
   /**
    * @dev this class has all fields required to create a domain entity
    * @param id domain id

ens/modules/airstack/common/index.ts

@@ -9,6 +9,7 @@ import {
   AirMeta,
   AirAccount,
   AirExtra,
+  AirToken,
 } from "../../../generated/schema";
 
 export const AIR_META_ID = "AIR_META";
@@ -197,4 +198,20 @@ export function createAirExtra(
     entity.value = value;
   }
   return entity as AirExtra;
+}
+
+/**
+ * @dev this function does not save the returned entity
+ * @dev this function gets or creates a new air token entity
+ * @param chainID chain id
+ * @param address token address
+ * @returns AirToken entity
+ */
+export function getOrCreateAirToken(chainID: string, address: string): AirToken {
+  let entity = AirToken.load(chainID + "-" + address);
+  if (entity == null) {
+    entity = new AirToken(chainID + "-" + address);
+    entity.address = address;
+  }
+  return entity as AirToken;
 }

ens/modules/airstack/domain-name/domain-name.ts

@@ -27,7 +27,7 @@ import {
   AirExtra,
 } from "../../../generated/schema";
 import { AIR_EXTRA_TTL, AIR_SET_PRIMARY_DOMAIN_ENTITY_COUNTER_ID, AIR_DOMAIN_OWNER_CHANGED_ENTITY_COUNTER_ID, AIR_ADDR_CHANGED_ENTITY_COUNTER_ID, AIR_NAME_RENEWED_ENTITY_COUNTER_ID, AIR_NAME_REGISTERED_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_TTL_ENTITY_COUNTER_ID, AIR_DOMAIN_NEW_RESOLVER_ENTITY_COUNTER_ID, AIR_DOMAIN_TRANSFER_ENTITY_COUNTER_ID, ZERO_ADDRESS, ETHEREUM_MAINNET_ID } from "./utils";
-import { BIGINT_ONE, BIG_INT_ZERO, EMPTY_STRING, getChainId, updateAirEntityCounter, getOrCreateAirBlock, getOrCreateAirAccount, createAirExtra } from "../common";
+import { BIGINT_ONE, BIG_INT_ZERO, EMPTY_STRING, getChainId, updateAirEntityCounter, getOrCreateAirBlock, getOrCreateAirAccount, createAirExtra, getOrCreateAirToken } from "../common";
 
 export namespace domain {
   /**
@@ -1057,22 +1057,6 @@ export namespace domain {
     return domain.id
   }
 
-  /**
-   * @dev this function does not save the returned entity
-   * @dev this function gets or creates a new air token entity
-   * @param chainID chain id
-   * @param address token address
-   * @returns AirToken entity
-   */
-  function getOrCreateAirToken(chainID: string, address: string): AirToken {
-    let entity = AirToken.load(chainID + "-" + address);
-    if (entity == null) {
-      entity = new AirToken(chainID + "-" + address);
-      entity.address = address;
-    }
-    return entity as AirToken;
-  }
-
   /**
    * @dev this class has all fields required to create a domain entity
    * @param id domain id