From 54c2b8402806ac458f7eac79f1c3dfc374df7359 Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Wed, 15 May 2024 13:28:33 -0400 Subject: [PATCH 1/6] enrichedParties and assetsEnriched --- .../test/transactions/boombox-0x460925a4.json | 2 +- .../test/transactions/boombox-0xd996e83d.json | 2 +- .../test/transactions/boombox-0xde83b70f.json | 2 +- .../test/transactions/boombox-0xe25e9ec5.json | 2 +- ...ridgeZoraEnergyDestination-0xf178e44b.json | 2 +- .../transactions/catchall-0x26f6c382.json | 2 +- .../erc1155Purchase-0xc6c925c0.json | 2 +- .../erc721PurchaseNot-0x26beaf02.json | 2 +- src/types/transaction.ts | 32 +++++++++++++++++-- 9 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/contextualizers/test/transactions/boombox-0x460925a4.json b/src/contextualizers/test/transactions/boombox-0x460925a4.json index 02c10540..8c002998 100644 --- a/src/contextualizers/test/transactions/boombox-0x460925a4.json +++ b/src/contextualizers/test/transactions/boombox-0x460925a4.json @@ -66,7 +66,7 @@ "transactionFee": "329210634372624000051437959100", "logs": [], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xd996e83d.json b/src/contextualizers/test/transactions/boombox-0xd996e83d.json index e62a3118..52c73f39 100644 --- a/src/contextualizers/test/transactions/boombox-0xd996e83d.json +++ b/src/contextualizers/test/transactions/boombox-0xd996e83d.json @@ -30292,7 +30292,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xde83b70f.json b/src/contextualizers/test/transactions/boombox-0xde83b70f.json index 1cab31af..9c4cdc3b 100644 --- a/src/contextualizers/test/transactions/boombox-0xde83b70f.json +++ b/src/contextualizers/test/transactions/boombox-0xde83b70f.json @@ -105,7 +105,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json index 22652b74..708a13cb 100644 --- a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json +++ b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json @@ -29589,7 +29589,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json index aeb0e47d..f698092b 100644 --- a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json +++ b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json @@ -200,7 +200,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xf70da97812cb96acdf810712aa562db8dfa3dbef": [ diff --git a/src/contextualizers/test/transactions/catchall-0x26f6c382.json b/src/contextualizers/test/transactions/catchall-0x26f6c382.json index 986e5691..791bece2 100644 --- a/src/contextualizers/test/transactions/catchall-0x26f6c382.json +++ b/src/contextualizers/test/transactions/catchall-0x26f6c382.json @@ -645,7 +645,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x4337003fcd2f56de3977ccb806383e9161628d0e": [ diff --git a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json index 194ef30c..b6387efa 100644 --- a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json +++ b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json @@ -532,7 +532,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x15cc6926a4bea1eb176a738f7a8c63e65b437f84": [ diff --git a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json index 75c7b2c8..a937784d 100644 --- a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json +++ b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json @@ -266,7 +266,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x2c2926b92782e30150ff779220a1ece076f2a827": [ diff --git a/src/types/transaction.ts b/src/types/transaction.ts index 2010569e..d0be303e 100644 --- a/src/types/transaction.ts +++ b/src/types/transaction.ts @@ -7,7 +7,7 @@ import { } from 'viem'; import { Log, RawReceipt } from './log'; import { ContextVariable, ContextSummaryType } from './context'; -import { NetAssetTransfers, AssetTransfer } from './asset'; +import { NetAssetTransfers, AssetTransfer, Asset } from './asset'; import { InternalHashType, StdObj } from './shared'; import { Contract } from './contract'; @@ -69,6 +69,32 @@ export type Receipt = TransactionReceipt & { l1GasUsed?: string; }; +export type AddressMeta = { + chainId: number; + isContract: boolean; + ensNew: { + handle: string | null; + avatar: string | null; + }; + bns: { + handle: string | null; + avatar: string | null; + }; + farcaster: { + handle: string | null; + avatar: string | null; + fid: number | null; + }; +}; + +export type TransactionEnrichedParties = { + [address: string]: AddressMeta[]; +}; + +export type TransactionAssetsEnriched = { + [address: string]: Asset & { imageUrl: string | null }; +}; + export type TransactionContextType = { variables?: ContextVariable; summaries?: ContextSummaryType; @@ -78,7 +104,9 @@ export type TransactionContextType = { // MongoDB document export type Transaction = BaseTransaction & { assetTransfers?: AssetTransfer[]; - pseudotransactions?: PseudoTransaction[]; + pseudoTransactions?: PseudoTransaction[]; + enrichedParties: TransactionEnrichedParties; + assetsEnriched: TransactionAssetsEnriched; sigHash: string; internalSigHashes: SigHash[]; parties: string[]; From ffc85b782a6aa62f7accc0e7311421ac02cd3e0a Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Wed, 15 May 2024 14:58:47 -0400 Subject: [PATCH 2/6] optional keys --- src/types/transaction.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/types/transaction.ts b/src/types/transaction.ts index d0be303e..84f705b5 100644 --- a/src/types/transaction.ts +++ b/src/types/transaction.ts @@ -105,8 +105,8 @@ export type TransactionContextType = { export type Transaction = BaseTransaction & { assetTransfers?: AssetTransfer[]; pseudoTransactions?: PseudoTransaction[]; - enrichedParties: TransactionEnrichedParties; - assetsEnriched: TransactionAssetsEnriched; + enrichedParties?: TransactionEnrichedParties; + assetsEnriched?: TransactionAssetsEnriched; sigHash: string; internalSigHashes: SigHash[]; parties: string[]; From be7d4d09fdd49766ea8939abf8b553b1da37b920 Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Wed, 22 May 2024 10:43:34 -0400 Subject: [PATCH 3/6] pseudotransactions capitalization --- .../test/transactions/boombox-0x460925a4.json | 2 +- .../test/transactions/boombox-0xd996e83d.json | 2 +- .../test/transactions/boombox-0xde83b70f.json | 2 +- .../test/transactions/boombox-0xe25e9ec5.json | 2 +- ...ridgeZoraEnergyDestination-0xf178e44b.json | 2 +- .../transactions/catchall-0x26f6c382.json | 2 +- .../erc1155Purchase-0xc6c925c0.json | 2 +- .../erc721PurchaseNot-0x26beaf02.json | 2 +- .../goldDestination-0x469f8c9c.json | 2 +- .../goldDestination-0x85058886.json | 2 +- .../transactions/goldSource-0x3374f5f4.json | 2 +- .../transactions/goldSource-0xef715998.json | 2 +- .../uniswapV3Pair-0xcc883774.json | 2 +- src/helpers/utils.ts | 2 +- .../_common/accountAbstraction/index.spec.ts | 26 +++++++++---------- .../_common/accountAbstraction/index.ts | 4 +-- src/transformers/transformer.spec.ts | 8 +++--- src/types/transaction.ts | 4 +-- 18 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/contextualizers/test/transactions/boombox-0x460925a4.json b/src/contextualizers/test/transactions/boombox-0x460925a4.json index 8c002998..02c10540 100644 --- a/src/contextualizers/test/transactions/boombox-0x460925a4.json +++ b/src/contextualizers/test/transactions/boombox-0x460925a4.json @@ -66,7 +66,7 @@ "transactionFee": "329210634372624000051437959100", "logs": [], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xd996e83d.json b/src/contextualizers/test/transactions/boombox-0xd996e83d.json index 52c73f39..e62a3118 100644 --- a/src/contextualizers/test/transactions/boombox-0xd996e83d.json +++ b/src/contextualizers/test/transactions/boombox-0xd996e83d.json @@ -30292,7 +30292,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xde83b70f.json b/src/contextualizers/test/transactions/boombox-0xde83b70f.json index 9c4cdc3b..1cab31af 100644 --- a/src/contextualizers/test/transactions/boombox-0xde83b70f.json +++ b/src/contextualizers/test/transactions/boombox-0xde83b70f.json @@ -105,7 +105,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json index 708a13cb..22652b74 100644 --- a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json +++ b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json @@ -29589,7 +29589,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json index f698092b..aeb0e47d 100644 --- a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json +++ b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json @@ -200,7 +200,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xf70da97812cb96acdf810712aa562db8dfa3dbef": [ diff --git a/src/contextualizers/test/transactions/catchall-0x26f6c382.json b/src/contextualizers/test/transactions/catchall-0x26f6c382.json index 791bece2..986e5691 100644 --- a/src/contextualizers/test/transactions/catchall-0x26f6c382.json +++ b/src/contextualizers/test/transactions/catchall-0x26f6c382.json @@ -645,7 +645,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x4337003fcd2f56de3977ccb806383e9161628d0e": [ diff --git a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json index b6387efa..194ef30c 100644 --- a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json +++ b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json @@ -532,7 +532,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x15cc6926a4bea1eb176a738f7a8c63e65b437f84": [ diff --git a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json index a937784d..75c7b2c8 100644 --- a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json +++ b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json @@ -266,7 +266,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x2c2926b92782e30150ff779220a1ece076f2a827": [ diff --git a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json index ae2c618b..6e686491 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json +++ b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", diff --git a/src/contextualizers/test/transactions/goldDestination-0x85058886.json b/src/contextualizers/test/transactions/goldDestination-0x85058886.json index 0b680b7c..c814100e 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x85058886.json +++ b/src/contextualizers/test/transactions/goldDestination-0x85058886.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", diff --git a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json index 813d07f9..e9ff112b 100644 --- a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json +++ b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", diff --git a/src/contextualizers/test/transactions/goldSource-0xef715998.json b/src/contextualizers/test/transactions/goldSource-0xef715998.json index fa784c43..4f5f0f21 100644 --- a/src/contextualizers/test/transactions/goldSource-0xef715998.json +++ b/src/contextualizers/test/transactions/goldSource-0xef715998.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", diff --git a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json index e3189a23..5315d820 100644 --- a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json +++ b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json @@ -233,7 +233,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "from": "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8", diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts index bfd538b0..71c45235 100644 --- a/src/helpers/utils.ts +++ b/src/helpers/utils.ts @@ -321,7 +321,7 @@ export const makeTransform = ( block.transactions = block.transactions.map((txn) => { const xformed = childTransformer(block, txn); - xformed.pseudoTransactions = xformed.pseudoTransactions?.map( + xformed.pseudotransactions = xformed.pseudotransactions?.map( (pseudoTxn) => childTransformer(block, pseudoTxn), ); diff --git a/src/transformers/_common/accountAbstraction/index.spec.ts b/src/transformers/_common/accountAbstraction/index.spec.ts index a51e2325..7b61012a 100644 --- a/src/transformers/_common/accountAbstraction/index.spec.ts +++ b/src/transformers/_common/accountAbstraction/index.spec.ts @@ -8,7 +8,7 @@ import { ERC20_TRANSFER_EVENT } from '../../../helpers/constants'; const transform = makeTransform({ test: _transform }); describe('erc4337userOps', () => { - it('should unpack pseudoTransactions', () => { + it('should unpack pseudotransactions', () => { const block = loadBlockFixture('ethereum', 19_298_068); const result = transform(block); @@ -19,10 +19,10 @@ describe('erc4337userOps', () => { ); expect(txn).toBeDefined(); - expect(txn?.pseudoTransactions).toBeDefined(); - expect(txn?.pseudoTransactions?.length).toBe(1); + expect(txn?.pseudotransactions).toBeDefined(); + expect(txn?.pseudotransactions?.length).toBe(1); - const pseudoTransaction = txn!.pseudoTransactions![0]; + const pseudoTransaction = txn!.pseudotransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', @@ -41,7 +41,7 @@ describe('erc4337userOps', () => { '0x7a5e7d32380ae2ca3064b7fbc41e0d698cb7826f61a941737902f4a74a979ca7', ); - const pseudoTransaction = txn!.pseudoTransactions![0]; + const pseudoTransaction = txn!.pseudotransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', to: '0x5d72015cc621025c265fabffc2fa55ac4821d79f', @@ -70,7 +70,7 @@ describe('erc4337userOps', () => { }); // Check that the pseudoTransaction does NOT have logs from the entry point - const pseudoTransaction = txn.pseudoTransactions![0]; + const pseudoTransaction = txn.pseudotransactions![0]; expect(pseudoTransaction.receipt).toMatchObject({ logs: expect.not.arrayContaining([ expect.objectContaining({ @@ -101,10 +101,10 @@ describe('erc4337userOps', () => { '0xc7d4c93fefb9f56383d9a9e4cbafa53696610b777ac5797f751652db928b9ad1', )!; - expect(txn.pseudoTransactions!.length).toBe(2); + expect(txn.pseudotransactions!.length).toBe(2); - expect(txn.pseudoTransactions![0].receipt.logs.length).toBe(1); - expect(txn.pseudoTransactions![1].receipt.logs.length).toBe(4); + expect(txn.pseudotransactions![0].receipt.logs.length).toBe(1); + expect(txn.pseudotransactions![1].receipt.logs.length).toBe(4); }); it('should only include traces from user op', () => { @@ -117,7 +117,7 @@ describe('erc4337userOps', () => { '0xa8c9957193c0be795a1a032564728bda9bcea9899317b2e6298ec55ce19a689f', )!; - const pseudoTxn = txn.pseudoTransactions![0]; + const pseudoTxn = txn.pseudotransactions![0]; expect(txn.traces.length > pseudoTxn.traces.length); expect(pseudoTxn.traces.map((v) => v.traceAddress)).toEqual([ @@ -139,10 +139,10 @@ describe('erc4337userOps', () => { )!; expect( - txn.pseudoTransactions![0].traces.map((v) => v.traceAddress), + txn.pseudotransactions![0].traces.map((v) => v.traceAddress), ).toEqual([[4], [4, 0], [4, 0, 0], [4, 0, 0, 0], [4, 0, 0, 0, 0]]); - expect(txn.pseudoTransactions![1].traces.map((v) => v.traceAddress)).toEqual([ + expect(txn.pseudotransactions![1].traces.map((v) => v.traceAddress)).toEqual([ [5], [5, 0], [5, 0, 0], @@ -168,7 +168,7 @@ describe('erc4337userOps', () => { '0x2f54574405fda5bedfa9d6df46188550033d3a18829f46456fa009199911b596', )!; - const pseudoTxn = txn.pseudoTransactions![0]; + const pseudoTxn = txn.pseudotransactions![0]; expect(pseudoTxn.receipt.status).toBe(0); }); diff --git a/src/transformers/_common/accountAbstraction/index.ts b/src/transformers/_common/accountAbstraction/index.ts index b590f3a9..b29c33df 100644 --- a/src/transformers/_common/accountAbstraction/index.ts +++ b/src/transformers/_common/accountAbstraction/index.ts @@ -250,7 +250,7 @@ export const unpackERC4337Transactions = ( export const transform: TxnTransformer = (_block, tx) => { if (!isRawTransaction(tx)) return tx; - const pseudoTransactions = unpackERC4337Transactions(tx); + const pseudotransactions = unpackERC4337Transactions(tx); - return { ...tx, pseudoTransactions }; + return { ...tx, pseudotransactions }; }; diff --git a/src/transformers/transformer.spec.ts b/src/transformers/transformer.spec.ts index 4a742fab..e3033c5d 100644 --- a/src/transformers/transformer.spec.ts +++ b/src/transformers/transformer.spec.ts @@ -495,7 +495,7 @@ describe('transformations', () => { }); }); - it('should unpack and transform pseudoTransactions', () => { + it('should unpack and transform pseudotransactions', () => { const block = loadBlockFixture('ethereum', 19_298_068); const result = transformer.transform(block); @@ -519,11 +519,11 @@ describe('transformations', () => { ]), }); - expect(txn?.pseudoTransactions).toBeDefined(); - expect(txn?.pseudoTransactions?.length).toBe(1); + expect(txn?.pseudotransactions).toBeDefined(); + expect(txn?.pseudotransactions?.length).toBe(1); // pseudo transaction should NOT include eth transfer from entry point to beneficiary - const pseudoTransaction = txn!.pseudoTransactions![0]; + const pseudoTransaction = txn!.pseudotransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', to: '0x5d72015cc621025c265fabffc2fa55ac4821d79f', diff --git a/src/types/transaction.ts b/src/types/transaction.ts index 84f705b5..5c71c088 100644 --- a/src/types/transaction.ts +++ b/src/types/transaction.ts @@ -104,7 +104,7 @@ export type TransactionContextType = { // MongoDB document export type Transaction = BaseTransaction & { assetTransfers?: AssetTransfer[]; - pseudoTransactions?: PseudoTransaction[]; + pseudotransactions?: PseudoTransaction[]; enrichedParties?: TransactionEnrichedParties; assetsEnriched?: TransactionAssetsEnriched; sigHash: string; @@ -154,7 +154,7 @@ export type RawTransaction = PartialTransaction & { hash: Hex; accessList?: StdObj[]; - pseudoTransactions?: PseudoTransaction[]; + pseudotransactions?: PseudoTransaction[]; }; export type RawTraceAction = StdObj & { From 089d57dfd186863d140f6f6e86401656b775b97a Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Fri, 31 May 2024 10:13:54 -0400 Subject: [PATCH 4/6] revert pseudotransactions capitalization for now --- .../test/transactions/boombox-0x460925a4.json | 2 +- .../test/transactions/boombox-0xd996e83d.json | 2 +- .../test/transactions/boombox-0xde83b70f.json | 2 +- .../test/transactions/boombox-0xe25e9ec5.json | 2 +- ...ridgeZoraEnergyDestination-0xf178e44b.json | 2 +- .../transactions/catchall-0x26f6c382.json | 2 +- .../transactions/catchall-0x27cdbe9f.json | 2 +- .../erc1155Purchase-0xc6c925c0.json | 2 +- .../transactions/erc20Swap-0x96f5e3fb.json | 2 +- .../erc721PurchaseNot-0x26beaf02.json | 2 +- .../goldDestination-0x469f8c9c.json | 4 +-- .../goldDestination-0x85058886.json | 4 +-- .../transactions/goldSource-0x3374f5f4.json | 4 +-- .../transactions/goldSource-0xef715998.json | 4 +-- .../test/transactions/leeroy-0xa8afad2c.json | 2 +- .../reservoirSource-0x35c5ac27.json | 2 +- .../reservoirSource-0x7e8671f6.json | 2 +- .../transactions/tokenAirdrop-0xcce0327b.json | 2 +- .../uniswapV3Pair-0xcc883774.json | 4 +-- src/helpers/utils.ts | 2 +- .../_common/accountAbstraction/index.spec.ts | 26 +++++++++---------- .../_common/accountAbstraction/index.ts | 4 +-- src/transformers/transformer.spec.ts | 8 +++--- src/types/transaction.ts | 4 +-- 24 files changed, 46 insertions(+), 46 deletions(-) diff --git a/src/contextualizers/test/transactions/boombox-0x460925a4.json b/src/contextualizers/test/transactions/boombox-0x460925a4.json index 02c10540..8c002998 100644 --- a/src/contextualizers/test/transactions/boombox-0x460925a4.json +++ b/src/contextualizers/test/transactions/boombox-0x460925a4.json @@ -66,7 +66,7 @@ "transactionFee": "329210634372624000051437959100", "logs": [], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xd996e83d.json b/src/contextualizers/test/transactions/boombox-0xd996e83d.json index e62a3118..52c73f39 100644 --- a/src/contextualizers/test/transactions/boombox-0xd996e83d.json +++ b/src/contextualizers/test/transactions/boombox-0xd996e83d.json @@ -30292,7 +30292,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xde83b70f.json b/src/contextualizers/test/transactions/boombox-0xde83b70f.json index 1cab31af..9c4cdc3b 100644 --- a/src/contextualizers/test/transactions/boombox-0xde83b70f.json +++ b/src/contextualizers/test/transactions/boombox-0xde83b70f.json @@ -105,7 +105,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json index 22652b74..708a13cb 100644 --- a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json +++ b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json @@ -29589,7 +29589,7 @@ } ], "netAssetTransfers": {}, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json index aeb0e47d..f698092b 100644 --- a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json +++ b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json @@ -200,7 +200,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xf70da97812cb96acdf810712aa562db8dfa3dbef": [ diff --git a/src/contextualizers/test/transactions/catchall-0x26f6c382.json b/src/contextualizers/test/transactions/catchall-0x26f6c382.json index 986e5691..791bece2 100644 --- a/src/contextualizers/test/transactions/catchall-0x26f6c382.json +++ b/src/contextualizers/test/transactions/catchall-0x26f6c382.json @@ -645,7 +645,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x4337003fcd2f56de3977ccb806383e9161628d0e": [ diff --git a/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json b/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json index 0a509416..72b97781 100644 --- a/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json +++ b/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json @@ -667,7 +667,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x433702256b464248dcbe403c1334757be4ed9f26": [ diff --git a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json index 194ef30c..b6387efa 100644 --- a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json +++ b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json @@ -532,7 +532,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x15cc6926a4bea1eb176a738f7a8c63e65b437f84": [ diff --git a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json index bf839e65..615fb499 100644 --- a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json +++ b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json @@ -729,7 +729,7 @@ ] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x605e05bf092ebd18e06d1b0f699df5b9dd85d452": [ diff --git a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json index 75c7b2c8..a937784d 100644 --- a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json +++ b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json @@ -266,7 +266,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x2c2926b92782e30150ff779220a1ece076f2a827": [ diff --git a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json index 6e686491..b854f006 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json +++ b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", @@ -5474,7 +5474,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xbf827f0cb27ae0f0ec08aa113fa6cdc2bee22deb": [ diff --git a/src/contextualizers/test/transactions/goldDestination-0x85058886.json b/src/contextualizers/test/transactions/goldDestination-0x85058886.json index c814100e..a538b455 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x85058886.json +++ b/src/contextualizers/test/transactions/goldDestination-0x85058886.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", @@ -5474,7 +5474,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x38369853c72295737b457fb98cbdcf61d224aa0d": [ diff --git a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json index e9ff112b..d3955d74 100644 --- a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json +++ b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", @@ -1050,7 +1050,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0xb374fdd2951a65e827dab88f692a6819dc43c6d7": [ diff --git a/src/contextualizers/test/transactions/goldSource-0xef715998.json b/src/contextualizers/test/transactions/goldSource-0xef715998.json index 4f5f0f21..a570ceb2 100644 --- a/src/contextualizers/test/transactions/goldSource-0xef715998.json +++ b/src/contextualizers/test/transactions/goldSource-0xef715998.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", @@ -1050,7 +1050,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x18f33cef45817c428d98c4e188a770191fdd4b79": [ diff --git a/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json b/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json index 1ad489da..50e58fb0 100644 --- a/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json +++ b/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json @@ -99,7 +99,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x16d3e35a25a51fabd9d512dcb07554bff545837b": [ diff --git a/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json b/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json index 5ad069ba..31325ab3 100644 --- a/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json +++ b/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json @@ -90,7 +90,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x74b78e98093f5b522a7ebdac3b994641ca7c2b20": [ diff --git a/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json b/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json index 13e28d03..7cd3c16f 100644 --- a/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json +++ b/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json @@ -90,7 +90,7 @@ "sent": [] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x74b78e98093f5b522a7ebdac3b994641ca7c2b20": [ diff --git a/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json b/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json index 47e9d9f8..1449ea64 100644 --- a/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json +++ b/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json @@ -125342,7 +125342,7 @@ ] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x9b5f028c1ab624aa40d24bc5ad0d4e4f15ddfd40": [ diff --git a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json index 5315d820..2398d69b 100644 --- a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json +++ b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json @@ -233,7 +233,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "from": "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8", @@ -563,7 +563,7 @@ ] } }, - "pseudotransactions": [], + "pseudoTransactions": [], "contractsCreated": [], "enrichedParties": { "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8": [ diff --git a/src/helpers/utils.ts b/src/helpers/utils.ts index 71c45235..bfd538b0 100644 --- a/src/helpers/utils.ts +++ b/src/helpers/utils.ts @@ -321,7 +321,7 @@ export const makeTransform = ( block.transactions = block.transactions.map((txn) => { const xformed = childTransformer(block, txn); - xformed.pseudotransactions = xformed.pseudotransactions?.map( + xformed.pseudoTransactions = xformed.pseudoTransactions?.map( (pseudoTxn) => childTransformer(block, pseudoTxn), ); diff --git a/src/transformers/_common/accountAbstraction/index.spec.ts b/src/transformers/_common/accountAbstraction/index.spec.ts index 7b61012a..a51e2325 100644 --- a/src/transformers/_common/accountAbstraction/index.spec.ts +++ b/src/transformers/_common/accountAbstraction/index.spec.ts @@ -8,7 +8,7 @@ import { ERC20_TRANSFER_EVENT } from '../../../helpers/constants'; const transform = makeTransform({ test: _transform }); describe('erc4337userOps', () => { - it('should unpack pseudotransactions', () => { + it('should unpack pseudoTransactions', () => { const block = loadBlockFixture('ethereum', 19_298_068); const result = transform(block); @@ -19,10 +19,10 @@ describe('erc4337userOps', () => { ); expect(txn).toBeDefined(); - expect(txn?.pseudotransactions).toBeDefined(); - expect(txn?.pseudotransactions?.length).toBe(1); + expect(txn?.pseudoTransactions).toBeDefined(); + expect(txn?.pseudoTransactions?.length).toBe(1); - const pseudoTransaction = txn!.pseudotransactions![0]; + const pseudoTransaction = txn!.pseudoTransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', @@ -41,7 +41,7 @@ describe('erc4337userOps', () => { '0x7a5e7d32380ae2ca3064b7fbc41e0d698cb7826f61a941737902f4a74a979ca7', ); - const pseudoTransaction = txn!.pseudotransactions![0]; + const pseudoTransaction = txn!.pseudoTransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', to: '0x5d72015cc621025c265fabffc2fa55ac4821d79f', @@ -70,7 +70,7 @@ describe('erc4337userOps', () => { }); // Check that the pseudoTransaction does NOT have logs from the entry point - const pseudoTransaction = txn.pseudotransactions![0]; + const pseudoTransaction = txn.pseudoTransactions![0]; expect(pseudoTransaction.receipt).toMatchObject({ logs: expect.not.arrayContaining([ expect.objectContaining({ @@ -101,10 +101,10 @@ describe('erc4337userOps', () => { '0xc7d4c93fefb9f56383d9a9e4cbafa53696610b777ac5797f751652db928b9ad1', )!; - expect(txn.pseudotransactions!.length).toBe(2); + expect(txn.pseudoTransactions!.length).toBe(2); - expect(txn.pseudotransactions![0].receipt.logs.length).toBe(1); - expect(txn.pseudotransactions![1].receipt.logs.length).toBe(4); + expect(txn.pseudoTransactions![0].receipt.logs.length).toBe(1); + expect(txn.pseudoTransactions![1].receipt.logs.length).toBe(4); }); it('should only include traces from user op', () => { @@ -117,7 +117,7 @@ describe('erc4337userOps', () => { '0xa8c9957193c0be795a1a032564728bda9bcea9899317b2e6298ec55ce19a689f', )!; - const pseudoTxn = txn.pseudotransactions![0]; + const pseudoTxn = txn.pseudoTransactions![0]; expect(txn.traces.length > pseudoTxn.traces.length); expect(pseudoTxn.traces.map((v) => v.traceAddress)).toEqual([ @@ -139,10 +139,10 @@ describe('erc4337userOps', () => { )!; expect( - txn.pseudotransactions![0].traces.map((v) => v.traceAddress), + txn.pseudoTransactions![0].traces.map((v) => v.traceAddress), ).toEqual([[4], [4, 0], [4, 0, 0], [4, 0, 0, 0], [4, 0, 0, 0, 0]]); - expect(txn.pseudotransactions![1].traces.map((v) => v.traceAddress)).toEqual([ + expect(txn.pseudoTransactions![1].traces.map((v) => v.traceAddress)).toEqual([ [5], [5, 0], [5, 0, 0], @@ -168,7 +168,7 @@ describe('erc4337userOps', () => { '0x2f54574405fda5bedfa9d6df46188550033d3a18829f46456fa009199911b596', )!; - const pseudoTxn = txn.pseudotransactions![0]; + const pseudoTxn = txn.pseudoTransactions![0]; expect(pseudoTxn.receipt.status).toBe(0); }); diff --git a/src/transformers/_common/accountAbstraction/index.ts b/src/transformers/_common/accountAbstraction/index.ts index b29c33df..b590f3a9 100644 --- a/src/transformers/_common/accountAbstraction/index.ts +++ b/src/transformers/_common/accountAbstraction/index.ts @@ -250,7 +250,7 @@ export const unpackERC4337Transactions = ( export const transform: TxnTransformer = (_block, tx) => { if (!isRawTransaction(tx)) return tx; - const pseudotransactions = unpackERC4337Transactions(tx); + const pseudoTransactions = unpackERC4337Transactions(tx); - return { ...tx, pseudotransactions }; + return { ...tx, pseudoTransactions }; }; diff --git a/src/transformers/transformer.spec.ts b/src/transformers/transformer.spec.ts index e3033c5d..4a742fab 100644 --- a/src/transformers/transformer.spec.ts +++ b/src/transformers/transformer.spec.ts @@ -495,7 +495,7 @@ describe('transformations', () => { }); }); - it('should unpack and transform pseudotransactions', () => { + it('should unpack and transform pseudoTransactions', () => { const block = loadBlockFixture('ethereum', 19_298_068); const result = transformer.transform(block); @@ -519,11 +519,11 @@ describe('transformations', () => { ]), }); - expect(txn?.pseudotransactions).toBeDefined(); - expect(txn?.pseudotransactions?.length).toBe(1); + expect(txn?.pseudoTransactions).toBeDefined(); + expect(txn?.pseudoTransactions?.length).toBe(1); // pseudo transaction should NOT include eth transfer from entry point to beneficiary - const pseudoTransaction = txn!.pseudotransactions![0]; + const pseudoTransaction = txn!.pseudoTransactions![0]; expect(pseudoTransaction).toMatchObject({ from: '0x2991c3845396c9f1d262b2ca0674111a59e2c90a', to: '0x5d72015cc621025c265fabffc2fa55ac4821d79f', diff --git a/src/types/transaction.ts b/src/types/transaction.ts index 5c71c088..84f705b5 100644 --- a/src/types/transaction.ts +++ b/src/types/transaction.ts @@ -104,7 +104,7 @@ export type TransactionContextType = { // MongoDB document export type Transaction = BaseTransaction & { assetTransfers?: AssetTransfer[]; - pseudotransactions?: PseudoTransaction[]; + pseudoTransactions?: PseudoTransaction[]; enrichedParties?: TransactionEnrichedParties; assetsEnriched?: TransactionAssetsEnriched; sigHash: string; @@ -154,7 +154,7 @@ export type RawTransaction = PartialTransaction & { hash: Hex; accessList?: StdObj[]; - pseudotransactions?: PseudoTransaction[]; + pseudoTransactions?: PseudoTransaction[]; }; export type RawTraceAction = StdObj & { From 70697f0dca5ecb8756aeb42e4c1f0e4f7b0772be Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Fri, 31 May 2024 10:16:17 -0400 Subject: [PATCH 5/6] revert all capitalization --- src/contextualizers/test/transactions/boombox-0x460925a4.json | 2 +- src/contextualizers/test/transactions/boombox-0xd996e83d.json | 2 +- src/contextualizers/test/transactions/boombox-0xde83b70f.json | 2 +- src/contextualizers/test/transactions/boombox-0xe25e9ec5.json | 2 +- .../transactions/bridgeZoraEnergyDestination-0xf178e44b.json | 2 +- .../test/transactions/catchall-0x26f6c382.json | 2 +- .../test/transactions/catchall-0x27cdbe9f.json | 2 +- .../test/transactions/erc1155Purchase-0xc6c925c0.json | 2 +- .../test/transactions/erc20Swap-0x96f5e3fb.json | 4 ++-- .../test/transactions/erc721PurchaseNot-0x26beaf02.json | 2 +- .../test/transactions/goldDestination-0x469f8c9c.json | 4 ++-- .../test/transactions/goldDestination-0x85058886.json | 4 ++-- .../test/transactions/goldSource-0x3374f5f4.json | 4 ++-- .../test/transactions/goldSource-0xef715998.json | 4 ++-- src/contextualizers/test/transactions/leeroy-0xa8afad2c.json | 2 +- .../test/transactions/reservoirSource-0x35c5ac27.json | 2 +- .../test/transactions/reservoirSource-0x7e8671f6.json | 2 +- .../test/transactions/tokenAirdrop-0xcce0327b.json | 2 +- .../test/transactions/uniswapV3Pair-0xcc883774.json | 4 ++-- src/types/transaction.ts | 2 +- 20 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/contextualizers/test/transactions/boombox-0x460925a4.json b/src/contextualizers/test/transactions/boombox-0x460925a4.json index 8c002998..02c10540 100644 --- a/src/contextualizers/test/transactions/boombox-0x460925a4.json +++ b/src/contextualizers/test/transactions/boombox-0x460925a4.json @@ -66,7 +66,7 @@ "transactionFee": "329210634372624000051437959100", "logs": [], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xd996e83d.json b/src/contextualizers/test/transactions/boombox-0xd996e83d.json index 52c73f39..e62a3118 100644 --- a/src/contextualizers/test/transactions/boombox-0xd996e83d.json +++ b/src/contextualizers/test/transactions/boombox-0xd996e83d.json @@ -30292,7 +30292,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xde83b70f.json b/src/contextualizers/test/transactions/boombox-0xde83b70f.json index 9c4cdc3b..1cab31af 100644 --- a/src/contextualizers/test/transactions/boombox-0xde83b70f.json +++ b/src/contextualizers/test/transactions/boombox-0xde83b70f.json @@ -105,7 +105,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json index 708a13cb..22652b74 100644 --- a/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json +++ b/src/contextualizers/test/transactions/boombox-0xe25e9ec5.json @@ -29589,7 +29589,7 @@ } ], "netAssetTransfers": {}, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xab18fdc21c33c3c60bbca753997a657f00d43f9e": [ diff --git a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json index f698092b..aeb0e47d 100644 --- a/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json +++ b/src/contextualizers/test/transactions/bridgeZoraEnergyDestination-0xf178e44b.json @@ -200,7 +200,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xf70da97812cb96acdf810712aa562db8dfa3dbef": [ diff --git a/src/contextualizers/test/transactions/catchall-0x26f6c382.json b/src/contextualizers/test/transactions/catchall-0x26f6c382.json index 791bece2..986e5691 100644 --- a/src/contextualizers/test/transactions/catchall-0x26f6c382.json +++ b/src/contextualizers/test/transactions/catchall-0x26f6c382.json @@ -645,7 +645,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x4337003fcd2f56de3977ccb806383e9161628d0e": [ diff --git a/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json b/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json index 72b97781..0a509416 100644 --- a/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json +++ b/src/contextualizers/test/transactions/catchall-0x27cdbe9f.json @@ -667,7 +667,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x433702256b464248dcbe403c1334757be4ed9f26": [ diff --git a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json index b6387efa..194ef30c 100644 --- a/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json +++ b/src/contextualizers/test/transactions/erc1155Purchase-0xc6c925c0.json @@ -532,7 +532,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x15cc6926a4bea1eb176a738f7a8c63e65b437f84": [ diff --git a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json index 615fb499..38790227 100644 --- a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json +++ b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json @@ -232,7 +232,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0xeb54dacb4c2ccb64f8074eceea33b5ebb38e5387", @@ -729,7 +729,7 @@ ] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x605e05bf092ebd18e06d1b0f699df5b9dd85d452": [ diff --git a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json index a937784d..75c7b2c8 100644 --- a/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json +++ b/src/contextualizers/test/transactions/erc721PurchaseNot-0x26beaf02.json @@ -266,7 +266,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x2c2926b92782e30150ff779220a1ece076f2a827": [ diff --git a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json index b854f006..6e686491 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json +++ b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", @@ -5474,7 +5474,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xbf827f0cb27ae0f0ec08aa113fa6cdc2bee22deb": [ diff --git a/src/contextualizers/test/transactions/goldDestination-0x85058886.json b/src/contextualizers/test/transactions/goldDestination-0x85058886.json index a538b455..c814100e 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x85058886.json +++ b/src/contextualizers/test/transactions/goldDestination-0x85058886.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", @@ -5474,7 +5474,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x38369853c72295737b457fb98cbdcf61d224aa0d": [ diff --git a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json index d3955d74..e9ff112b 100644 --- a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json +++ b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", @@ -1050,7 +1050,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0xb374fdd2951a65e827dab88f692a6819dc43c6d7": [ diff --git a/src/contextualizers/test/transactions/goldSource-0xef715998.json b/src/contextualizers/test/transactions/goldSource-0xef715998.json index a570ceb2..4f5f0f21 100644 --- a/src/contextualizers/test/transactions/goldSource-0xef715998.json +++ b/src/contextualizers/test/transactions/goldSource-0xef715998.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", @@ -1050,7 +1050,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x18f33cef45817c428d98c4e188a770191fdd4b79": [ diff --git a/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json b/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json index 50e58fb0..1ad489da 100644 --- a/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json +++ b/src/contextualizers/test/transactions/leeroy-0xa8afad2c.json @@ -99,7 +99,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x16d3e35a25a51fabd9d512dcb07554bff545837b": [ diff --git a/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json b/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json index 31325ab3..5ad069ba 100644 --- a/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json +++ b/src/contextualizers/test/transactions/reservoirSource-0x35c5ac27.json @@ -90,7 +90,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x74b78e98093f5b522a7ebdac3b994641ca7c2b20": [ diff --git a/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json b/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json index 7cd3c16f..13e28d03 100644 --- a/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json +++ b/src/contextualizers/test/transactions/reservoirSource-0x7e8671f6.json @@ -90,7 +90,7 @@ "sent": [] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x74b78e98093f5b522a7ebdac3b994641ca7c2b20": [ diff --git a/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json b/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json index 1449ea64..47e9d9f8 100644 --- a/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json +++ b/src/contextualizers/test/transactions/tokenAirdrop-0xcce0327b.json @@ -125342,7 +125342,7 @@ ] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x9b5f028c1ab624aa40d24bc5ad0d4e4f15ddfd40": [ diff --git a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json index 2398d69b..5315d820 100644 --- a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json +++ b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json @@ -233,7 +233,7 @@ ] }, "decoded": null, - "pseudoTransactions": [], + "pseudotransactions": [], "assetTransfers": [ { "from": "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8", @@ -563,7 +563,7 @@ ] } }, - "pseudoTransactions": [], + "pseudotransactions": [], "contractsCreated": [], "enrichedParties": { "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8": [ diff --git a/src/types/transaction.ts b/src/types/transaction.ts index 84f705b5..8ae4b45e 100644 --- a/src/types/transaction.ts +++ b/src/types/transaction.ts @@ -104,7 +104,7 @@ export type TransactionContextType = { // MongoDB document export type Transaction = BaseTransaction & { assetTransfers?: AssetTransfer[]; - pseudoTransactions?: PseudoTransaction[]; + pseudotransactions?: PseudoTransaction[]; enrichedParties?: TransactionEnrichedParties; assetsEnriched?: TransactionAssetsEnriched; sigHash: string; From 81a9acea0c7d021b1bd22e744b3a837df6c585c5 Mon Sep 17 00:00:00 2001 From: Gus Cost Date: Fri, 31 May 2024 10:19:45 -0400 Subject: [PATCH 6/6] revert by hand all the different examples --- src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json | 2 +- .../test/transactions/goldDestination-0x469f8c9c.json | 2 +- .../test/transactions/goldDestination-0x85058886.json | 2 +- .../test/transactions/goldSource-0x3374f5f4.json | 2 +- .../test/transactions/goldSource-0xef715998.json | 2 +- .../test/transactions/uniswapV3Pair-0xcc883774.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json index 38790227..bf839e65 100644 --- a/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json +++ b/src/contextualizers/test/transactions/erc20Swap-0x96f5e3fb.json @@ -232,7 +232,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0xeb54dacb4c2ccb64f8074eceea33b5ebb38e5387", diff --git a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json index 6e686491..ae2c618b 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json +++ b/src/contextualizers/test/transactions/goldDestination-0x469f8c9c.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", diff --git a/src/contextualizers/test/transactions/goldDestination-0x85058886.json b/src/contextualizers/test/transactions/goldDestination-0x85058886.json index c814100e..0b680b7c 100644 --- a/src/contextualizers/test/transactions/goldDestination-0x85058886.json +++ b/src/contextualizers/test/transactions/goldDestination-0x85058886.json @@ -298,7 +298,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0xe2f275b2a5c376fd10006b67a9be0cc3bd5488e8", diff --git a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json index e9ff112b..813d07f9 100644 --- a/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json +++ b/src/contextualizers/test/transactions/goldSource-0x3374f5f4.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", diff --git a/src/contextualizers/test/transactions/goldSource-0xef715998.json b/src/contextualizers/test/transactions/goldSource-0xef715998.json index 4f5f0f21..fa784c43 100644 --- a/src/contextualizers/test/transactions/goldSource-0xef715998.json +++ b/src/contextualizers/test/transactions/goldSource-0xef715998.json @@ -187,7 +187,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "contract": "0x12f885808f616b8056a37be00fdd029e1c59ab08", diff --git a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json index 5315d820..e3189a23 100644 --- a/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json +++ b/src/contextualizers/test/transactions/uniswapV3Pair-0xcc883774.json @@ -233,7 +233,7 @@ ] }, "decoded": null, - "pseudotransactions": [], + "pseudoTransactions": [], "assetTransfers": [ { "from": "0x1e474b50bdc2b39dccaa2b8ddf37b3f022b128a8",