@develit-services/blockchain 0.8.1 → 0.8.3

package/dist/database/schema.cjs

@@ -1,10 +1,14 @@
 'use strict';
 
-const database_schema = require('../shared/blockchain.BBvwu2_7.cjs');
+const database_schema = require('../shared/blockchain.CbmnjjFl.cjs');
 require('@develit-io/backend-sdk');
 require('drizzle-orm/sqlite-core');
+require('../shared/blockchain.Cjq9eH7Z.cjs');
+require('zod');
 
 
 
 exports.address = database_schema.address;
+exports.addressCredentials = database_schema.addressCredentials;
+exports.tokens = database_schema.tokens;
 exports.transaction = database_schema.transaction;

package/dist/database/schema.d.cts

@@ -1,2 +1,2 @@
-export { a as address, t as transaction } from '../shared/blockchain.Cx60lJ0c.cjs';
+export { c as address, d as addressCredentials, t as tokens, e as transaction } from '../shared/blockchain.DUhjXgba.cjs';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.mts

@@ -1,2 +1,2 @@
-export { a as address, t as transaction } from '../shared/blockchain.Cx60lJ0c.mjs';
+export { c as address, d as addressCredentials, t as tokens, e as transaction } from '../shared/blockchain.DUhjXgba.mjs';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.d.ts

@@ -1,2 +1,2 @@
-export { a as address, t as transaction } from '../shared/blockchain.Cx60lJ0c.js';
+export { c as address, d as addressCredentials, t as tokens, e as transaction } from '../shared/blockchain.DUhjXgba.js';
 import 'drizzle-orm/sqlite-core';

package/dist/database/schema.mjs

@@ -1,3 +1,5 @@
-export { a as address, t as transaction } from '../shared/blockchain._wwKu1qP.mjs';
+export { a as address, b as addressCredentials, t as tokens, c as transaction } from '../shared/blockchain._nv3VxNA.mjs';
 import '@develit-io/backend-sdk';
 import 'drizzle-orm/sqlite-core';
+import '../shared/blockchain.CKh8Fs7w.mjs';
+import 'zod';

package/dist/export/worker.cjs

@@ -3,104 +3,17 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 const backendSdk = require('@develit-io/backend-sdk');
-const viem = require('viem');
-const drizzle = require('../shared/blockchain.DN735AwB.cjs');
-const syncAddress = require('../shared/blockchain.C0wB1XUE.cjs');
+const blockchain = require('../shared/blockchain.BUbQBxqd.cjs');
+const syncAddress = require('../shared/blockchain.Cjq9eH7Z.cjs');
 const cloudflare_workers = require('cloudflare:workers');
 const d1 = require('drizzle-orm/d1');
-require('../shared/blockchain.BBvwu2_7.cjs');
+require('../shared/blockchain.CbmnjjFl.cjs');
 require('drizzle-orm/sqlite-core');
 require('drizzle-orm');
+require('viem');
+require('viem/accounts');
 require('zod');
 
