up

Signed-off-by: mihaisc <[email protected]>

Author: mihaisc

.eslintrc

@@ -1,27 +1,14 @@
 {
   "parser": "@typescript-eslint/parser",
-  "root": true,
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "plugins": [
-    "@typescript-eslint"
-  ],
+  "parserOptions": {
+    "project": ["./tsconfig.json"]
+  },
+  "extends": ["oceanprotocol", "plugin:prettier/recommended"],
+  "plugins": ["@typescript-eslint"],
   "rules": {
-    "comma-spacing": [
-      "error",
-      {
-        "before": false,
-        "after": true
-      }
-    ],
-    "prefer-const": [
-      "off"
-    ],
-    "prettier/prettier": "error",
-    "mocha-no-only/mocha-no-only": [
-      "error"
-    ],
+    "no-use-before-define": "off",
+    "eqeqeq": "off",
+    "@typescript-eslint/no-use-before-define": "error",
+    "no-undef": ["warn"]
   }
-}
+}

.prettierrc

@@ -1,31 +1,6 @@
 {
-  "overrides": [
-    {
-      "files": "*.sol",
-      "options": {
-        "bracketSpacing": true,
-        "explicitTypes": "always",
-        "printWidth": 120,
-        "singleQuote": false,
-        "tabWidth": 4,
-        "useTabs": false
-      }
-    },
-    {
-      "files": "*.ts",
-      "options": {
-        "bracketSpacing": true,
-        "explicitTypes": "always",
-        "newline-before-return": true,
-        "no-duplicate-variable": [true, "check-parameters"],
-        "no-var-keyword": true,
-        "printWidth": 120,
-        "semi": true,
-        "singleQuote": true,
-        "tabWidth": 2,
-        "trailingComma": "es5",
-        "useTabs": false
-      }
-    }
-  ]
-}
+  "semi": false,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "tabWidth": 2
+}

schema.graphql

@@ -235,7 +235,7 @@ type Dispenser @entity {
 type DispenserTransaction @entity {
   id: ID!
   dispenserId: Dispenser!
-  datatoken: Datatoken!
+  datatoken: Token!
   user: User!
   amount: BigDecimal!
   block: Int!
@@ -246,11 +246,11 @@ type DispenserTransaction @entity {
 
 
 type PoolSnapshotTokenValue @entity {
-  id: ID! # pool tx +  tokenAddress
-  tokenAddress: String!
-  value: BigDecimal!
+  id: ID!                                                            # pool tx +  tokenAddress
+  token: Token!
+  value: BigDecimal!                                            
   tokenReserve: BigDecimal!
-  feeValue: BigDecimal! # Swap fee value in OCEAN
+  feeValue: BigDecimal!                                              # Swap fee value in OCEAN
   type: String!
   poolSnapshot: PoolSnapshot! 
 }
@@ -260,41 +260,25 @@ type PoolSnapshot @entity {
   id: ID!
   pool: Pool!
   totalShares: BigDecimal!
-  swapVolume: BigDecimal!
-  swapFees: BigDecimal!
-  timestamp: Int!
+  swapVolume: BigDecimal!                                             # swap value 24h
+  swapFees: BigDecimal!                                               # swap fee value 24h  
+  timestamp: Int!                                                     # date without time
+  spotPrice: BigDecimal!                                              # TODO: last spot price or first one?
   tokens: [PoolSnapshotTokenValue!] @derivedFrom(field: "poolSnapshot")
 }
 
 
+// shouldn't we move this to aquarius?
 type MetadataUpdate @entity {
   id: ID! # update tx +  datatokenAddress
   datatokenId: Datatoken!
 
   datatokenAddress: String!
   userAddress: String!
 
-//all fields from the market edit
-name 
-description
-author
-links
-timeout
 
 
   block: Int!
   timestamp: Int!
   tx: Bytes!
 }
-
-type Asset {
-
-did
-name 
-description
-author
-services ? [ access, compute ] ?
-
-datatoken : Datatoken
-}
-