diff --git a/docs/functions/sync_handlers_event_data_sync_wasm_handler.syncWasmEventData.html b/docs/functions/sync_handlers_event_data_sync_wasm_handler.syncWasmEventData.html index a480dea..98d89ee 100644 --- a/docs/functions/sync_handlers_event_data_sync_wasm_handler.syncWasmEventData.html +++ b/docs/functions/sync_handlers_event_data_sync_wasm_handler.syncWasmEventData.html @@ -18,7 +18,7 @@

Function syncWasmEventData

-

Returns Promise<void>

diff --git a/docs/functions/sync_sync_chain.syncChain.html b/docs/functions/sync_sync_chain.syncChain.html index 75e8089..bf01273 100644 --- a/docs/functions/sync_sync_chain.syncChain.html +++ b/docs/functions/sync_sync_chain.syncChain.html @@ -22,7 +22,7 @@

Function syncChain

  • Returns Promise<void>

    • +
  • Defined in src/sync/sync_chain.ts:14
    • diff --git a/docs/index.html b/docs/index.html index 7130aec..bc92106 100644 --- a/docs/index.html +++ b/docs/index.html @@ -16,19 +16,15 @@

    ixo-blocksync

    ixo-blocksync

     -

    GitHub contributors GitHub repo size Lines of code Docker Pulls Twitter Follow

    +

    ixo +GitHub +GitHub repo size +License: Apache 2.0

    PostgresExpress.jsNodeJSTypeScriptPrismaDockerGraphQL

    -

    Syncs all the public info from an ixo blockchain to an instance of PostgreSQL.

    - - -

    API Documentation

    -     -

    Refer to src/schema/api.yml or visit the online version.

    - +

    Syncs all the public info from an ixo blockchain to an instance of PostgreSQL. It gets fed from a ixo-blocksync-core database in order to speed up indexing and put less strain on nodes, which means you need an ixo-blocksync-core database connection in order to run this.

    +
    +

    For now the only source for information is a ixo-blocksync-core database connection, but we plan on expanding that to different sources in the near future.

    +

    Run

    @@ -65,25 +61,17 @@

    Using Docker (with Compose)

    Don't use quotations when asign env vars for docker
    Delete the seed folder in src/seed/* if you do not plan to import data from json
    Create a role(e.g. app_user) in the DB for postgress to work

    docker build -t ixofoundation/ixo-blocksync:latest .
    docker compose up -d
    -
    -     -

    Seeding the Database with Previous MongoDB Data

    +     +

    API interface

     +

    The server exposes a Graphql api endpoint at /graphql which is set up using Postgraphile along with some plugins:

    -

    Local PostgreSQL

    - -
    npx prisma migrate reset
    npx prisma generate
    npx ts-node src/seed/seed.ts
-
    -

    Docker PostgreSQL

    -
    docker build .
    docker compose up block-sync-db
    npx prisma generate
    npx ts-node src/seed/seed.ts
-
    +

    A graphiql playground gets exposed at the endpoint /graphiql where you can play around, test queries and see the schemas.

    +

    We also generate and expose the full graphql schema file (schema.graphql) under the endpoint /api/graphql_schema if you need it to generate clients.

    diff --git a/docs/variables/sync_sync_chain.currentChain.html b/docs/variables/sync_sync_chain.currentChain.html index fbfc0fe..85d1c5a 100644 --- a/docs/variables/sync_sync_chain.currentChain.html +++ b/docs/variables/sync_sync_chain.currentChain.html @@ -18,7 +18,7 @@

    Variable currentChain

    currentChain: Chain
    +
  • Defined in src/sync/sync_chain.ts:10
    • diff --git a/docs/variables/sync_sync_chain.queryClient.html b/docs/variables/sync_sync_chain.queryClient.html index 0b4f5e6..2bf1311 100644 --- a/docs/variables/sync_sync_chain.queryClient.html +++ b/docs/variables/sync_sync_chain.queryClient.html @@ -18,7 +18,7 @@

    Variable queryClient

    queryClient: Awaited<ReturnType<typeof createQueryClient>>
    +
  • Defined in src/sync/sync_chain.ts:11
    • diff --git a/docs/variables/sync_sync_chain.registry.html b/docs/variables/sync_sync_chain.registry.html index d9ddca1..75b24a3 100644 --- a/docs/variables/sync_sync_chain.registry.html +++ b/docs/variables/sync_sync_chain.registry.html @@ -18,7 +18,7 @@

    Variable registry

    registry: ReturnType<typeof createRegistry>
    +
  • Defined in src/sync/sync_chain.ts:12
    • diff --git a/public/graphql/schema.graphql b/public/graphql/schema.graphql index 838c24a..7236ea5 100644 --- a/public/graphql/schema.graphql +++ b/public/graphql/schema.graphql @@ -1108,7 +1108,7 @@ type Bond implements Node { name: String! description: String! functionType: String! - functionParameters: [JSON] + functionParameters: JSON! creatorDid: String! controllerDid: String! reserveTokens: [String] @@ -1117,13 +1117,13 @@ type Bond implements Node { feeAddress: String! reserveWithdrawalAddress: String! maxSupply: JSON - orderQuantityLimits: [JSON] + orderQuantityLimits: JSON! sanityRate: String! sanityMarginPercentage: String! currentSupply: JSON - currentReserve: [JSON] - availableReserve: [JSON] - currentOutcomePaymentReserve: [JSON] + currentReserve: JSON! + availableReserve: JSON! + currentOutcomePaymentReserve: JSON! allowSells: Boolean! allowReserveWithdrawals: Boolean! alphaBond: Boolean! @@ -1401,7 +1401,7 @@ type BondBuy implements Node { bondDid: String! accountDid: String! amount: JSON! - maxPrices: [JSON] + maxPrices: JSON! height: Int! timestamp: Datetime! @@ -1480,7 +1480,7 @@ input BondBuyCondition { amount: JSON """Checks for equality with the object’s `maxPrices` field.""" - maxPrices: [JSON] + maxPrices: JSON """Checks for equality with the object’s `height` field.""" height: Int @@ -1506,7 +1506,7 @@ input BondBuyFilter { amount: JSONFilter """Filter by the object’s `maxPrices` field.""" - maxPrices: JSONListFilter + maxPrices: JSONFilter """Filter by the object’s `height` field.""" height: IntFilter @@ -1758,69 +1758,6 @@ input JSONFilter { containedBy: JSON } -""" -A filter to be used against JSON List fields. All fields are combined with a logical ‘and.’ -""" -input JSONListFilter { - """ - Is null (if `true` is specified) or is not null (if `false` is specified). - """ - isNull: Boolean - - """Equal to the specified value.""" - equalTo: [JSON] - - """Not equal to the specified value.""" - notEqualTo: [JSON] - - """ - Not equal to the specified value, treating null like an ordinary value. - """ - distinctFrom: [JSON] - - """Equal to the specified value, treating null like an ordinary value.""" - notDistinctFrom: [JSON] - - """Less than the specified value.""" - lessThan: [JSON] - - """Less than or equal to the specified value.""" - lessThanOrEqualTo: [JSON] - - """Greater than the specified value.""" - greaterThan: [JSON] - - """Greater than or equal to the specified value.""" - greaterThanOrEqualTo: [JSON] - - """Contains the specified list of values.""" - contains: [JSON] - - """Contained by the specified list of values.""" - containedBy: [JSON] - - """Overlaps the specified list of values.""" - overlaps: [JSON] - - """Any array item is equal to the specified value.""" - anyEqualTo: JSON - - """Any array item is not equal to the specified value.""" - anyNotEqualTo: JSON - - """Any array item is less than the specified value.""" - anyLessThan: JSON - - """Any array item is less than or equal to the specified value.""" - anyLessThanOrEqualTo: JSON - - """Any array item is greater than the specified value.""" - anyGreaterThan: JSON - - """Any array item is greater than or equal to the specified value.""" - anyGreaterThanOrEqualTo: JSON -} - """ A filter to be used against Datetime fields. All fields are combined with a logical ‘and.’ """ @@ -1886,7 +1823,7 @@ input BondFilter { functionType: StringFilter """Filter by the object’s `functionParameters` field.""" - functionParameters: JSONListFilter + functionParameters: JSONFilter """Filter by the object’s `creatorDid` field.""" creatorDid: StringFilter @@ -1913,7 +1850,7 @@ input BondFilter { maxSupply: JSONFilter """Filter by the object’s `orderQuantityLimits` field.""" - orderQuantityLimits: JSONListFilter + orderQuantityLimits: JSONFilter """Filter by the object’s `sanityRate` field.""" sanityRate: StringFilter @@ -1925,13 +1862,13 @@ input BondFilter { currentSupply: JSONFilter """Filter by the object’s `currentReserve` field.""" - currentReserve: JSONListFilter + currentReserve: JSONFilter """Filter by the object’s `availableReserve` field.""" - availableReserve: JSONListFilter + availableReserve: JSONFilter """Filter by the object’s `currentOutcomePaymentReserve` field.""" - currentOutcomePaymentReserve: JSONListFilter + currentOutcomePaymentReserve: JSONFilter """Filter by the object’s `allowSells` field.""" allowSells: BooleanFilter @@ -2278,7 +2215,7 @@ input ReserveWithdrawalFilter { withdrawerAddress: StringFilter """Filter by the object’s `amount` field.""" - amount: JSONListFilter + amount: JSONFilter """Filter by the object’s `reserveWithdrawalAddress` field.""" reserveWithdrawalAddress: StringFilter @@ -2339,7 +2276,7 @@ input ShareWithdrawalFilter { recipientAddress: StringFilter """Filter by the object’s `amount` field.""" - amount: JSONListFilter + amount: JSONFilter """Filter by the object’s `height` field.""" height: IntFilter @@ -2397,7 +2334,7 @@ input OutcomePaymentFilter { senderAddress: StringFilter """Filter by the object’s `amount` field.""" - amount: JSONListFilter + amount: JSONFilter """Filter by the object’s `height` field.""" height: IntFilter @@ -2677,7 +2614,7 @@ type ReserveWithdrawal implements Node { bondDid: String! withdrawerDid: String! withdrawerAddress: String! - amount: [JSON] + amount: JSON! reserveWithdrawalAddress: String! height: Int! timestamp: Datetime! @@ -2736,7 +2673,7 @@ input ReserveWithdrawalCondition { withdrawerAddress: String """Checks for equality with the object’s `amount` field.""" - amount: [JSON] + amount: JSON """ Checks for equality with the object’s `reserveWithdrawalAddress` field. @@ -2778,7 +2715,7 @@ type ShareWithdrawal implements Node { bondDid: String! recipientDid: String! recipientAddress: String! - amount: [JSON] + amount: JSON! height: Int! timestamp: Datetime! @@ -2834,7 +2771,7 @@ input ShareWithdrawalCondition { recipientAddress: String """Checks for equality with the object’s `amount` field.""" - amount: [JSON] + amount: JSON """Checks for equality with the object’s `height` field.""" height: Int @@ -2869,7 +2806,7 @@ type OutcomePayment implements Node { bondDid: String! senderDid: String! senderAddress: String! - amount: [JSON] + amount: JSON! height: Int! timestamp: Datetime! @@ -2925,7 +2862,7 @@ input OutcomePaymentCondition { senderAddress: String """Checks for equality with the object’s `amount` field.""" - amount: [JSON] + amount: JSON """Checks for equality with the object’s `height` field.""" height: Int @@ -3114,7 +3051,7 @@ input BondCondition { functionType: String """Checks for equality with the object’s `functionParameters` field.""" - functionParameters: [JSON] + functionParameters: JSON """Checks for equality with the object’s `creatorDid` field.""" creatorDid: String @@ -3143,7 +3080,7 @@ input BondCondition { maxSupply: JSON """Checks for equality with the object’s `orderQuantityLimits` field.""" - orderQuantityLimits: [JSON] + orderQuantityLimits: JSON """Checks for equality with the object’s `sanityRate` field.""" sanityRate: String @@ -3155,15 +3092,15 @@ input BondCondition { currentSupply: JSON """Checks for equality with the object’s `currentReserve` field.""" - currentReserve: [JSON] + currentReserve: JSON """Checks for equality with the object’s `availableReserve` field.""" - availableReserve: [JSON] + availableReserve: JSON """ Checks for equality with the object’s `currentOutcomePaymentReserve` field. """ - currentOutcomePaymentReserve: [JSON] + currentOutcomePaymentReserve: JSON """Checks for equality with the object’s `allowSells` field.""" allowSells: Boolean diff --git a/src/sync_handlers/event_data_sync_wasm_handler.ts b/src/sync_handlers/event_data_sync_wasm_handler.ts index 1f9aa5a..356bc57 100644 --- a/src/sync_handlers/event_data_sync_wasm_handler.ts +++ b/src/sync_handlers/event_data_sync_wasm_handler.ts @@ -3,7 +3,7 @@ import { getWasmAttr, splitAttributesByKeyValue } from "../util/helpers"; import { ENTITY_MODULE_CONTRACT_ADDRESS } from "../util/secrets"; import { GetEventType } from "../types/getBlock"; -export const syncWasmEventData = async (event: GetEventType) => { +export const syncWasmEventData = async (event: GetEventType): Promise => { try { const contractAddress = getWasmAttr(event.attributes, "_contract_address"); const action = getWasmAttr(event.attributes, "action"); @@ -13,13 +13,18 @@ export const syncWasmEventData = async (event: GetEventType) => { const tokenId = getWasmAttr(event.attributes, "token_id"); if (action === "mint") { - // use setTimeout to wait for the entity to be created as creation event is after wasm event - setTimeout(async () => { - await prisma.entity.update({ - where: { id: tokenId }, - data: { owner: getWasmAttr(event.attributes, "owner") }, - }); - }, 500); + // if action for entity contract address is mint it means it is a nft minting and since wasm events come before + // module events it means the entity creation event on entity module didnt happen yet so we need to delay this + // function until the entity creation event happens, which is after iid creation event, thus the skip 2 + return { + skip: 2, + func: async () => { + await prisma.entity.update({ + where: { id: tokenId }, + data: { owner: getWasmAttr(event.attributes, "owner") }, + }); + }, + }; } else if (action === "transfer_nft") { await prisma.entity.update({ where: { id: tokenId }, @@ -37,23 +42,29 @@ export const syncWasmEventData = async (event: GetEventType) => { // split attributes by action as cosmwasm joins all attributes into one array const messages = splitAttributesByKeyValue(event.attributes as any); for (const message of messages) { - setTimeout( - async () => { - await prisma.token.update({ - where: { id: getWasmAttr(message, "token_id") }, - data: { - tokenTransaction: { - create: { - from: getWasmAttr(message, "from"), - to: getWasmAttr(message, "to"), - amount: getWasmAttr(message, "amount"), - }, - }, - }, - }); - }, - getWasmAttr(message, "from") ? 0 : 500 - ); + const tokenTransaction = { + from: getWasmAttr(message, "from"), + to: getWasmAttr(message, "to"), + amount: getWasmAttr(message, "amount"), + }; + if (getWasmAttr(message, "from")) { + await prisma.token.update({ + where: { id: getWasmAttr(message, "token_id") }, + data: { tokenTransaction: { create: tokenTransaction } }, + }); + } else { + // if no from it means it is a token minting and since wasm events come before module events it means the token creation + // event on token module didnt happen yet so we need to delay this function until the token creation event happens + return { + skip: 1, + func: async () => { + await prisma.token.update({ + where: { id: getWasmAttr(message, "token_id") }, + data: { tokenTransaction: { create: tokenTransaction } }, + }); + }, + }; + } } } } catch (error) { diff --git a/src/sync_handlers/event_sync_handler.ts b/src/sync_handlers/event_sync_handler.ts index 9332098..557e733 100644 --- a/src/sync_handlers/event_sync_handler.ts +++ b/src/sync_handlers/event_sync_handler.ts @@ -7,6 +7,7 @@ export const syncEvents = async ( blockHeight: number, timestamp: Date ) => { + let delayedFunction: any = null; let i = 0; for (const event of events) { if (i === 0) { @@ -14,11 +15,32 @@ export const syncEvents = async ( i++; } + let res: any = null; try { - if (event.type === "wasm") await syncWasmEventData(event); - else await syncEventData(event, blockHeight, timestamp); + if (event.type === "wasm") { + res = await syncWasmEventData(event); + } else { + await syncEventData(event, blockHeight, timestamp); + } + // run delayed function after syncEventData if skip value 1 + if ( + delayedFunction && + delayedFunction.skip === 1 && + delayedFunction.func instanceof Function + ) { + await delayedFunction.func(); + } } catch (error) { console.error("syncEvent: ", error.message); + } finally { + // if delayedFunction is not null and skip value is not 1, then minus current skip value by 1 + // NOTE: this means if there is current delayedFunction, then a new one cant be set until the current one is run + // which theoretically should never happen + if (delayedFunction && delayedFunction.skip !== 1) { + delayedFunction.skip--; + } else { + delayedFunction = res; + } } } };