Skip to content

Commit 3cdcdd1

Browse files
committed
exclude fields we don't need which result in extra RPC calls.
1 parent 4f822f5 commit 3cdcdd1

12 files changed

+84
-4
lines changed

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"lint:fix": "eslint \"src/**/*.ts\" --fix"
2929
},
3030
"dependencies": {
31-
"@originprotocol/squid-utils": "github:OriginProtocol/squid-utils#test2",
31+
"@originprotocol/squid-utils": "github:OriginProtocol/squid-utils#main",
3232
"@subsquid/evm-processor": "^1.27.0",
3333
"@subsquid/graphql-server": "^4.9.0",
3434
"@subsquid/typeorm-migration": "^1.3.0",

squid.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ deploy:
77
env:
88
TS_NODE_BASEURL: './lib'
99
IGNORE_VALIDATION: 'true'
10-
DEBUG_PERF: 'true'
10+
# DEBUG_PERF: 'true'
1111
addons:
1212
postgres:
1313
rpc:

src/main-arbitrum.ts

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { arbitrum } from 'viem/chains'
33

44
import { defineSquidProcessor, run } from '@originprotocol/squid-utils'
55
import { processStatus } from '@templates/processor-status/processor-status'
6+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
67

78
import { arbitrumERC20s } from './arbitrum'
89
import { ccip } from './oeth/processors/ccip'
@@ -13,6 +14,11 @@ export const processor = defineSquidProcessor({
1314
processors: [arbitrumERC20s, ccip({ chainId: arbitrum.id })],
1415
postProcessors: [processStatus('arbitrum')],
1516
validators: [],
17+
fields: {
18+
transaction: {
19+
...EXCLUDE_TX_RECEIPT_FIELDS,
20+
},
21+
},
1622
})
1723
export default processor
1824

src/main-base.ts

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-ra
66
import { createCurvePoolBoosterProcessor } from '@templates/otoken/curve-pool-booster'
77
import { createPoolsProcessor } from '@templates/pools/pools'
88
import { processStatus } from '@templates/processor-status'
9+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
910

1011
import { baseERC20s, baseStrategies, bridgedWoethStrategy, superOETHb } from './base'
1112
import { aerodromeProcessors } from './base/aerodrome'
@@ -27,6 +28,11 @@ export const processor = defineSquidProcessor({
2728
],
2829
postProcessors: [exchangeRatesPostProcessor, processStatus('base')],
2930
validators: [validate],
31+
fields: {
32+
transaction: {
33+
...EXCLUDE_TX_RECEIPT_FIELDS,
34+
},
35+
},
3036
})
3137

3238
export default processor

src/main-oeth.ts

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import { defineSquidProcessor, run } from '@originprotocol/squid-utils'
44
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
55
import { processStatus } from '@templates/processor-status'
66
import { addresses } from '@utils/addresses'
7+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
78

89
import * as oeth from './oeth/processors'
910
import { ccip } from './oeth/processors/ccip'
@@ -27,6 +28,11 @@ export const processor = defineSquidProcessor({
2728
],
2829
postProcessors: [exchangeRatesPostProcessor, processStatus('oeth')],
2930
validators: [validateOeth],
31+
fields: {
32+
transaction: {
33+
...EXCLUDE_TX_RECEIPT_FIELDS,
34+
},
35+
},
3036
})
3137
export default processor
3238

src/main-ogv.ts

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'tsconfig-paths/register'
22

33
import { defineSquidProcessor, run } from '@originprotocol/squid-utils'
44
import { processStatus } from '@templates/processor-status'
5+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
56

67
import * as dailyStats from './ogv/post-processors/daily-stats'
78
import * as governance from './ogv/post-processors/governance'
@@ -13,6 +14,11 @@ export const processor = defineSquidProcessor({
1314
processors: [ogvSupply, ogv],
1415
postProcessors: [governance, dailyStats, processStatus('ogv')],
1516
validators: [],
17+
fields: {
18+
transaction: {
19+
...EXCLUDE_TX_RECEIPT_FIELDS,
20+
},
21+
},
1622
})
1723
export default processor
1824

src/main-ousd.ts

+6
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'tsconfig-paths/register'
33
import { defineSquidProcessor, run } from '@originprotocol/squid-utils'
44
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
55
import { processStatus } from '@templates/processor-status'
6+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
67