-class IBlockchainConnector {
-}
-
-class AlchemyConnector extends IBlockchainConnector {
-  constructor(config) {
-    super();
-    this.connectorKey = "ALCHEMY";
-    this.client = null;
-    this.rpcUrl = config.rpcUrl;
-  }
-  createClient() {
-    if (!this.client) {
-      this.client = viem.createPublicClient({
-        transport: viem.http(this.rpcUrl)
-      });
-    }
-    return this.client;
-  }
-  async getTransaction(txHash) {
-    const client = this.createClient();
-    const [tx, txError] = await backendSdk.useResult(
-      client.getTransaction({ hash: txHash })
-    );
-    if (txError || !tx) {
-      throw backendSdk.createInternalError(txError);
-    }
-    let status = "pending";
-    let gasUsed = null;
-    let timestamp = null;
-    if (tx.blockNumber) {
-      const [receipt, receiptError] = await backendSdk.useResult(
-        client.getTransactionReceipt({ hash: txHash })
-      );
-      if (receiptError || !receipt) {
-        throw backendSdk.createInternalError(receiptError);
-      }
-      const [block, blockError] = await backendSdk.useResult(
-        client.getBlock({ blockNumber: tx.blockNumber })
-      );
-      if (blockError || !block) {
-        throw backendSdk.createInternalError(blockError);
-      }
-      status = receipt.status === "success" ? "success" : "reverted";
-      gasUsed = receipt.gasUsed.toString();
-      timestamp = Number(block.timestamp) * 1e3;
-    }
-    return {
-      hash: tx.hash,
-      from: tx.from,
-      to: tx.to,
-      value: tx.value.toString(),
-      blockNumber: tx.blockNumber?.toString() ?? null,
-      blockHash: tx.blockHash ?? null,
-      gasPrice: tx.gasPrice?.toString() ?? null,
-      gas: tx.gas.toString(),
-      nonce: tx.nonce,
-      transactionIndex: tx.transactionIndex,
-      status,
-      gasUsed,
-      timestamp
-    };
-  }
-  async getTransactionReceipt(txHash) {
-    const client = this.createClient();
-    const [receipt, error] = await backendSdk.useResult(
-      client.getTransactionReceipt({ hash: txHash })
-    );
-    if (error || !receipt) {
-      throw backendSdk.createInternalError(error);
-    }
-    return receipt;
-  }
-  async getBlock({
-    blockHash,
-    blockNumber,
-    blockTag
-  }) {
-    const client = this.createClient();
-    const [block, error] = await backendSdk.useResult(
-      blockHash !== void 0 ? client.getBlock({ blockHash }) : blockNumber !== void 0 ? client.getBlock({ blockNumber }) : client.getBlock({ blockTag: blockTag ?? "finalized" })
-    );
-    if (error || !block) {
-      throw error;
-    }
-    return block;
-  }
-}
-
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -116,7 +29,7 @@ let BlockchainServiceBase = class extends backendSdk.develitWorker(
 ) {
   constructor(ctx, env) {
     super(ctx, env);
-    this.db = d1.drizzle(this.env.BLOCKCHAIN_D1, { schema: drizzle.tables });
+    this.db = d1.drizzle(this.env.BLOCKCHAIN_D1, { schema: blockchain.tables });
   }
   async syncAddress(input) {
     return this.handleAction(
@@ -140,11 +53,13 @@ let BlockchainServiceBase = class extends backendSdk.develitWorker(
     return this.handleAction(
       { data: input, schema: syncAddress.getTransactionInputSchema },
       { successMessage: "Transaction retrieved successfully." },
-      async ({ txHash }) => {
-        const rpcUrl = (await this.env.SECRETS_STORE.get({
-          secretName: "BLOCKCHAIN_SERVICE_RPC_URL"
-        })).data?.secretValue || "";
-        const connector = new AlchemyConnector({ rpcUrl });
+      async ({ chain, txHash }) => {
+        const connector = await blockchain.initiateConnector({
+          chain,
+          env: this.env,
+          tokens: [],
+          connectedAddresses: []
+        });
         return connector.getTransaction(txHash);
       }
     );
@@ -153,11 +68,13 @@ let BlockchainServiceBase = class extends backendSdk.develitWorker(
     return this.handleAction(
       { data: input, schema: syncAddress.getBlockInputSchema },
       { successMessage: "Block retrieved successfully." },
-      async ({ blockHash, blockNumber, blockTag }) => {
-        const rpcUrl = (await this.env.SECRETS_STORE.get({
-          secretName: "BLOCKCHAIN_SERVICE_RPC_URL"
-        })).data?.secretValue || "";
-        const connector = new AlchemyConnector({ rpcUrl });
+      async ({ chain, blockHash, blockNumber, blockTag }) => {
+        const connector = await blockchain.initiateConnector({
+          chain,
+          env: this.env,
+          tokens: [],
+          connectedAddresses: []
+        });
         return connector.getBlock({
           blockHash,
           blockNumber,

package/dist/export/worker.d.cts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.Bq5JL2Nn.cjs';
+import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.CaPQzwns.cjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
-import '../shared/blockchain.Cx60lJ0c.cjs';
+import '../shared/blockchain.DUhjXgba.cjs';
 import 'drizzle-orm/sqlite-core';
 
 declare const BlockchainServiceBase_base: (abstract new (ctx: ExecutionContext, env: BlockchainEnv) => WorkerEntrypoint<BlockchainEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);

package/dist/export/worker.d.mts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.BFesyGyk.mjs';
+import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.CvNI0YTF.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
-import '../shared/blockchain.Cx60lJ0c.mjs';
+import '../shared/blockchain.DUhjXgba.mjs';
 import 'drizzle-orm/sqlite-core';
 
 declare const BlockchainServiceBase_base: (abstract new (ctx: ExecutionContext, env: BlockchainEnv) => WorkerEntrypoint<BlockchainEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);

package/dist/export/worker.d.ts

@@ -1,10 +1,10 @@
 import * as _develit_io_backend_sdk from '@develit-io/backend-sdk';
 import { IRPCResponse } from '@develit-io/backend-sdk';
-import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.C1uxxlk3.js';
+import { t as tables, S as SyncAddressInput, a as SyncAddressOutput, G as GetTransactionInput, b as GetTransactionOutput, c as GetBlockInput, d as GetBlockOutput } from '../shared/blockchain.7cRY-udH.js';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { DrizzleD1Database } from 'drizzle-orm/d1';
 import 'zod';
-import '../shared/blockchain.Cx60lJ0c.js';
+import '../shared/blockchain.DUhjXgba.js';
 import 'drizzle-orm/sqlite-core';
 
 declare const BlockchainServiceBase_base: (abstract new (ctx: ExecutionContext, env: BlockchainEnv) => WorkerEntrypoint<BlockchainEnv, {}>) & (abstract new (...args: any[]) => _develit_io_backend_sdk.DevelitWorkerMethods);

package/dist/export/worker.mjs

@@ -1,102 +1,15 @@
-import { useResult, createInternalError, develitWorker, action, service } from '@develit-io/backend-sdk';
-import { createPublicClient, http } from 'viem';
-import { t as tables } from '../shared/blockchain.0tUJ62WT.mjs';
-import { s as syncAddressInputSchema, b as getTransactionInputSchema, g as getBlockInputSchema } from '../shared/blockchain.B_9YwgFd.mjs';
+import { develitWorker, action, service } from '@develit-io/backend-sdk';
+import { t as tables, i as initiateConnector } from '../shared/blockchain.BhDiNGPI.mjs';
+import { s as syncAddressInputSchema, d as getTransactionInputSchema, g as getBlockInputSchema } from '../shared/blockchain.CKh8Fs7w.mjs';
 import { WorkerEntrypoint } from 'cloudflare:workers';
 import { drizzle } from 'drizzle-orm/d1';
-import '../shared/blockchain._wwKu1qP.mjs';
+import '../shared/blockchain._nv3VxNA.mjs';
 import 'drizzle-orm/sqlite-core';
 import 'drizzle-orm';
+import 'viem';
+import 'viem/accounts';
 import 'zod';
 
-class IBlockchainConnector {
-}
-
-class AlchemyConnector extends IBlockchainConnector {
-  constructor(config) {
-    super();
-    this.connectorKey = "ALCHEMY";
-    this.client = null;
-    this.rpcUrl = config.rpcUrl;
-  }
-  createClient() {
-    if (!this.client) {
-      this.client = createPublicClient({
-        transport: http(this.rpcUrl)
-      });
-    }
-    return this.client;
-  }
-  async getTransaction(txHash) {
-    const client = this.createClient();
-    const [tx, txError] = await useResult(
-      client.getTransaction({ hash: txHash })
-    );
-    if (txError || !tx) {
-      throw createInternalError(txError);
-    }
-    let status = "pending";
-    let gasUsed = null;
-    let timestamp = null;
-    if (tx.blockNumber) {
-      const [receipt, receiptError] = await useResult(
-        client.getTransactionReceipt({ hash: txHash })
-      );
-      if (receiptError || !receipt) {
-        throw createInternalError(receiptError);
-      }
-      const [block, blockError] = await useResult(
-        client.getBlock({ blockNumber: tx.blockNumber })
-      );
-      if (blockError || !block) {
-        throw createInternalError(blockError);
-      }
-      status = receipt.status === "success" ? "success" : "reverted";
-      gasUsed = receipt.gasUsed.toString();
-      timestamp = Number(block.timestamp) * 1e3;
-    }
-    return {
-      hash: tx.hash,
-      from: tx.from,
-      to: tx.to,
-      value: tx.value.toString(),
-      blockNumber: tx.blockNumber?.toString() ?? null,
-      blockHash: tx.blockHash ?? null,
-      gasPrice: tx.gasPrice?.toString() ?? null,
-      gas: tx.gas.toString(),
-      nonce: tx.nonce,
-      transactionIndex: tx.transactionIndex,
-      status,
-      gasUsed,
-      timestamp
-    };
-  }
-  async getTransactionReceipt(txHash) {
-    const client = this.createClient();
-    const [receipt, error] = await useResult(
-      client.getTransactionReceipt({ hash: txHash })
-    );
-    if (error || !receipt) {
-      throw createInternalError(error);
-    }
-    return receipt;
-  }
-  async getBlock({
-    blockHash,
-    blockNumber,
-    blockTag
-  }) {
-    const client = this.createClient();
-    const [block, error] = await useResult(
-      blockHash !== void 0 ? client.getBlock({ blockHash }) : blockNumber !== void 0 ? client.getBlock({ blockNumber }) : client.getBlock({ blockTag: blockTag ?? "finalized" })
-    );
-    if (error || !block) {
-      throw error;
-    }
-    return block;
-  }
-}
-
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __decorateClass = (decorators, target, key, kind) => {
@@ -136,11 +49,13 @@ let BlockchainServiceBase = class extends develitWorker(
     return this.handleAction(
       { data: input, schema: getTransactionInputSchema },
       { successMessage: "Transaction retrieved successfully." },
-      async ({ txHash }) => {
-        const rpcUrl = (await this.env.SECRETS_STORE.get({
-          secretName: "BLOCKCHAIN_SERVICE_RPC_URL"
-        })).data?.secretValue || "";
-        const connector = new AlchemyConnector({ rpcUrl });
+      async ({ chain, txHash }) => {
+        const connector = await initiateConnector({
+          chain,
+          env: this.env,
+          tokens: [],
+          connectedAddresses: []
+        });
         return connector.getTransaction(txHash);
       }
     );
@@ -149,11 +64,13 @@ let BlockchainServiceBase = class extends develitWorker(
     return this.handleAction(
       { data: input, schema: getBlockInputSchema },
       { successMessage: "Block retrieved successfully." },
-      async ({ blockHash, blockNumber, blockTag }) => {
-        const rpcUrl = (await this.env.SECRETS_STORE.get({
-          secretName: "BLOCKCHAIN_SERVICE_RPC_URL"
-        })).data?.secretValue || "";
-        const connector = new AlchemyConnector({ rpcUrl });
+      async ({ chain, blockHash, blockNumber, blockTag }) => {
+        const connector = await initiateConnector({
+          chain,
+          env: this.env,
+          tokens: [],
+          connectedAddresses: []
+        });
         return connector.getBlock({
           blockHash,
           blockNumber,

package/dist/export/workflows.cjs

@@ -1,38 +1,57 @@
 'use strict';
 
 const backendSdk = require('@develit-io/backend-sdk');
-const drizzle = require('../shared/blockchain.DN735AwB.cjs');
+const blockchain = require('../shared/blockchain.BUbQBxqd.cjs');
 const drizzleOrm = require('drizzle-orm');
 const cloudflare_workers = require('cloudflare:workers');
 const cloudflare_workflows = require('cloudflare:workflows');
 const d1 = require('drizzle-orm/d1');
-const viem = require('viem');
-const chains = require('viem/chains');
-require('../shared/blockchain.BBvwu2_7.cjs');
+require('../shared/blockchain.CbmnjjFl.cjs');
 require('drizzle-orm/sqlite-core');
+require('../shared/blockchain.Cjq9eH7Z.cjs');
+require('zod');
+require('viem');
+require('viem/accounts');
+
+const updateAddressLastSyncBlockCommand = (db, {
+  lastSyncBlock,
+  addressId
+}) => {
+  const command = db.update(blockchain.tables.address).set({
+    lastSyncBlock
+  }).where(drizzleOrm.eq(blockchain.tables.address.id, addressId)).returning();
+  return {
+    command
+  };
+};
 
 const updateAddressLastSyncCommand = (db, {
   lastSyncAt,
   addressId,
   lastSyncMetadata
 }) => {
-  const command = db.update(drizzle.tables.address).set({
+  const command = db.update(blockchain.tables.address).set({
     lastSyncAt,
     lastSyncMetadata
-  }).where(drizzleOrm.eq(drizzle.tables.address.id, addressId)).returning();
+  }).where(drizzleOrm.eq(blockchain.tables.address.id, addressId)).returning();
   return {
     command
   };
 };
 
 const getAddressById = async (db, id) => {
-  const address = await db.select().from(drizzle.tables.address).where(drizzleOrm.eq(drizzle.tables.address.id, id)).get();
+  const address = await db.select().from(blockchain.tables.address).where(drizzleOrm.eq(blockchain.tables.address.id, id)).get();
   return address;
 };
 
+const getContractAddresses = async (db, { connector }) => {
+  const addresses = await db.select().from(blockchain.tables.tokens).where(drizzleOrm.eq(blockchain.tables.tokens.connector, connector)).all();
+  return addresses;
+};
+
 const createTransactionCommand = (db, { transaction }) => {
   const id = backendSdk.uuidv4();
-  const command = db.insert(drizzle.tables.transaction).values({ ...transaction, id }).returning();
+  const command = db.insert(blockchain.tables.transaction).values({ ...transaction, id }).returning();
   return { command };
 };
 
@@ -48,7 +67,7 @@ function pushToQueue(queue, message) {
 class BlockchainSyncAddressTransactions extends cloudflare_workers.WorkflowEntrypoint {
   async run(event, step) {
     const { addressId } = event.payload;
-    const db = d1.drizzle(this.env.BLOCKCHAIN_D1, { schema: drizzle.tables });
+    const db = d1.drizzle(this.env.BLOCKCHAIN_D1, { schema: blockchain.tables });
     if (!addressId) {
       throw new cloudflare_workflows.NonRetryableError(`Haven't obtained addressId to load.`);
     }
@@ -64,7 +83,9 @@ class BlockchainSyncAddressTransactions extends cloudflare_workers.WorkflowEntry
         return address2;
       });
       if (!address.lastSyncAt) {
-        throw new Error(`lastSyncedAt is not set for address: ${address}`);
+        throw new cloudflare_workflows.NonRetryableError(
+          `lastSyncedAt is not set for address: ${address}`
+        );
       }
       const transactions = await step.do(
         "fetch address transactions",
@@ -73,86 +94,63 @@ class BlockchainSyncAddressTransactions extends cloudflare_workers.WorkflowEntry
           timeout: "30 seconds"
         },
         async () => {
-          const rpcUrl = (await this.env.SECRETS_STORE.get({
-            secretName: "BLOCKCHAIN_SERVICE_RPC_URL"
-          })).data?.secretValue || "";
-          const client = viem.createPublicClient({
-            chain: chains.gnosisChiado,
-            transport: viem.http(rpcUrl)
+          const tokens = await getContractAddresses(db, {
+            connector: address.connector
           });
-          const currentBlock = await client.getBlockNumber();
-          const estimatedBlocksPerInterval = Math.ceil(
-            address.syncIntervalS * 1.5 / 5
-          );
-          const blocksToScan = Math.min(estimatedBlocksPerInterval, 1e3);
-          const startBlock = currentBlock - BigInt(blocksToScan);
-          const endBlock = currentBlock;
-          const lastSyncedTimestamp = address.lastSyncAt || 0;
-          const allTransactions = [];
-          for (let blockNum = startBlock; blockNum <= endBlock; blockNum++) {
-            const block = await client.getBlock({
-              blockNumber: blockNum,
-              includeTransactions: true
-            });
-            const blockTimestamp = Number(block.timestamp);
-            const lastSyncedTimestampNum = typeof lastSyncedTimestamp === "number" ? lastSyncedTimestamp : Number(lastSyncedTimestamp);
-            if (blockTimestamp <= lastSyncedTimestampNum) {
-              continue;
-            }
-            for (const tx of block.transactions) {
-              if (typeof tx === "string" || !tx.to) continue;
-              if (tx.from.toLowerCase() === address.number.toLowerCase()) {
-                const receipt = await client.getTransactionReceipt({
-                  hash: tx.hash
-                });
-                allTransactions.push({
-                  hash: tx.hash,
-                  from: tx.from,
-                  to: tx.to,
-                  value: tx.value.toString(),
-                  blockNumber: block.number.toString(),
-                  blockHash: block.hash,
-                  gasUsed: receipt.gasUsed.toString(),
-                  gasPrice: tx.gasPrice?.toString() ?? "",
-                  timestamp: blockTimestamp,
-                  status: receipt.status
-                });
-              }
-            }
+          if (!tokens || tokens.length === 0) {
+            throw new cloudflare_workflows.NonRetryableError(
+              `No contract addresses found for connector: ${address.connector}`
+            );
           }
-          return allTransactions;
+          const connector = await blockchain.initiateConnector({
+            chain: address.connector,
+            env: this.env,
+            tokens,
+            connectedAddresses: [
+              {
+                id: address.id,
+                number: address.number,
+                connector: address.connector
+              }
+            ]
+          });
+          return await connector.getAllAddressTransactions({
+            address: address.number,
+            filter: { fromBlock: address.lastSyncBlock }
+          });
         }
       );
-      if (transactions.length > 0) {
+      if (transactions.transactions.length > 0) {
         await step.do(
           "process new transactions and update lastSyncAt",
           async () => {
-            const createCommands = transactions.map(
+            const createCommands = transactions.transactions.map(
               (tx) => createTransactionCommand(db, { transaction: tx }).command
             );
-            const eventsToEmit = transactions.map(
-              (tx) => ({
-                eventType: "BLOCKCHAIN_TRANSACTION",
-                blockchainTransaction: {
-                  address: address.number,
-                  hash: tx.hash,
-                  from: tx.from,
-                  to: tx.to,
-                  value: tx.value,
-                  blockNumber: tx.blockNumber,
-                  blockHash: tx.blockHash,
-                  gasUsed: tx.gasUsed,
-                  gasPrice: tx.gasPrice,
-                  timestamp: tx.timestamp,
-                  status: tx.status
-                },
-                metadata: {
-                  correlationId: backendSdk.uuidv4(),
-                  entityId: backendSdk.uuidv4(),
-                  timestamp: (/* @__PURE__ */ new Date()).toDateString()
-                }
-              })
-            );
+            const eventsToEmit = transactions.transactions.map((tx) => ({
+              eventType: "BLOCKCHAIN_TRANSACTION",
+              blockchainTransaction: {
+                address: address.number,
+                hash: tx.hash,
+                from: tx.from,
+                to: tx.to,
+                value: tx.value,
+                blockNumber: tx.blockNumber,
+                blockHash: tx.blockHash,
+                gasUsed: tx.gasUsed,
+                gasPrice: tx.gasPrice,
+                timestamp: tx.timestamp,
+                status: tx.status,
+                decimals: tx.decimals,
+                connector: address.connector,
+                ticker: tx.ticker
+              },
+              metadata: {
+                correlationId: backendSdk.uuidv4(),
+                entityId: backendSdk.uuidv4(),
+                timestamp: (/* @__PURE__ */ new Date()).toISOString()
+              }
+            }));
             const lastSyncMetadata = {
               eventsEmitted: eventsToEmit.length
             };
@@ -161,9 +159,17 @@ class BlockchainSyncAddressTransactions extends cloudflare_workers.WorkflowEntry
               lastSyncAt: now,
               lastSyncMetadata
             }).command;
+            const updateLastSyncBlockCommand = updateAddressLastSyncBlockCommand(db, {
+              addressId: address.id,
+              lastSyncBlock: transactions.latestBlock
+            }).command;
             if (eventsToEmit.length) {
               await db.batch(
-                backendSdk.asNonEmpty([updateLastSyncCommand, ...createCommands])
+                backendSdk.asNonEmpty([
+                  updateLastSyncCommand,
+                  updateLastSyncBlockCommand,
+                  ...createCommands
+                ])
               );
               await pushToQueue(
                 this.env.QUEUE_BUS_QUEUE,