feat: replace subscan with kilt-indexer

.env.example

@@ -1,11 +1,12 @@
 PORT=3000
 URL=http://127.0.0.1:3000
 DATABASE_URI=postgres://postgres:postgres@localhost:5432/postgres
-SUBSCAN_NETWORK=spiritnet
-SECRET_SUBSCAN=
 BLOCKCHAIN_ENDPOINT=wss://kilt-rpc.dwellir.com
 DID=
 SECRET_PAYER_MNEMONIC=
 SECRET_AUTHENTICATION_MNEMONIC=
 SECRET_ASSERTION_METHOD_MNEMONIC=
 SECRET_KEY_AGREEMENT_MNEMONIC=
+GRAPHQL_ENDPOINT=https://indexer.kilt.io/
+# while using the "...kilt.io" endpoints, please add a trailing "/" so that polkadot.js displays the right colors.
+POLKADOT_RPC_ENDPOINT=kilt.ibp.network

package.json

@@ -17,7 +17,7 @@
     "stop-db": "docker rm -f postgres",
     "migrate": "sequelize-cli db:migrate",
     "seed": "sequelize-cli db:seed:all || exit 0",
-    "build": "export $(cat .env.example) && astro build",
+    "build": "export $(grep -v '^#' .env.example | xargs) && astro build",
     "start": "pnpm migrate && pnpm seed && node --enable-source-maps dist/server/entry.mjs"
   },
   "dependencies": {

src/components/CTypeDetails/CTypeDetails.astro

@@ -30,11 +30,11 @@ const {
   title,
   creator,
   properties,
+  block,
   createdAt,
   description,
-  extrinsicHash,
   schema,
-  attestationsCount,
+  attestationsCreated,
   tags,
 } = Astro.props.cTypeData;
 
@@ -46,7 +46,7 @@ const schemaV1 = CType.fromProperties('', {}).$schema;
 const version = schema === schemaV1 ? 'V1' : 'draft-01';
 const kiltCType = CType.fromProperties(title, properties, version);
 
-const { subscan, w3nOrigin } = configuration;
+const { w3nOrigin, indexer } = configuration;
 ---
 
 <section class={containerStyles.bigContainer}>
@@ -65,7 +65,7 @@ const { subscan, w3nOrigin } = configuration;
 
   <fieldset>
     <legend>Number of attestations</legend>
-    <p>{attestationsCount}</p>
+    <p>{attestationsCreated}</p>
   </fieldset>
 
   {
@@ -96,12 +96,12 @@ const { subscan, w3nOrigin } = configuration;
   }
 
   <fieldset>
-    <legend>Transaction</legend>
+    <legend>Registration Block</legend>
 
     <a
-      href={`https://${subscan.network}.subscan.io/extrinsic/${extrinsicHash}`}
+      href={`https://polkadot.js.org/apps/?rpc=wss%3A%2F%2F${indexer.polkadotRPCEndpoint}#/explorer/query/${block}`}
     >
-      {extrinsicHash}
+      {block}
     </a>
   </fieldset>
 

src/components/CTypeDetails/__snapshots__/CTypeDetails.test.ts.snap

@@ -120,8 +120,8 @@ exports[`CTypeDetails > should handle kitchen sink CType 1`] = `
     </dl>
   </fieldset>
   <fieldset>
-    <legend>Transaction</legend>
-    <a href="https://example.subscan.io/extrinsic/0xexamplehash">0xexamplehash</a>
+    <legend>Registration Block</legend>
+    <a href="https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fplaceholder#/explorer/query/456">456</a>
   </fieldset>
   <fieldset>
     <legend>Technical Details</legend>
@@ -214,8 +214,8 @@ exports[`CTypeDetails > should handle nested CType 1`] = `
     </dl>
   </fieldset>
   <fieldset>
-    <legend>Transaction</legend>
-    <a href="https://example.subscan.io/extrinsic/0xexamplehash">0xexamplehash</a>
+    <legend>Registration Block</legend>
+    <a href="https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fplaceholder#/explorer/query/456">456</a>
   </fieldset>
   <fieldset>
     <legend>Technical Details</legend>
@@ -280,8 +280,8 @@ exports[`CTypeDetails > should handle nested CType property 1`] = `
     </dl>
   </fieldset>
   <fieldset>
-    <legend>Transaction</legend>
-    <a href="https://example.subscan.io/extrinsic/0xexamplenestedhash">0xexamplenestedhash</a>
+    <legend>Registration Block</legend>
+    <a href="https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fplaceholder#/explorer/query/321">321</a>
   </fieldset>
   <fieldset>
     <legend>Technical Details</legend>
@@ -344,8 +344,8 @@ exports[`CTypeDetails > should match snapshot 1`] = `
     </dl>
   </fieldset>
   <fieldset>
-    <legend>Transaction</legend>
-    <a href="https://example.subscan.io/extrinsic/0xexamplehash">0xexamplehash</a>
+    <legend>Registration Block</legend>
+    <a href="https://polkadot.js.org/apps/?rpc=wss%3A%2F%2Fplaceholder#/explorer/query/123">123</a>
   </fieldset>
   <fieldset>
     <legend>Tags</legend>

src/components/CTypeOverview/CTypeOverview.astro

@@ -9,7 +9,7 @@ interface Props {
   cTypeData: CTypeData;
 }
 
-const { title, id, description, attestationsCount, tags } =
+const { title, id, description, attestationsCreated, tags } =
   Astro.props.cTypeData;
 ---
 
@@ -36,7 +36,7 @@ const { title, id, description, attestationsCount, tags } =
 
   <p class="attestations">
     <span>Number of Attestations:</span>
-    <span>{attestationsCount}</span>
+    <span>{attestationsCreated}</span>
   </p>
 </li>
 

src/components/CreateForm/CreateForm.tsx

@@ -1,3 +1,11 @@
+import {
+  connect,
+  CType,
+  Did,
+  disconnect,
+  type KiltAddress,
+} from '@kiltprotocol/sdk-js';
+import { web3FromSource } from '@polkadot/extension-dapp';
 import {
   type FocusEvent,
   type FormEvent,
@@ -6,28 +14,19 @@ import {
   useCallback,
   useState,
 } from 'react';
-import { web3FromSource } from '@polkadot/extension-dapp';
-import {
-  Blockchain,
-  connect,
-  CType,
-  Did,
-  disconnect,
-  type KiltAddress,
-} from '@kiltprotocol/sdk-js';
 
 import styles from './CreateForm.module.css';
 
+import { generatePath, paths } from '../../paths';
+import { getBlockchainEndpoint } from '../../utilities/getBlockchainEndpoint';
+import { offsets } from '../../utilities/offsets';
+import { Modal } from '../Modal/Modal';
+import { PropertyFields } from '../PropertyFields/PropertyFields';
+import { getProperties } from '../PropertyFields/getProperties';
 import {
   type InjectedAccount,
   SelectAccount,
 } from '../SelectAccount/SelectAccount';
-import { Modal } from '../Modal/Modal';
-import { PropertyFields } from '../PropertyFields/PropertyFields';
-import { getProperties } from '../PropertyFields/getProperties';
-import { offsets } from '../../utilities/offsets';
-import { getBlockchainEndpoint } from '../../utilities/getBlockchainEndpoint';
-import { generatePath, paths } from '../../paths';
 
 import { useSupportedExtensions } from './useSupportedExtensions';
 
@@ -139,15 +138,12 @@ export function CreateForm() {
         const authorizedTx = api.tx(authorized.signed);
 
         const injected = await web3FromSource(account.meta.source);
-        const signed = await authorizedTx.signAsync(account.address, injected);
-        await Blockchain.submitSignedTx(signed);
+        await authorizedTx.signAndSend(account.address, injected);
 
-        const extrinsicHash = signed.hash.toHex();
         const response = await fetch(paths.ctypes, {
           method: 'POST',
           body: JSON.stringify({
             cType,
-            extrinsicHash,
             creator,
             description,
             tags,

src/components/ctype.test.ts

@@ -12,7 +12,6 @@ describe('endpoint /ctype', () => {
     const properties = {};
     const cType = CType.fromProperties('New CType', properties);
     const creator = 'did:kilt:4rrkiRTZgsgxjJDFkLsivqqKTqdUTuxKk3FX3mKFAeMxsR5E';
-    const extrinsicHash = '0x1234';
     const description = 'A CType';
 
     const response = await fetch(endpoint, {
@@ -21,7 +20,6 @@ describe('endpoint /ctype', () => {
       body: JSON.stringify({
         cType,
         creator,
-        extrinsicHash,
         description,
         tags: ['test', 'example'],
       }),
@@ -44,7 +42,7 @@ describe('endpoint /ctype', () => {
       title: cType.title,
       properties,
       creator,
-      extrinsicHash,
+      attestationsCreated: 0,
       description,
       block: null,
       isHidden: false,
@@ -63,9 +61,8 @@ describe('endpoint /ctype', () => {
     const properties = {};
     const cType = CType.fromProperties('New CType', properties);
     const creator = 'did:kilt:4rrkiRTZgsgxjJDFkLsivqqKTqdUTuxKk3FX3mKFAeMxsR5E';
-    const extrinsicHash = '0x1234';
     const tags = [] as string[];
-    const body = JSON.stringify({ cType, creator, extrinsicHash, tags });
+    const body = JSON.stringify({ cType, creator, tags });
 
     const created = await fetch(endpoint, { method, headers, body });
     expect(created.status).toBe(StatusCodes.CREATED);
@@ -78,9 +75,8 @@ describe('endpoint /ctype', () => {
     const properties = {};
     const cType = CType.fromProperties('New CType', properties);
     const creator = 'invalid';
-    const extrinsicHash = '0x1234';
     const tags = [] as string[];
-    const body = JSON.stringify({ cType, creator, extrinsicHash, tags });
+    const body = JSON.stringify({ cType, creator, tags });
 
     const response = await fetch(endpoint, { method, headers, body });
     expect(response.status).toBe(StatusCodes.UNPROCESSABLE_ENTITY);
@@ -89,9 +85,8 @@ describe('endpoint /ctype', () => {
   it('should return an error if the CType is not valid', async () => {
     const cType = { invalid: 'CType' };
     const creator = 'did:kilt:4rrkiRTZgsgxjJDFkLsivqqKTqdUTuxKk3FX3mKFAeMxsR5E';
-    const extrinsicHash = '0x1234';
     const tags = [] as string[];
-    const body = JSON.stringify({ cType, creator, extrinsicHash, tags });
+    const body = JSON.stringify({ cType, creator, tags });
 
     const response = await fetch(endpoint, { method, headers, body });
     expect(response.status).toBe(StatusCodes.UNPROCESSABLE_ENTITY);

src/components/index/__snapshots__/index.test.ts.snap

@@ -22,7 +22,7 @@ exports[`index.astro > should render all CTypes except hidden ones 1`] = `
             This is an example of a CType with a nested property
           </p>
           <p class="attestations">
-            <span>Number of Attestations:</span><span>2</span>
+            <span>Number of Attestations:</span><span>22</span>
           </p>
         </li>
         <li class="_container container">
@@ -77,7 +77,7 @@ exports[`index.astro > should render search results 1`] = `
             This is an example of a CType with a nested property
           </p>
           <p class="attestations">
-            <span>Number of Attestations:</span><span>2</span>
+            <span>Number of Attestations:</span><span>22</span>
           </p>
         </li>
       </ul>
@@ -124,7 +124,7 @@ exports[`index.astro > should render tag results 1`] = `
             This is an example of a CType with a nested property
           </p>
           <p class="attestations">
-            <span>Number of Attestations:</span><span>2</span>
+            <span>Number of Attestations:</span><span>22</span>
           </p>
         </li>
         <li class="_container container">

src/components/index/index.test.ts

@@ -2,9 +2,7 @@ import { beforeEach, describe, expect, it } from 'vitest';
 
 import { getSnapshotHtmlForPath } from '../../../testing/getSnapshotHtmlForPath';
 import { CType as CTypeModel } from '../../models/ctype';
-import { Attestation as AttestationModel } from '../../models/attestation';
 import { mockCTypes } from '../../utilities/mockCTypes';
-import { mockAttestations } from '../../utilities/mockAttestations';
 import { initializeDatabase } from '../../utilities/sequelize';
 import { resetDatabase } from '../../../testing/resetDatabase';
 import { Tag } from '../../models/tag';
@@ -18,7 +16,6 @@ beforeEach(async () => {
     mockCTypes.hidden,
   ]);
   await Tag.create({ tagName: 'example', cTypeId: mockCTypes.example.id });
-  await AttestationModel.bulkCreate(mockAttestations);
 });
 
 describe('index.astro', () => {

src/migrations/20240807132131-dropAttestations.cjs

@@ -0,0 +1,68 @@
+'use strict';
+
+/** @type {import('sequelize-cli').Migration} */
+module.exports = {
+  async up(queryInterface) {
+    /**
+     * Reverts (combines `down` functions of) following migrations:
+     * - `20230712145719-foreignKeys.cjs`
+     * - `20230711125237-attestations.cjs`
+     */
+    await queryInterface.removeConstraint(
+      'Attestations',
+      'Attestations_cTypeId_fkey',
+    );
+
+    await queryInterface.dropTable('Attestations');
+  },
+
+  async down(queryInterface, Sequelize) {
+    const { sequelize } = queryInterface;
+
+    /**
+     * Recreates (combines `up` functions of) following migrations:
+     * - `20230712145719-foreignKeys.cjs`
+     * - `20230711125237-attestations.cjs`
+     */
+    sequelize.define(
+      'Attestation',
+      {
+        claimHash: {
+          type: Sequelize.STRING,
+          primaryKey: true,
+        },
+        cTypeId: {
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        owner: {
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        delegationId: {
+          type: Sequelize.STRING,
+        },
+        createdAt: {
+          type: Sequelize.DATE,
+          allowNull: false,
+        },
+        extrinsicHash: {
+          type: Sequelize.STRING,
+          allowNull: false,
+        },
+        block: {
+          type: Sequelize.STRING,
+        },
+      },
+      { indexes: [{ fields: ['cTypeId'] }] },
+    );
+    await sequelize.sync();
+
+    await queryInterface.addConstraint('Attestations', {
+      type: 'foreign key',
+      name: 'Attestations_cTypeId_fkey',
+      fields: ['cTypeId'],
+      references: { table: 'CTypes', field: 'id' },
+    });
+  },
+};