78
import * as curve from './ousd/processors/curve'
89
import { erc20s } from './ousd/processors/erc20s'
@@ -16,6 +17,11 @@ export const processor = defineSquidProcessor({
1617
processors: [ousd, strategies, curve, morphoMarketStatesProcessor, ...erc20s()],
1718
postProcessors: [exchangeRatesPostProcessor, processStatus('ousd')],
1819
validators: [validateOusd],
20+
fields: {
21+
transaction: {
22+
...EXCLUDE_TX_RECEIPT_FIELDS,
23+
},
24+
},
1925
})
2026
export default processor
2127

src/main-plume.ts

+6
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { plumeMainnet } from 'viem/chains'
55
import { defineSquidProcessor, run } from '@originprotocol/squid-utils'
66
import * as exchangeRatesPostProcessor from '@shared/post-processors/exchange-rates'
77
import { processStatus } from '@templates/processor-status'
8+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
89

910
import * as validate from './sonic/validate'
1011

@@ -18,6 +19,11 @@ export const processor = defineSquidProcessor({
1819
],
1920
postProcessors: [exchangeRatesPostProcessor, processStatus('plume')],
2021
validators: [validate],
22+
fields: {
23+
transaction: {
24+
...EXCLUDE_TX_RECEIPT_FIELDS,
25+
},
26+
},
2127
})
2228

2329
export default processor

src/main-sonic.ts

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { createCurvePoolBoosterProcessor } from '@templates/otoken/curve-pool-bo
1010
import { createPoolBoosterProcessor } from '@templates/otoken/pool-booster'
1111
import { createPoolsProcessor } from '@templates/pools/pools'
1212
import { processStatus } from '@templates/processor-status'
13+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
1314

1415
import * as validate from './sonic/validate'
1516

@@ -26,6 +27,11 @@ export const processor = defineSquidProcessor({
2627
],
2728
postProcessors: [exchangeRatesPostProcessor, processStatus('sonic')],
2829
validators: [validate],
30+
fields: {
31+
transaction: {
32+
...EXCLUDE_TX_RECEIPT_FIELDS,
33+
},
34+
},
2935
})
3036

3137
export default processor

src/main-test.ts

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { CurrencySymbol } from '@shared/post-processors/exchange-rates/mainnetCu
1212
import { priceMap } from '@shared/post-processors/exchange-rates/price-routing-mainnet'
1313
import { OUSD_ADDRESS } from '@utils/addresses'
1414
import { baseAddresses } from '@utils/addresses-base'
15+
import { EXCLUDE_TX_RECEIPT_FIELDS } from '@utils/batch-proccesor-fields'
1516
import { getCoingeckoData } from '@utils/coingecko2'
1617

1718
const testRate = {
@@ -236,6 +237,11 @@ if (require.main === module) {
236237
],
237238
postProcessors: [],
238239
validators: [],
240+
fields: {
241+
transaction: {
242+
...EXCLUDE_TX_RECEIPT_FIELDS,
243+
},
244+
},
239245
}).catch((error) => {
240246
throw error
241247
})

src/utils/batch-proccesor-fields.ts

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// node_modules/@subsquid/evm-processor/src/ds-rpc/request.ts#L118
2+
export const TX_RECEIPT_FIELDS = {
3+
gasUsed: true,
4+
cumulativeGasUsed: true,
5+
effectiveGasPrice: true,
6+
contractAddress: true,
7+
type: true,
8+
status: true,
9+
l1Fee: true,
10+
l1FeeScalar: true,
11+
l1GasPrice: true,
12+
l1GasUsed: true,
13+
l1BaseFeeScalar: true,
14+
l1BlobBaseFee: true,
15+
l1BlobBaseFeeScalar: true,
16+
} as const
17+
18+
export const EXCLUDE_TX_RECEIPT_FIELDS = {
19+
gasUsed: false,
20+
cumulativeGasUsed: false,
21+
effectiveGasPrice: false,
22+
contractAddress: false,
23+
type: false,
24+
status: false,
25+
l1Fee: false,
26+
l1FeeScalar: false,
27+
l1GasPrice: false,
28+
l1GasUsed: false,
29+
l1BaseFeeScalar: false,
30+
l1BlobBaseFee: false,
31+
l1BlobBaseFeeScalar: false,
32+
} as const

0 commit comments

Comments
 (0)