diff --git a/packages/graphql/database/1.sql b/packages/graphql/database/1.sql index 4fe7f2be..30843eab 100644 --- a/packages/graphql/database/1.sql +++ b/packages/graphql/database/1.sql @@ -2,6 +2,7 @@ create table indexer.assets_contracts ( asset_id text not null, contract_id text not null, transaction_id text not null, + sub_id text, name text, symbol text, decimals integer, diff --git a/packages/graphql/src/application/uc/IndexAsset.ts b/packages/graphql/src/application/uc/IndexAsset.ts index ed6a7eb9..1fa992f6 100644 --- a/packages/graphql/src/application/uc/IndexAsset.ts +++ b/packages/graphql/src/application/uc/IndexAsset.ts @@ -19,6 +19,7 @@ export default class IndexAsset { assetId, contractId: receipt.id, transactionId: transaction.id, + subId: receipt.subId, name: null, symbol: null, decimals: null, @@ -50,11 +51,12 @@ export default class IndexAsset { } try { connection.query( - 'insert into indexer.assets_contracts (asset_id, contract_id, transaction_id, name, symbol, decimals, error) values ($1, $2, $3, $4, $5, $6, $7) on conflict do nothing', + 'insert into indexer.assets_contracts (asset_id, contract_id, transaction_id, sub_id, name, symbol, decimals, error) values ($1, $2, $3, $4, $5, $6, $7, $8) on conflict do nothing', [ asset.assetId, asset.contractId, asset.transactionId, + asset.subId, asset.name, asset.symbol, asset.decimals, diff --git a/packages/graphql/src/graphql/generated/mocks.ts b/packages/graphql/src/graphql/generated/mocks.ts index 21813f69..a2c6148d 100644 --- a/packages/graphql/src/graphql/generated/mocks.ts +++ b/packages/graphql/src/graphql/generated/mocks.ts @@ -9,6 +9,7 @@ export const anAsset = (overrides?: Partial): { __typename: 'Asset' } icon: overrides && overrides.hasOwnProperty('icon') ? overrides.icon! : 'explicabo', name: overrides && overrides.hasOwnProperty('name') ? overrides.name! : 'dolorem', networks: overrides && overrides.hasOwnProperty('networks') ? overrides.networks! : [anAssetNetworkEthereum()], + subId: overrides && overrides.hasOwnProperty('subId') ? overrides.subId! : 'omnis', symbol: overrides && overrides.hasOwnProperty('symbol') ? overrides.symbol! : 'quaerat', verified: overrides && overrides.hasOwnProperty('verified') ? overrides.verified! : false, }; diff --git a/packages/graphql/src/graphql/generated/sdk-provider.ts b/packages/graphql/src/graphql/generated/sdk-provider.ts index c6e5e4bf..1e1659d6 100644 --- a/packages/graphql/src/graphql/generated/sdk-provider.ts +++ b/packages/graphql/src/graphql/generated/sdk-provider.ts @@ -43,6 +43,7 @@ export type GQLAsset = { icon?: Maybe; name?: Maybe; networks?: Maybe>>; + subId?: Maybe; symbol?: Maybe; verified?: Maybe; }; diff --git a/packages/graphql/src/graphql/generated/sdk.ts b/packages/graphql/src/graphql/generated/sdk.ts index 50b7cda1..4048cc2c 100644 --- a/packages/graphql/src/graphql/generated/sdk.ts +++ b/packages/graphql/src/graphql/generated/sdk.ts @@ -43,6 +43,7 @@ export type GQLAsset = { icon?: Maybe; name?: Maybe; networks?: Maybe>>; + subId?: Maybe; symbol?: Maybe; verified?: Maybe; }; @@ -1508,7 +1509,7 @@ export type GQLAssetQueryVariables = Exact<{ }>; -export type GQLAssetQuery = { __typename: 'Query', asset?: { __typename: 'Asset', assetId?: string | null, contractId?: string | null, name?: string | null, symbol?: string | null, decimals?: string | null, icon?: string | null, verified?: boolean | null } | null }; +export type GQLAssetQuery = { __typename: 'Query', asset?: { __typename: 'Asset', assetId?: string | null, contractId?: string | null, subId?: string | null, name?: string | null, symbol?: string | null, decimals?: string | null, icon?: string | null, verified?: boolean | null } | null }; export type GQLBalanceItemFragment = { __typename: 'Balance', amount: string, assetId: string, owner: string, utxos?: Array<{ __typename: 'UtxoItem', amount: string, blockCreated?: string | null, txCreatedIdx?: string | null, utxoId: string } | null> | null }; @@ -2109,6 +2110,7 @@ export const AssetDocument = gql` asset(assetId: $assetId) { assetId contractId + subId name symbol decimals diff --git a/packages/graphql/src/graphql/queries/sdk/asset.graphql b/packages/graphql/src/graphql/queries/sdk/asset.graphql index d75d17c1..556e6e92 100644 --- a/packages/graphql/src/graphql/queries/sdk/asset.graphql +++ b/packages/graphql/src/graphql/queries/sdk/asset.graphql @@ -2,6 +2,7 @@ query asset($assetId: String!){ asset (assetId: $assetId) { assetId contractId + subId name symbol decimals diff --git a/packages/graphql/src/graphql/schemas/explorer.graphql b/packages/graphql/src/graphql/schemas/explorer.graphql index 07de5c6c..d80fe8b1 100644 --- a/packages/graphql/src/graphql/schemas/explorer.graphql +++ b/packages/graphql/src/graphql/schemas/explorer.graphql @@ -253,6 +253,7 @@ type BlocksDashboardConnection { type Asset { assetId: String contractId: String + subId: String name: String symbol: String decimals: U64 diff --git a/packages/graphql/src/infra/dao/AssetDAO.ts b/packages/graphql/src/infra/dao/AssetDAO.ts index 7817369a..e5a410ec 100644 --- a/packages/graphql/src/infra/dao/AssetDAO.ts +++ b/packages/graphql/src/infra/dao/AssetDAO.ts @@ -20,6 +20,7 @@ export default class BlockDAO { return { assetId: assetData.asset_id, contractId: assetData.contract_id, + subId: assetData.sub_id, name: assetData.name, symbol: assetData.symbol, decimals: assetData.decimals,