@subql/node-starknet 0.0.2-6 → 0.0.2-8

package/dist/starknet/utils.starknet.js

@@ -7,6 +7,7 @@ exports.formatBlock = formatBlock;
 exports.formatBlockUtil = formatBlockUtil;
 exports.formatLog = formatLog;
 exports.formatTransaction = formatTransaction;
+exports.getTxContractAddress = getTxContractAddress;
 exports.formatReceipt = formatReceipt;
 exports.starknetBlockToHeader = starknetBlockToHeader;
 exports.starknetBlockHeaderToHeader = starknetBlockHeaderToHeader;
@@ -65,15 +66,40 @@ function formatLog(log, block) {
     });
     return formattedLog;
 }
+/***
+ * @param tx
+ * @param block
+ * @param txIndex
+ *  Explanation for from, to, selector, calldata with different tx type
+ *  When apply filter please refer to the following:
+ *
+ *  1. L1_HANDLER
+ *    from is the Contract Address (contract been called)
+ *    entryPointSelector (method)
+ *    within decodedCalls, to is same as from, selector is the entryPointSelector
+ *  2. DEPLOY_ACCOUNT
+ *    from is the contract_address, also is the new account address
+ *  3. DECLARE
+ *    from is the sender_address
+ *  4. DEPLOY
+ *    from is the sender_address
+ *  5. INVOKE V1 and V3
+ *    from is the sender_address
+ *    within decodedCalls, to is the contract been called, selector is the method
+ *  6. INVOKE V0
+ *    from is the Contract Address (contract been called)
+ *    entryPointSelector is the method been called
+ */
 function formatTransaction(tx, block, txIndex) {
     const transaction = {
+        ...tx,
         hash: tx.transaction_hash,
         type: tx.type,
         version: tx.version,
         nonce: tx.nonce,
         maxFee: tx.max_fee,
-        from: tx.sender_address,
-        callData: tx.calldata,
+        from: getTxContractAddress(tx),
+        calldata: tx.calldata,
         blockHash: block.blockHash,
         blockNumber: block.blockNumber,
         blockTimestamp: block.timestamp,
@@ -87,14 +113,14 @@ function formatTransaction(tx, block, txIndex) {
             // Handle "INVOKE V1 and V3"
             if (transaction.type === 'INVOKE' &&
                 transaction.version !== ('0x0' || '0x100000000000000000000000000000000')) {
-                return (0, decodeCalldata_1.decodeInvokeCalldata)(transaction.callData);
+                return (0, decodeCalldata_1.decodeInvokeCalldata)(transaction.calldata);
             }
             // Handle "L1_HANDLER" and "INVOKE V0"
             else if (transaction.contractAddress &&
                 transaction.entryPointSelector &&
-                transaction.callData) {
+                transaction.calldata) {
                 return [
-                    (0, decodeCalldata_1.decodeGenericCalldata)(transaction.contractAddress, transaction.entryPointSelector, transaction.callData),
+                    (0, decodeCalldata_1.decodeGenericCalldata)(transaction.contractAddress, transaction.entryPointSelector, transaction.calldata),
                 ];
             }
             return;
@@ -105,6 +131,13 @@ function formatTransaction(tx, block, txIndex) {
     };
     return transaction;
 }
+function getTxContractAddress(tx) {
+    if (tx.type === 'DEPLOY' || tx.type === 'DEPLOY_ACCOUNT') {
+        const result = starknet_1.hash.calculateContractAddressFromHash(tx.contract_address_salt, tx.class_hash, tx.constructor_calldata, 0);
+        return result;
+    }
+    return tx.contract_address ?? tx.sender_address;
+}
 function formatReceipt(receipt) {
     return {
         ...receipt,

package/dist/starknet/utils.starknet.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.starknet.js","sourceRoot":"","sources":["../../src/starknet/utils.starknet.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { SPEC } from '@starknet-io/types-js';\nimport { Header, IBlock } from '@subql/node-core';\nimport {\n  ApiWrapper,\n  LightStarknetBlock,\n  StarknetBlock,\n  StarknetContractCall,\n  StarknetLog,\n  StarknetLogRaw,\n  StarknetResult,\n  StarknetTransaction,\n} from '@subql/types-starknet';\nimport { omit } from 'lodash';\nimport {\n  Abi,\n  hash,\n  num,\n  RpcProvider,\n  TransactionReceipt,\n  validateAndParseAddress,\n} from 'starknet';\nimport { BlockContent } from '../indexer/types';\nimport { decodeGenericCalldata, decodeInvokeCalldata } from './decodeCalldata';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nexport function formatBlock(block: any): StarknetBlock {\n  return {\n    blockHash: block.block_hash,\n    parentHash: block.parent_hash,\n    blockNumber: block.block_number,\n    newRoot: block.new_root,\n    sequencerAddress: block.sequencer_address,\n    l1GasPrice: block.l1_gas_price,\n    starknetVersion: block.starknet_version,\n    timestamp: block.timestamp,\n    status: block.status,\n    logs: [], // Filled in at starknetBlockWrapped constructor\n    transactions: block.transactions, // Transaction still raw here, will format in fetchBlock\n  } as StarknetBlock;\n}\n\nexport function formatBlockUtil<\n  B extends StarknetBlock | LightStarknetBlock = StarknetBlock,\n>(block: B): IBlock<B> {\n  return {\n    block,\n    getHeader: () => starknetBlockToHeader(block),\n  };\n}\n\nexport function formatLog(\n  log: StarknetLogRaw,\n  block: StarknetBlock,\n): StarknetLog {\n  const formattedLog = {\n    block,\n    address: log.from_address,\n    topics: log.keys,\n    blockNumber: block.blockNumber,\n    blockHash: block.blockHash,\n    transactionHash: log.transaction_hash,\n    data: log.data,\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\n    },\n  };\n\n  // Define this afterwards as the spread on `...log` breaks defining a getter\n  Object.defineProperty(formattedLog, 'transaction', {\n    get: () => {\n      const rawTransaction = block.transactions?.find(\n        (tx) => tx.hash === log.transaction_hash,\n      );\n\n      return rawTransaction;\n    },\n  });\n  return formattedLog as unknown as StarknetLog;\n}\n\nexport function formatTransaction(\n  tx: Record<string, any>,\n  block: StarknetBlock,\n  txIndex: number,\n): Omit<StarknetTransaction, 'receipt'> {\n  const transaction = {\n    hash: tx.transaction_hash,\n    type: tx.type,\n    version: tx.version,\n    nonce: tx.nonce,\n    maxFee: tx.max_fee,\n    from: tx.sender_address,\n    callData: tx.calldata,\n    blockHash: block.blockHash,\n    blockNumber: block.blockNumber,\n    blockTimestamp: block.timestamp,\n    transactionIndex: txIndex,\n    entryPointSelector: tx.entry_point_selector,\n    contractAddress: tx.contract_address,\n    parseCallData(): StarknetContractCall[] | undefined {\n      if (this.decodedCalls) {\n        return this.decodedCalls;\n      }\n\n      // Handle \"INVOKE V1 and V3\"\n      if (\n        transaction.type === 'INVOKE' &&\n        transaction.version !== ('0x0' || '0x100000000000000000000000000000000')\n      ) {\n        return decodeInvokeCalldata(transaction.callData);\n      }\n      // Handle \"L1_HANDLER\" and \"INVOKE V0\"\n      else if (\n        transaction.contractAddress &&\n        transaction.entryPointSelector &&\n        transaction.callData\n      ) {\n        return [\n          decodeGenericCalldata(\n            transaction.contractAddress,\n            transaction.entryPointSelector,\n            transaction.callData,\n          ),\n        ];\n      }\n      return;\n    },\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['receipt', 'toJSON']));\n    },\n  } as Omit<StarknetTransaction, 'receipt'>;\n\n  return transaction;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n): TransactionReceipt {\n  return {\n    ...receipt,\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['toJSON']));\n    },\n  } as unknown as TransactionReceipt;\n}\n\nexport function starknetBlockToHeader(block: BlockContent): Header {\n  return {\n    blockHeight: block.blockNumber,\n    blockHash: block.blockHash,\n    parentHash: block.parentHash,\n  };\n}\n\nexport function starknetBlockHeaderToHeader(block: SPEC.BLOCK_HEADER): Header {\n  return {\n    blockHeight: block.block_number,\n    blockHash: block.block_hash,\n    parentHash: block.parent_hash,\n  };\n}\n\n//TODO, only used to phrase abi event\nexport function reverseToRawLog(log: StarknetLog): StarknetLogRaw {\n  return {\n    block_hash: log.blockHash,\n    keys: [...log.topics],\n    from_address: log.address,\n    transaction_hash: log.transactionHash,\n    block_number: log.blockNumber,\n    ...log,\n  };\n}\n\n// This is used when user abi not provided, or decode call in tx\nexport async function fetchAbiFromContractAddress(\n  provider: RpcProvider,\n  contractAddress: string,\n): Promise<Abi> {\n  const { abi: remoteAbi } = await provider.getClassAt(contractAddress);\n  if (remoteAbi === undefined) {\n    throw new Error('no abi.');\n  }\n  return remoteAbi;\n}\n\nexport function encodeSelectorToHex(eventName: string): string {\n  return hash.getSelector(eventName);\n}\n\nexport function encodeEventKey(eventName: string): string {\n  return num.toHex(hash.starknetKeccak(eventName));\n}\n\n// Check address or selector hex string are equal\nexport function hexEq(a: string, b: string): boolean {\n  try {\n    return validateAndParseAddress(a) === validateAndParseAddress(b);\n  } catch (e) {\n    return false;\n  }\n}\n"]}
+{"version":3,"file":"utils.starknet.js","sourceRoot":"","sources":["../../src/starknet/utils.starknet.ts"],"names":[],"mappings":"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","sourcesContent":["// Copyright 2020-2024 SubQuery Pte Ltd authors & contributors\n// SPDX-License-Identifier: GPL-3.0\n\nimport { SPEC } from '@starknet-io/types-js';\nimport { Header, IBlock } from '@subql/node-core';\nimport {\n  ApiWrapper,\n  LightStarknetBlock,\n  StarknetBlock,\n  StarknetContractCall,\n  StarknetLog,\n  StarknetLogRaw,\n  StarknetTransaction,\n} from '@subql/types-starknet';\nimport { omit } from 'lodash';\nimport {\n  Abi,\n  hash,\n  num,\n  RpcProvider,\n  TransactionReceipt,\n  validateAndParseAddress,\n} from 'starknet';\nimport { BlockContent } from '../indexer/types';\nimport { decodeGenericCalldata, decodeInvokeCalldata } from './decodeCalldata';\n\nexport function calcInterval(api: ApiWrapper): number {\n  // TODO find a way to get this from the blockchain\n  return 6000;\n}\n\nexport function formatBlock(block: any): StarknetBlock {\n  return {\n    blockHash: block.block_hash,\n    parentHash: block.parent_hash,\n    blockNumber: block.block_number,\n    newRoot: block.new_root,\n    sequencerAddress: block.sequencer_address,\n    l1GasPrice: block.l1_gas_price,\n    starknetVersion: block.starknet_version,\n    timestamp: block.timestamp,\n    status: block.status,\n    logs: [], // Filled in at starknetBlockWrapped constructor\n    transactions: block.transactions, // Transaction still raw here, will format in fetchBlock\n  } as StarknetBlock;\n}\n\nexport function formatBlockUtil<\n  B extends StarknetBlock | LightStarknetBlock = StarknetBlock,\n>(block: B): IBlock<B> {\n  return {\n    block,\n    getHeader: () => starknetBlockToHeader(block),\n  };\n}\n\nexport function formatLog(\n  log: StarknetLogRaw,\n  block: StarknetBlock,\n): StarknetLog {\n  const formattedLog = {\n    block,\n    address: log.from_address,\n    topics: log.keys,\n    blockNumber: block.blockNumber,\n    blockHash: block.blockHash,\n    transactionHash: log.transaction_hash,\n    data: log.data,\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['transaction', 'block', 'toJSON']));\n    },\n  };\n\n  // Define this afterwards as the spread on `...log` breaks defining a getter\n  Object.defineProperty(formattedLog, 'transaction', {\n    get: () => {\n      const rawTransaction = block.transactions?.find(\n        (tx) => tx.hash === log.transaction_hash,\n      );\n\n      return rawTransaction;\n    },\n  });\n  return formattedLog as unknown as StarknetLog;\n}\n\n/***\n * @param tx\n * @param block\n * @param txIndex\n *  Explanation for from, to, selector, calldata with different tx type\n *  When apply filter please refer to the following:\n *\n *  1. L1_HANDLER\n *    from is the Contract Address (contract been called)\n *    entryPointSelector (method)\n *    within decodedCalls, to is same as from, selector is the entryPointSelector\n *  2. DEPLOY_ACCOUNT\n *    from is the contract_address, also is the new account address\n *  3. DECLARE\n *    from is the sender_address\n *  4. DEPLOY\n *    from is the sender_address\n *  5. INVOKE V1 and V3\n *    from is the sender_address\n *    within decodedCalls, to is the contract been called, selector is the method\n *  6. INVOKE V0\n *    from is the Contract Address (contract been called)\n *    entryPointSelector is the method been called\n */\nexport function formatTransaction(\n  tx: Record<string, any>,\n  block: StarknetBlock,\n  txIndex: number,\n): Omit<StarknetTransaction, 'receipt'> {\n  const transaction = {\n    ...tx,\n    hash: tx.transaction_hash,\n    type: tx.type,\n    version: tx.version,\n    nonce: tx.nonce,\n    maxFee: tx.max_fee,\n    from: getTxContractAddress(tx),\n    calldata: tx.calldata,\n    blockHash: block.blockHash,\n    blockNumber: block.blockNumber,\n    blockTimestamp: block.timestamp,\n    transactionIndex: txIndex,\n    entryPointSelector: tx.entry_point_selector,\n    contractAddress: tx.contract_address,\n    parseCallData(): StarknetContractCall[] | undefined {\n      if (this.decodedCalls) {\n        return this.decodedCalls;\n      }\n\n      // Handle \"INVOKE V1 and V3\"\n      if (\n        transaction.type === 'INVOKE' &&\n        transaction.version !== ('0x0' || '0x100000000000000000000000000000000')\n      ) {\n        return decodeInvokeCalldata(transaction.calldata);\n      }\n      // Handle \"L1_HANDLER\" and \"INVOKE V0\"\n      else if (\n        transaction.contractAddress &&\n        transaction.entryPointSelector &&\n        transaction.calldata\n      ) {\n        return [\n          decodeGenericCalldata(\n            transaction.contractAddress,\n            transaction.entryPointSelector,\n            transaction.calldata,\n          ),\n        ];\n      }\n      return;\n    },\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['receipt', 'toJSON']));\n    },\n  } as Omit<StarknetTransaction, 'receipt'>;\n  return transaction;\n}\n\nexport function getTxContractAddress(tx: Record<string, any>): string {\n  if (tx.type === 'DEPLOY' || tx.type === 'DEPLOY_ACCOUNT') {\n    const result = hash.calculateContractAddressFromHash(\n      tx.contract_address_salt,\n      tx.class_hash,\n      tx.constructor_calldata,\n      0,\n    );\n    return result;\n  }\n  return tx.contract_address ?? tx.sender_address;\n}\n\nexport function formatReceipt(\n  receipt: Record<string, any>,\n): TransactionReceipt {\n  return {\n    ...receipt,\n    toJSON(): string {\n      return JSON.stringify(omit(this, ['toJSON']));\n    },\n  } as unknown as TransactionReceipt;\n}\n\nexport function starknetBlockToHeader(block: BlockContent): Header {\n  return {\n    blockHeight: block.blockNumber,\n    blockHash: block.blockHash,\n    parentHash: block.parentHash,\n  };\n}\n\nexport function starknetBlockHeaderToHeader(block: SPEC.BLOCK_HEADER): Header {\n  return {\n    blockHeight: block.block_number,\n    blockHash: block.block_hash,\n    parentHash: block.parent_hash,\n  };\n}\n\n//TODO, only used to phrase abi event\nexport function reverseToRawLog(log: StarknetLog): StarknetLogRaw {\n  return {\n    block_hash: log.blockHash,\n    keys: [...log.topics],\n    from_address: log.address,\n    transaction_hash: log.transactionHash,\n    block_number: log.blockNumber,\n    ...log,\n  };\n}\n\n// This is used when user abi not provided, or decode call in tx\nexport async function fetchAbiFromContractAddress(\n  provider: RpcProvider,\n  contractAddress: string,\n): Promise<Abi> {\n  const { abi: remoteAbi } = await provider.getClassAt(contractAddress);\n  if (remoteAbi === undefined) {\n    throw new Error('no abi.');\n  }\n  return remoteAbi;\n}\n\nexport function encodeSelectorToHex(eventName: string): string {\n  return hash.getSelector(eventName);\n}\n\nexport function encodeEventKey(eventName: string): string {\n  return num.toHex(hash.starknetKeccak(eventName));\n}\n\n// Check address or selector hex string are equal\nexport function hexEq(a: string, b: string): boolean {\n  try {\n    return validateAndParseAddress(a) === validateAndParseAddress(b);\n  } catch (e) {\n    return false;\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@subql/node-starknet",
-  "version": "0.0.2-6",
+  "version": "0.0.2-8",
   "description": "",
   "author": "Jay Ji",
   "license": "GPL-3.0",
@@ -28,7 +28,7 @@
     "@subql/common-starknet": "0.0.2-2",
     "@subql/node-core": "16.1.1-1",
     "@subql/testing": "^2.2.2",
-    "@subql/types-starknet": "0.0.2-2",
+    "@subql/types-starknet": "0.0.2-3",
     "cacheable-lookup": "6",
     "eventemitter2": "^6.4.5",
     "json5": "^2.2.3",
@@ -60,5 +60,5 @@
     "/dist",
     "/bin"
   ],
-  "stableVersion": "0.0.2-5"
+  "stableVersion": "0.0.2-7"
 }