Merge pull request #18 from interlay/theo/fix-oracle-currencies

fix: broken oracle update decoding with the new currency refactor

Author: theodorebugnet

.env

@@ -1,13 +1,33 @@
+# #localhost
 # ARCHIVE_ENDPOINT=http://localhost:4010/v1/graphql
 # CHAIN_ENDPOINT=ws://localhost:9944
-ARCHIVE_ENDPOINT=https://api-kusama.interlay.io/gateway-graphql/v1/graphql
-CHAIN_ENDPOINT=wss://api-kusama.interlay.io/parachain
 
-PROCESS_FROM=540000
+# #Interlay (mainnet)
+# TOADD: urls
+# SS58_CODEC="interlay"
+# BITCOIN_NETWORK='mainnet'
+
+# #Kintsugi (mainnet)
+# ARCHIVE_ENDPOINT=https://api-kusama.interlay.io/gateway-graphql/v1/graphql
+# CHAIN_ENDPOINT=wss://api-kusama.interlay.io/parachain
+# PROCESS_FROM=540000
+# SS58_CODEC="kintsugi"
+# BITCOIN_NETWORK='mainnet'
+
+# #Interlay (testnet)
+# TOADD: urls
+# SS58_CODEC="interlay"
+# BITCOIN_NETWORK='testnet'
+
+#Kintsugi (testnet)
+ARCHIVE_ENDPOINT=https://api-dev-kintsugi.interlay.io/gateway-graphql/v1/graphql
+CHAIN_ENDPOINT=wss://api-dev-kintsugi.interlay.io/parachain
+PROCESS_FROM=44800
 SS58_CODEC="kintsugi"
+BITCOIN_NETWORK='testnet'
+
 
 # Params config
-BITCOIN_NETWORK='mainnet'
 
 # DB config
 DB_NAME=indexer

db/migrations/1660849179124-oraclecurrency.js

@@ -0,0 +1,13 @@
+module.exports = class oraclecurrency1660849179124 {
+  name = 'oraclecurrency1660849179124'
+
+  async up(db) {
+    await db.query(`ALTER TABLE "oracle_update" DROP COLUMN "type_key"`)
+    await db.query(`ALTER TABLE "oracle_update" ADD "type_key" jsonb`)
+  }
+
+  async down(db) {
+    await db.query(`ALTER TABLE "oracle_update" ADD "type_key" text`)
+    await db.query(`ALTER TABLE "oracle_update" DROP COLUMN "type_key"`)
+  }
+}

package.json

@@ -1,7 +1,7 @@
 {
     "name": "interbtc-indexer",
     "private": "true",
-    "version": "0.8.0",
+    "version": "0.9.0",
     "description": "GraphQL server and Substrate indexer for the interBTC parachain",
     "author": "",
     "license": "ISC",

schema.graphql

@@ -178,7 +178,7 @@ type OracleUpdate @entity {
     timestamp: DateTime!
     oracleId: String!
     type: OracleUpdateType!
-    typeKey: String
+    typeKey: Currency
     updateValue: BigInt!
 }
 

src/mappings/event/oracle.ts

@@ -33,13 +33,12 @@ export async function feedValues(ctx: EventHandlerContext): Promise<void> {
         });
         let keyToString = key.__kind.toString();
         if (key.__kind === "ExchangeRate") {
-            const typeString = useLegacyCurrency
+            const exchangeCurrency = useLegacyCurrency
                 ? legacyCurrencyId
-                      .encode(key.value as CurrencyId_V15)
-                      .toString()
-                : currencyId.encode(key.value as CurrencyId_V17).toString();
-            update.typeKey = typeString;
-            keyToString += typeString;
+                    .encode(key.value as CurrencyId_V15)
+                : currencyId.encode(key.value as CurrencyId_V17);
+            update.typeKey = exchangeCurrency;
+            keyToString += JSON.stringify(exchangeCurrency);
         }
         update.id = `${oracleAddress}-${height.absolute.toString()}-${keyToString}`;
         await ctx.store.save(update);

src/model/generated/_nativeToken.ts

@@ -9,7 +9,7 @@ export class NativeToken {
   constructor(props?: Partial<Omit<NativeToken, 'toJSON'>>, json?: any) {
     Object.assign(this, props)
     if (json != null) {
-      this._token = marshal.string.fromJSON(json.token) as Token // MANUALLY EDITED
+      this._token = marshal.string.fromJSON(json.token) as Token
     }
   }
 

src/model/generated/oracleUpdate.model.ts

@@ -2,6 +2,7 @@ import {Entity as Entity_, Column as Column_, PrimaryColumn as PrimaryColumn_, M
 import * as marshal from "./marshal"
 import {Height} from "./height.model"
 import {OracleUpdateType} from "./_oracleUpdateType"
+import {Currency, fromJsonCurrency} from "./_currency"
 
 @Entity_()
 export class OracleUpdate {
@@ -25,8 +26,8 @@ export class OracleUpdate {
   @Column_("varchar", {length: 13, nullable: false})
   type!: OracleUpdateType
 
-  @Column_("text", {nullable: true})
-  typeKey!: string | undefined | null
+  @Column_("jsonb", {transformer: {to: obj => obj == null ? undefined : obj.toJSON(), from: obj => obj == null ? undefined : fromJsonCurrency(obj)}, nullable: true})
+  typeKey!: Currency | undefined | null
 
   @Column_("numeric", {transformer: marshal.bigintTransformer, nullable: false})
   updateValue!: bigint