@paraswap/dex-lib 2.16.0 → 2.16.1-generate-state-latest.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/composed-event-subscriber.d.ts +2 -2
- package/build/composed-event-subscriber.js +9 -4
- package/build/composed-event-subscriber.js.map +1 -1
- package/build/dex/aave-v1/aave-v1.d.ts +1 -1
- package/build/dex/aave-v1/aave-v1.js +1 -1
- package/build/dex/aave-v1/aave-v1.js.map +1 -1
- package/build/dex/aave-v2/aave-v2.d.ts +1 -1
- package/build/dex/aave-v2/aave-v2.js +1 -1
- package/build/dex/aave-v2/aave-v2.js.map +1 -1
- package/build/dex/aave-v3/aave-v3.d.ts +1 -1
- package/build/dex/aave-v3/aave-v3.js +1 -1
- package/build/dex/aave-v3/aave-v3.js.map +1 -1
- package/build/dex/aave-v3/tokens/arbitrum.json +50 -0
- package/build/dex/aave-v3/tokens/avalanche.json +74 -0
- package/build/dex/aave-v3/tokens/fantom.json +62 -0
- package/build/dex/aave-v3/tokens/optimism.json +50 -0
- package/build/dex/aave-v3/tokens/polygon.json +116 -0
- package/build/dex/aave-v3/utils.d.ts +1 -1
- package/build/dex/aave-v3/utils.js.map +1 -1
- package/build/dex/balancer-v1/balancer-v1-pool.d.ts +2 -2
- package/build/dex/balancer-v1/balancer-v1-pool.js +5 -1
- package/build/dex/balancer-v1/balancer-v1-pool.js.map +1 -1
- package/build/dex/balancer-v1/balancer-v1.d.ts +1 -1
- package/build/dex/balancer-v1/balancer-v1.js +7 -4
- package/build/dex/balancer-v1/balancer-v1.js.map +1 -1
- package/build/dex/balancer-v1/utils.d.ts +3 -1
- package/build/dex/balancer-v1/utils.js +18 -5
- package/build/dex/balancer-v1/utils.js.map +1 -1
- package/build/dex/balancer-v2/balancer-v2.d.ts +10 -5
- package/build/dex/balancer-v2/balancer-v2.js +15 -10
- package/build/dex/balancer-v2/balancer-v2.js.map +1 -1
- package/build/dex/camelot/camelot.d.ts +2 -2
- package/build/dex/camelot/camelot.js +15 -6
- package/build/dex/camelot/camelot.js.map +1 -1
- package/build/dex/curve-v1/curve-v1.d.ts +1 -1
- package/build/dex/curve-v1/curve-v1.js +5 -8
- package/build/dex/curve-v1/curve-v1.js.map +1 -1
- package/build/dex/curve-v1/pools/curve-metapool.d.ts +2 -2
- package/build/dex/curve-v1/pools/curve-metapool.js +12 -4
- package/build/dex/curve-v1/pools/curve-metapool.js.map +1 -1
- package/build/dex/curve-v1/pools/curve-pool.d.ts +3 -3
- package/build/dex/curve-v1/pools/curve-pool.js +13 -4
- package/build/dex/curve-v1/pools/curve-pool.js.map +1 -1
- package/build/dex/curve-v1/pools/getstate-multicall.d.ts +6 -1
- package/build/dex/curve-v1/pools/getstate-multicall.js +32 -25
- package/build/dex/curve-v1/pools/getstate-multicall.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.d.ts +3 -3
- package/build/dex/curve-v1-factory/curve-v1-factory.js +4 -4
- package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-pool-manager.d.ts +1 -1
- package/build/dex/curve-v1-factory/curve-v1-pool-manager.js +1 -1
- package/build/dex/curve-v1-factory/curve-v1-pool-manager.js.map +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.d.ts +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.js.map +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.d.ts +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.js.map +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.d.ts +4 -4
- package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.js +5 -15
- package/build/dex/curve-v1-factory/state-polling-pools/polling-manager.js.map +1 -1
- package/build/dex/curve-v1-factory/state-polling-pools/pool-polling-base.d.ts +1 -1
- package/build/dex/curve-v1-factory/types.d.ts +1 -1
- package/build/dex/generic-rfq/generic-rfq.d.ts +1 -1
- package/build/dex/generic-rfq/generic-rfq.js +1 -1
- package/build/dex/generic-rfq/generic-rfq.js.map +1 -1
- package/build/dex/generic-rfq/utils.js +1 -1
- package/build/dex/generic-rfq/utils.js.map +1 -1
- package/build/dex/gmx/gmx.d.ts +1 -1
- package/build/dex/gmx/gmx.js +1 -1
- package/build/dex/gmx/gmx.js.map +1 -1
- package/build/dex/gmx/pool.js +5 -4
- package/build/dex/gmx/pool.js.map +1 -1
- package/build/dex/idex.d.ts +1 -1
- package/build/dex/jarvis-v6/jarvis-v6-events.d.ts +4 -3
- package/build/dex/jarvis-v6/jarvis-v6-events.js +8 -4
- package/build/dex/jarvis-v6/jarvis-v6-events.js.map +1 -1
- package/build/dex/jarvis-v6/jarvis-v6.d.ts +1 -1
- package/build/dex/jarvis-v6/jarvis-v6.js +12 -8
- package/build/dex/jarvis-v6/jarvis-v6.js.map +1 -1
- package/build/dex/jarvis-v6/utils.d.ts +2 -1
- package/build/dex/jarvis-v6/utils.js +15 -6
- package/build/dex/jarvis-v6/utils.js.map +1 -1
- package/build/dex/kyberdmm/kyberdmm.js +4 -1
- package/build/dex/kyberdmm/kyberdmm.js.map +1 -1
- package/build/dex/kyberdmm/pool.d.ts +2 -2
- package/build/dex/kyberdmm/pool.js +21 -20
- package/build/dex/kyberdmm/pool.js.map +1 -1
- package/build/dex/maker-psm/maker-psm.d.ts +3 -3
- package/build/dex/maker-psm/maker-psm.js +35 -27
- package/build/dex/maker-psm/maker-psm.js.map +1 -1
- package/build/dex/maverick-v1/maverick-v1-pool.d.ts +3 -5
- package/build/dex/maverick-v1/maverick-v1-pool.js +27 -38
- package/build/dex/maverick-v1/maverick-v1-pool.js.map +1 -1
- package/build/dex/maverick-v1/maverick-v1.d.ts +2 -2
- package/build/dex/maverick-v1/maverick-v1.js +8 -8
- package/build/dex/maverick-v1/maverick-v1.js.map +1 -1
- package/build/dex/nerve/nerve-pool.d.ts +2 -2
- package/build/dex/nerve/nerve-pool.js +28 -25
- package/build/dex/nerve/nerve-pool.js.map +1 -1
- package/build/dex/nerve/nerve.d.ts +2 -2
- package/build/dex/nerve/nerve.js +5 -5
- package/build/dex/nerve/nerve.js.map +1 -1
- package/build/dex/platypus/platypus.d.ts +3 -3
- package/build/dex/platypus/platypus.js +6 -5
- package/build/dex/platypus/platypus.js.map +1 -1
- package/build/dex/swaap-v1/config.d.ts +1 -1
- package/build/dex/swaap-v1/config.js +2 -2
- package/build/dex/swaap-v1/swaap-v1-pool.d.ts +3 -3
- package/build/dex/swaap-v1/swaap-v1-pool.js +15 -9
- package/build/dex/swaap-v1/swaap-v1-pool.js.map +1 -1
- package/build/dex/swaap-v1/swaap-v1.d.ts +2 -2
- package/build/dex/swaap-v1/swaap-v1.js +11 -8
- package/build/dex/swaap-v1/swaap-v1.js.map +1 -1
- package/build/dex/synthetix/synthetix-state.js +1 -1
- package/build/dex/synthetix/synthetix-state.js.map +1 -1
- package/build/dex/synthetix/synthetix.d.ts +1 -1
- package/build/dex/synthetix/synthetix.js +5 -4
- package/build/dex/synthetix/synthetix.js.map +1 -1
- package/build/dex/test-dex/config.d.ts +4 -0
- package/build/dex/test-dex/config.js +15 -0
- package/build/dex/test-dex/config.js.map +1 -0
- package/build/dex/test-dex/test-dex-pool.d.ts +39 -0
- package/build/dex/test-dex/test-dex-pool.js +63 -0
- package/build/dex/test-dex/test-dex-pool.js.map +1 -0
- package/build/dex/test-dex/test-dex.d.ts +37 -0
- package/build/dex/test-dex/test-dex.js +126 -0
- package/build/dex/test-dex/test-dex.js.map +1 -0
- package/build/dex/test-dex/types.d.ts +6 -0
- package/build/dex/test-dex/types.js +3 -0
- package/build/dex/test-dex/types.js.map +1 -0
- package/build/dex/uniswap-v2/uniswap-v2.d.ts +2 -2
- package/build/dex/uniswap-v2/uniswap-v2.js +15 -10
- package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3-pool.d.ts +3 -3
- package/build/dex/uniswap-v3/uniswap-v3-pool.js +33 -27
- package/build/dex/uniswap-v3/uniswap-v3-pool.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.d.ts +2 -2
- package/build/dex/uniswap-v3/uniswap-v3.js +4 -3
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/woo-fi-v2/woo-fi-math.d.ts +16 -0
- package/build/dex/woo-fi-v2/woo-fi-math.js +137 -0
- package/build/dex/woo-fi-v2/woo-fi-math.js.map +1 -0
- package/build/dex/woo-fi-v2/woo-fi-v2.d.ts +1 -1
- package/build/dex/woo-fi-v2/woo-fi-v2.js +1 -1
- package/build/dex/woo-fi-v2/woo-fi-v2.js.map +1 -1
- package/build/implementations/local-paraswap-sdk.js +1 -2
- package/build/implementations/local-paraswap-sdk.js.map +1 -1
- package/build/lib/generics-events-subscribers/erc20-event-subscriber.d.ts +2 -2
- package/build/lib/generics-events-subscribers/erc20-event-subscriber.js +17 -12
- package/build/lib/generics-events-subscribers/erc20-event-subscriber.js.map +1 -1
- package/build/lib/multi-wrapper.d.ts +5 -1
- package/build/lib/multi-wrapper.js +21 -2
- package/build/lib/multi-wrapper.js.map +1 -1
- package/build/lib/tokens/balancer-fetcher.d.ts +5 -1
- package/build/lib/tokens/balancer-fetcher.js +7 -9
- package/build/lib/tokens/balancer-fetcher.js.map +1 -1
- package/build/pricing-helper.d.ts +1 -1
- package/build/pricing-helper.js +1 -1
- package/build/pricing-helper.js.map +1 -1
- package/build/stateful-event-subscriber.d.ts +7 -3
- package/build/stateful-event-subscriber.js +25 -22
- package/build/stateful-event-subscriber.js.map +1 -1
- package/build/utils.d.ts +2 -2
- package/build/utils.js +1 -1
- package/build/utils.js.map +1 -1
- package/dex-template/__DexName__.ts.template +3 -1
- package/package.json +1 -1
- package/src/composed-event-subscriber.ts +24 -13
- package/src/dex/aave-v1/aave-v1.ts +1 -1
- package/src/dex/aave-v2/aave-v2.ts +1 -1
- package/src/dex/aave-v3/aave-v3.ts +3 -1
- package/src/dex/aave-v3/utils.ts +3 -3
- package/src/dex/balancer-v1/balancer-v1-pool.ts +18 -9
- package/src/dex/balancer-v1/balancer-v1.ts +13 -8
- package/src/dex/balancer-v1/utils.ts +36 -7
- package/src/dex/balancer-v2/balancer-v2.ts +42 -25
- package/src/dex/camelot/camelot.ts +29 -10
- package/src/dex/curve-v1/curve-v1.ts +11 -11
- package/src/dex/curve-v1/pools/curve-metapool.ts +23 -7
- package/src/dex/curve-v1/pools/curve-pool.ts +29 -8
- package/src/dex/curve-v1/pools/getstate-multicall.ts +83 -56
- package/src/dex/curve-v1-factory/curve-v1-factory.ts +4 -4
- package/src/dex/curve-v1-factory/curve-v1-pool-manager.ts +1 -1
- package/src/dex/curve-v1-factory/state-polling-pools/custom-pool-polling.ts +1 -1
- package/src/dex/curve-v1-factory/state-polling-pools/factory-pool-polling.ts +1 -1
- package/src/dex/curve-v1-factory/state-polling-pools/polling-manager.ts +5 -16
- package/src/dex/curve-v1-factory/state-polling-pools/pool-polling-base.ts +1 -1
- package/src/dex/curve-v1-factory/types.ts +1 -1
- package/src/dex/generic-rfq/generic-rfq.ts +3 -1
- package/src/dex/generic-rfq/utils.ts +1 -1
- package/src/dex/gmx/gmx.ts +1 -1
- package/src/dex/gmx/pool.ts +9 -4
- package/src/dex/idex.ts +1 -1
- package/src/dex/jarvis-v6/jarvis-v6-events.ts +17 -6
- package/src/dex/jarvis-v6/jarvis-v6.ts +17 -15
- package/src/dex/jarvis-v6/utils.ts +21 -9
- package/src/dex/kyberdmm/kyberdmm.ts +4 -1
- package/src/dex/kyberdmm/pool.ts +32 -24
- package/src/dex/maker-psm/maker-psm.ts +69 -47
- package/src/dex/maverick-v1/maverick-v1-pool.ts +50 -38
- package/src/dex/maverick-v1/maverick-v1.ts +12 -8
- package/src/dex/nerve/nerve-pool.ts +42 -30
- package/src/dex/nerve/nerve.ts +9 -5
- package/src/dex/platypus/platypus.ts +11 -7
- package/src/dex/swaap-v1/config.ts +1 -1
- package/src/dex/swaap-v1/swaap-v1-pool.ts +23 -14
- package/src/dex/swaap-v1/swaap-v1.ts +21 -14
- package/src/dex/synthetix/synthetix-state.ts +3 -3
- package/src/dex/synthetix/synthetix.ts +5 -4
- package/src/dex/uniswap-v2/uniswap-v2.ts +27 -13
- package/src/dex/uniswap-v3/uniswap-v3-pool.ts +43 -39
- package/src/dex/uniswap-v3/uniswap-v3.ts +5 -4
- package/src/dex/woo-fi-v2/woo-fi-v2.ts +3 -1
- package/src/implementations/local-paraswap-sdk.ts +1 -2
- package/src/lib/generics-events-subscribers/erc20-event-subscriber.ts +29 -18
- package/src/lib/multi-wrapper.ts +41 -2
- package/src/lib/tokens/balancer-fetcher.ts +23 -19
- package/src/pricing-helper.ts +5 -2
- package/src/stateful-event-subscriber.ts +35 -28
- package/src/utils.ts +3 -4
- package/tests/utils.test.ts +44 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"woo-fi-v2.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/woo-fi-v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"woo-fi-v2.js","sourceRoot":"","sources":["../../../src/dex/woo-fi-v2/woo-fi-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,8 +50,7 @@ class LocalParaswapSDK {
|
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
async initializePricing() {
|
|
53
|
-
|
|
54
|
-
await this.pricingHelper.initialize(blockNumber, [this.dexKey]);
|
|
53
|
+
await this.pricingHelper.initialize('latest', [this.dexKey]);
|
|
55
54
|
}
|
|
56
55
|
async releaseResources() {
|
|
57
56
|
await this.pricingHelper.releaseResources([this.dexKey]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-paraswap-sdk.js","sourceRoot":"","sources":["../../src/implementations/local-paraswap-sdk.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA4B;AAC5B,8CAIuB;AACvB,gEAAqC;AACrC,gEAA4D;AAC5D,sDAAkD;AAClD,gCAA2C;AAQ3C,4CAAsE;AACtE,sEAAiE;AA4BjE,MAAM,MAAM,GAAG,EAAE,CAAC;AAElB,MAAa,gBAAgB;IAM3B,YACY,OAAe,EACf,MAAc,EACxB,MAAc,EACd,kBAA4C;QAHlC,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAQ;QAIxB,IAAI,CAAC,SAAS,GAAG,IAAI,2BAAc,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAC1D,IAAI,CAAC,iBAAiB,GAAG,IAAI,uBAAiB,CAC5C,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,OAAO,CACb,CAAC;QACF,IAAI,CAAC,aAAa,GAAG,IAAI,8BAAa,CACpC,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,SAAS,CAAC,SAAS,CACzB,CAAC;QACF,IAAI,CAAC,kBAAkB,GAAG,IAAI,wCAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAEzE,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACvD,IAAI,kBAAkB,IAAI,GAAG,YAAY,yCAAkB,EAAE;YAC3D,GAAG,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;SAC7C;IACH,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,
|
|
1
|
+
{"version":3,"file":"local-paraswap-sdk.js","sourceRoot":"","sources":["../../src/implementations/local-paraswap-sdk.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { LogDescription } from '@ethersproject/abi';
|
|
2
2
|
import { DeepReadonly } from 'ts-essentials';
|
|
3
3
|
import { IDexHelper } from '../../dex-helper';
|
|
4
|
-
import { StatefulEventSubscriber } from '../../stateful-event-subscriber';
|
|
4
|
+
import { StatefulEventSubscriber, StateWithBlock } from '../../stateful-event-subscriber';
|
|
5
5
|
import { Log, BlockHeader, Address } from '../../types';
|
|
6
6
|
import { ERC20StateMap } from './types';
|
|
7
7
|
export declare class ERC20EventSubscriber extends StatefulEventSubscriber<ERC20StateMap> {
|
|
@@ -17,6 +17,6 @@ export declare class ERC20EventSubscriber extends StatefulEventSubscriber<ERC20S
|
|
|
17
17
|
protected processLog(state: DeepReadonly<ERC20StateMap>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): DeepReadonly<ERC20StateMap> | null;
|
|
18
18
|
private getBalanceRPC;
|
|
19
19
|
subscribeToWalletBalanceChange(wallet: Address, blockNumber: number): Promise<void>;
|
|
20
|
-
generateState(blockNumber: number): Promise<
|
|
20
|
+
generateState(blockNumber: number | 'latest'): Promise<StateWithBlock<ERC20StateMap>>;
|
|
21
21
|
getBalance(wallet: Address, blockNumber: number): Promise<bigint>;
|
|
22
22
|
}
|
|
@@ -57,10 +57,12 @@ class ERC20EventSubscriber extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
57
57
|
}
|
|
58
58
|
async processBlockLogs(state, logs, blockHeader) {
|
|
59
59
|
const _state = lodash_1.default.cloneDeep(state);
|
|
60
|
-
|
|
60
|
+
const newState = await super.processBlockLogs(_state, logs, blockHeader);
|
|
61
61
|
if (!newState) {
|
|
62
62
|
this.logger.warn('received empty state generate new one');
|
|
63
|
-
|
|
63
|
+
const newStateWithBn = await this.generateState('latest');
|
|
64
|
+
this.setState(newStateWithBn.state, newStateWithBn.blockNumber);
|
|
65
|
+
return newStateWithBn.state;
|
|
64
66
|
}
|
|
65
67
|
return newState;
|
|
66
68
|
}
|
|
@@ -90,7 +92,7 @@ class ERC20EventSubscriber extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
90
92
|
],
|
|
91
93
|
},
|
|
92
94
|
], blockNumber);
|
|
93
|
-
return balances[0];
|
|
95
|
+
return balances.balances[0];
|
|
94
96
|
}
|
|
95
97
|
async subscribeToWalletBalanceChange(wallet, blockNumber) {
|
|
96
98
|
if (this.walletAddresses.has(wallet)) {
|
|
@@ -123,14 +125,17 @@ class ERC20EventSubscriber extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
123
125
|
});
|
|
124
126
|
return acc;
|
|
125
127
|
}, []);
|
|
126
|
-
const
|
|
127
|
-
return
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
128
|
+
const balancesAndBn = await (0, balancer_fetcher_1.getBalances)(this.dexHelper.multiWrapper, request, blockNumber);
|
|
129
|
+
return {
|
|
130
|
+
blockNumber: balancesAndBn.blockNumber,
|
|
131
|
+
state: balancesAndBn.balances.reduce((acc, balance) => {
|
|
132
|
+
acc[balance.owner] = {
|
|
133
|
+
balance: balance.amounts[types_1.DEFAULT_ID_ERC20_AS_STRING],
|
|
134
|
+
};
|
|
135
|
+
this.dexHelper.cache.hset(this.mapKey, balance.owner, balance.amounts[types_1.DEFAULT_ID_ERC20_AS_STRING].toString());
|
|
136
|
+
return acc;
|
|
137
|
+
}, {}),
|
|
138
|
+
};
|
|
134
139
|
}
|
|
135
140
|
async getBalance(wallet, blockNumber) {
|
|
136
141
|
if (this.dexHelper.config.isSlave) {
|
|
@@ -151,7 +156,7 @@ class ERC20EventSubscriber extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
151
156
|
if (!(wallet in state)) {
|
|
152
157
|
this.logger.warn(`Missing wallet ${wallet} for ${this.token} falling back to rpc`);
|
|
153
158
|
const balance = await this.getBalanceRPC(wallet, blockNumber);
|
|
154
|
-
// this is ok because
|
|
159
|
+
// this is not ok because blockNumber might differ from subscriber blockNumber
|
|
155
160
|
state[wallet] = {
|
|
156
161
|
balance: balance.amounts[types_1.DEFAULT_ID_ERC20_AS_STRING],
|
|
157
162
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"erc20-event-subscriber.js","sourceRoot":"","sources":["../../../src/lib/generics-events-subscribers/erc20-event-subscriber.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAIvB,+
|
|
1
|
+
{"version":3,"file":"erc20-event-subscriber.js","sourceRoot":"","sources":["../../../src/lib/generics-events-subscribers/erc20-event-subscriber.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,5 +17,9 @@ export declare class MultiWrapper {
|
|
|
17
17
|
readonly defaultBatchSize: number;
|
|
18
18
|
constructor(multi: Contract, logger: Logger);
|
|
19
19
|
aggregate<T>(calls: MultiCallParams<T>[], blockNumber?: number | string, batchSize?: number): Promise<T[]>;
|
|
20
|
-
tryAggregate<T>(mandatory: boolean, calls: MultiCallParams<T>[], blockNumber?: number |
|
|
20
|
+
tryAggregate<T>(mandatory: boolean, calls: MultiCallParams<T>[], blockNumber?: number | 'latest', batchSize?: number, reportFails?: boolean): Promise<MultiResult<T>[]>;
|
|
21
|
+
blockTryAggregateWithoutBatching<T>(mandatory: boolean, calls: MultiCallParams<T>[], requestedBlockNumber?: number | 'latest', reportFails?: boolean): Promise<{
|
|
22
|
+
blockNumber: number;
|
|
23
|
+
results: MultiResult<T>[];
|
|
24
|
+
}>;
|
|
21
25
|
}
|
|
@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.MultiWrapper = void 0;
|
|
7
7
|
const lodash_1 = __importDefault(require("lodash"));
|
|
8
|
+
const decoders_1 = require("./decoders");
|
|
8
9
|
class MultiWrapper {
|
|
9
10
|
/* eslint-disable-next-line */
|
|
10
11
|
constructor(multi, logger) {
|
|
@@ -28,7 +29,8 @@ class MultiWrapper {
|
|
|
28
29
|
}
|
|
29
30
|
return results;
|
|
30
31
|
}
|
|
31
|
-
async tryAggregate(mandatory, calls, blockNumber, batchSize = this.defaultBatchSize, reportFails = true) {
|
|
32
|
+
async tryAggregate(mandatory, calls, blockNumber = 'latest', batchSize = this.defaultBatchSize, reportFails = true) {
|
|
33
|
+
const _blockNumber = blockNumber === undefined ? 'latest' : blockNumber;
|
|
32
34
|
const allCalls = new Array(Math.ceil(calls.length / batchSize));
|
|
33
35
|
for (let i = 0; i < calls.length; i += batchSize) {
|
|
34
36
|
const batch = calls.slice(i, i + batchSize);
|
|
@@ -36,7 +38,7 @@ class MultiWrapper {
|
|
|
36
38
|
}
|
|
37
39
|
const aggregatedResult = await Promise.all(allCalls.map(batch => this.multi.methods
|
|
38
40
|
.tryAggregate(mandatory, batch)
|
|
39
|
-
.call(undefined,
|
|
41
|
+
.call(undefined, _blockNumber)));
|
|
40
42
|
let globalInd = 0;
|
|
41
43
|
const resultsUndecoded = new Array(calls.length);
|
|
42
44
|
for (const res of aggregatedResult) {
|
|
@@ -63,6 +65,23 @@ class MultiWrapper {
|
|
|
63
65
|
}
|
|
64
66
|
return results;
|
|
65
67
|
}
|
|
68
|
+
// I removed here batching because it may give inconsistent blockNumber
|
|
69
|
+
// If we see that is a problem, we can add later
|
|
70
|
+
async blockTryAggregateWithoutBatching(mandatory, calls, requestedBlockNumber = 'latest', reportFails = true) {
|
|
71
|
+
const blockNumberCall = {
|
|
72
|
+
target: this.multi.options.address,
|
|
73
|
+
callData: this.multi.methods.getBlockNumber().encodeABI(),
|
|
74
|
+
decodeFunction: decoders_1.uint256DecodeToNumber,
|
|
75
|
+
};
|
|
76
|
+
const callsWithBlockNumber = [...calls, blockNumberCall];
|
|
77
|
+
const results = await this.tryAggregate(mandatory, callsWithBlockNumber, requestedBlockNumber, callsWithBlockNumber.length, reportFails);
|
|
78
|
+
// We guaranteed previously that at least one call is contained
|
|
79
|
+
const blockNumber = results.pop().returnData;
|
|
80
|
+
return {
|
|
81
|
+
blockNumber,
|
|
82
|
+
results: results,
|
|
83
|
+
};
|
|
84
|
+
}
|
|
66
85
|
}
|
|
67
86
|
exports.MultiWrapper = MultiWrapper;
|
|
68
87
|
//# sourceMappingURL=multi-wrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-wrapper.js","sourceRoot":"","sources":["../../src/lib/multi-wrapper.ts"],"names":[],"mappings":";;;;;;AACA,oDAAuB;
|
|
1
|
+
{"version":3,"file":"multi-wrapper.js","sourceRoot":"","sources":["../../src/lib/multi-wrapper.ts"],"names":[],"mappings":";;;;;;AACA,oDAAuB;AAGvB,yCAAmD;AAcnD,MAAa,YAAY;IAGvB,8BAA8B;IAC9B,YAAoB,KAAe,EAAU,MAAc;QAAvC,UAAK,GAAL,KAAK,CAAU;QAAU,WAAM,GAAN,MAAM,CAAQ;QACzD,IAAI,CAAC,gBAAgB,GAAG,GAAG,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,SAAS,CACb,KAA2B,EAC3B,WAA6B,EAC7B,YAAoB,IAAI,CAAC,gBAAgB;QAEzC,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,gBAAC,CAAC,KAAK,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,GAAG,CAAC,KAAK,EAAC,KAAK,EAAC,EAAE,CAC1C,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CACjE,CACF,CAAC;QAEF,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,MAAM,gBAAgB,GAAa,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3D,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE;YAClC,KAAK,MAAM,OAAO,IAAI,GAAG,CAAC,UAAU,EAAE;gBACpC,gBAAgB,CAAC,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC;aACzC;SACF;QAED,MAAM,OAAO,GAAQ,IAAI,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACxD,KAAK,MAAM,CAAC,CAAC,EAAE,gBAAgB,CAAC,IAAI,gBAAgB,CAAC,OAAO,EAAE,EAAE;YAC9D,OAAO,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC;YACvD,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;SAC3B;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,SAAkB,EAClB,KAA2B,EAC3B,cAAiC,QAAQ,EACzC,YAAoB,IAAI,CAAC,gBAAgB,EACzC,cAAuB,IAAI;QAE3B,MAAM,YAAY,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC;QAExE,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;QAChE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,SAAS,EAAE;YAChD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC;YAC5C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC;SAC7C;QAED,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CACnB,IAAI,CAAC,KAAK,CAAC,OAAO;aACf,YAAY,CAAC,SAAS,EAAE,KAAK,CAAC;aAC9B,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,CACjC,CACF,CAAC;QAEF,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,MAAM,gBAAgB,GAA0B,IAAI,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACxE,KAAK,MAAM,GAAG,IAAI,gBAAgB,EAAE;YAClC,KAAK,MAAM,OAAO,IAAI,GAAG,EAAE;gBACzB,gBAAgB,CAAC,SAAS,EAAE,CAAC,GAAG,OAAO,CAAC;aACzC;SACF;QAED,MAAM,OAAO,GAAqB,IAAI,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACrE,KAAK,MAAM,CAAC,CAAC,EAAE,gBAAgB,CAAC,IAAI,gBAAgB,CAAC,OAAO,EAAE,EAAE;YAC9D,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;gBAC7B,IAAI,WAAW,EAAE;oBACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,4BAA4B,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,SAAS,CAC9D,CAAC;iBACH;gBAED,OAAO,CAAC,CAAC,CAAC,GAAG;oBACX,OAAO,EAAE,KAAK;iBACG,CAAC;gBACpB,SAAS;aACV;YAED,OAAO,CAAC,CAAC,CAAC,GAAG;gBACX,OAAO,EAAE,IAAI;gBACb,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC;aAC/C,CAAC;YAEpB,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;SACtC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,uEAAuE;IACvE,gDAAgD;IAChD,KAAK,CAAC,gCAAgC,CACpC,SAAkB,EAClB,KAA2B,EAC3B,uBAA0C,QAAQ,EAClD,cAAuB,IAAI;QAE3B,MAAM,eAAe,GAA4B;YAC/C,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO;YAClC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC,SAAS,EAAY;YACnE,cAAc,EAAE,gCAAqB;SACtC,CAAC;QAEF,MAAM,oBAAoB,GAGtB,CAAC,GAAG,KAAK,EAAE,eAAe,CAAC,CAAC;QAEhC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CACrC,SAAS,EACT,oBAAqD,EACrD,oBAAoB,EACpB,oBAAoB,CAAC,MAAM,EAC3B,WAAW,CACZ,CAAC;QAEF,+DAA+D;QAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAG,CAAC,UAAoB,CAAC;QAExD,OAAO;YACL,WAAW;YACX,OAAO,EAAE,OAA2B;SACrC,CAAC;IACJ,CAAC;CACF;AAhID,oCAgIC"}
|
|
@@ -19,5 +19,9 @@ declare type MultiCallResultDecodeInfo = {
|
|
|
19
19
|
export declare const getBalanceCallParams: (req: BalanceRequest) => MultiCallParams<MultiCallParamsType>[];
|
|
20
20
|
export declare const getAllowanceCallParams: (req: BalanceRequest) => MultiCallResultDecodeInfo;
|
|
21
21
|
export declare const decodeBalanceAndAllowanceMultiResult: (req: BalanceRequest, spenders: Set<string>, results: MultiResult<MultiCallParamsType>[]) => UserBalance;
|
|
22
|
-
|
|
22
|
+
declare type getBalancesResult = {
|
|
23
|
+
blockNumber: number;
|
|
24
|
+
balances: UserBalance[];
|
|
25
|
+
};
|
|
26
|
+
export declare const getBalances: (multiv2: MultiWrapper, reqs: BalanceRequest[], blockNumber?: number | 'latest') => Promise<getBalancesResult>;
|
|
23
27
|
export {};
|
|
@@ -95,11 +95,6 @@ const getAllowanceCallParams = (req) => {
|
|
|
95
95
|
}
|
|
96
96
|
default:
|
|
97
97
|
throw new Error(`missing case for assetType ${req.assetType}`);
|
|
98
|
-
return {
|
|
99
|
-
calls: [],
|
|
100
|
-
spenders: new Set(),
|
|
101
|
-
length: 0,
|
|
102
|
-
};
|
|
103
98
|
}
|
|
104
99
|
};
|
|
105
100
|
exports.getAllowanceCallParams = getAllowanceCallParams;
|
|
@@ -206,17 +201,20 @@ const getBalances = async (multiv2, reqs, blockNumber = 'latest') => {
|
|
|
206
201
|
params.length += balancesCalls.length;
|
|
207
202
|
decodingInfo.push(params);
|
|
208
203
|
}
|
|
209
|
-
const
|
|
204
|
+
const resultsAndBn = await multiv2.blockTryAggregateWithoutBatching(false, calls, blockNumber);
|
|
210
205
|
const chunks = [];
|
|
211
206
|
let j = 0;
|
|
212
|
-
for (let i = 0; i < results.length;) {
|
|
207
|
+
for (let i = 0; i < resultsAndBn.results.length;) {
|
|
213
208
|
const batchSize = decodingInfo[j].length;
|
|
214
|
-
const chunk = results.slice(i, i + batchSize);
|
|
209
|
+
const chunk = resultsAndBn.results.slice(i, i + batchSize);
|
|
215
210
|
chunks.push(chunk);
|
|
216
211
|
j++;
|
|
217
212
|
i += batchSize;
|
|
218
213
|
}
|
|
219
|
-
return
|
|
214
|
+
return {
|
|
215
|
+
blockNumber: resultsAndBn.blockNumber,
|
|
216
|
+
balances: chunks.map((chunk, index) => (0, exports.decodeBalanceAndAllowanceMultiResult)(reqs[index], decodingInfo[index].spenders, chunk)),
|
|
217
|
+
};
|
|
220
218
|
};
|
|
221
219
|
exports.getBalances = getBalances;
|
|
222
220
|
//# sourceMappingURL=balancer-fetcher.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balancer-fetcher.js","sourceRoot":"","sources":["../../../src/lib/tokens/balancer-fetcher.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"balancer-fetcher.js","sourceRoot":"","sources":["../../../src/lib/tokens/balancer-fetcher.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ export declare class PricingHelper {
|
|
|
10
10
|
private initializeDex;
|
|
11
11
|
getAllDexKeys(): string[];
|
|
12
12
|
getDexByKey(key: string): IDex<any, any, any> | null;
|
|
13
|
-
initialize(blockNumber: number, dexKeys: string[]): Promise<void[]>;
|
|
13
|
+
initialize(blockNumber: number | 'latest', dexKeys: string[]): Promise<void[]>;
|
|
14
14
|
releaseResources(dexKeys: string[]): Promise<void[]>;
|
|
15
15
|
private releaseDexResources;
|
|
16
16
|
getPoolIdentifiers(from: Token, to: Token, side: SwapSide, blockNumber: number, dexKeys: string[], filterConstantPricePool?: boolean): Promise<{
|
package/build/pricing-helper.js
CHANGED
|
@@ -9,7 +9,7 @@ class PricingHelper {
|
|
|
9
9
|
this.logger = loggerConstructor(`PricingHelper_${dexAdapterService.network}`);
|
|
10
10
|
this.optimizeRate = (ur) => this.dexAdapterService.routeOptimizers.reduce((acc, fn) => fn(acc), ur);
|
|
11
11
|
}
|
|
12
|
-
async initializeDex(dexKey, blockNumber) {
|
|
12
|
+
async initializeDex(dexKey, blockNumber = 'latest') {
|
|
13
13
|
try {
|
|
14
14
|
const dexInstance = this.dexAdapterService.getDexByKey(dexKey);
|
|
15
15
|
if (!dexInstance.initializePricing)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pricing-helper.js","sourceRoot":"","sources":["../src/pricing-helper.ts"],"names":[],"mappings":";;;AAUA,2CAKqB;AAGrB,mCAA6D;AAE7D,MAAa,aAAa;IAIxB,YACY,iBAAoC,EAC9C,iBAAoC;QAD1B,sBAAiB,GAAjB,iBAAiB,CAAmB;QAG9C,IAAI,CAAC,MAAM,GAAG,iBAAiB,CAC7B,iBAAiB,iBAAiB,CAAC,OAAO,EAAE,CAC7C,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,CAAC,EAAmB,EAAE,EAAE,CAC1C,IAAI,CAAC,iBAAiB,CAAC,eAAe,CAAC,MAAM,CAC3C,CAAC,GAAoB,EAAE,EAAoC,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EACvE,EAAE,CACH,CAAC;IACN,CAAC;IAEO,KAAK,CAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"pricing-helper.js","sourceRoot":"","sources":["../src/pricing-helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,12 @@ import { Log, Logger } from './types';
|
|
|
3
3
|
import { BlockHeader } from 'web3-eth';
|
|
4
4
|
import { EventSubscriber } from './dex-helper/iblock-manager';
|
|
5
5
|
import { IDexHelper } from './dex-helper';
|
|
6
|
+
export declare type StateWithBlock<State> = {
|
|
7
|
+
state: DeepReadonly<State>;
|
|
8
|
+
blockNumber: number;
|
|
9
|
+
};
|
|
6
10
|
export declare type InitializeStateOptions<State> = {
|
|
7
|
-
|
|
11
|
+
stateWithBn?: StateWithBlock<State>;
|
|
8
12
|
initCallback?: (state: DeepReadonly<State>) => void;
|
|
9
13
|
};
|
|
10
14
|
export declare abstract class StatefulEventSubscriber<State> implements EventSubscriber {
|
|
@@ -28,10 +32,10 @@ export declare abstract class StatefulEventSubscriber<State> implements EventSub
|
|
|
28
32
|
private _lastPublishedTimeMs;
|
|
29
33
|
constructor(parentName: string, _name: string, dexHelper: IDexHelper, logger: Logger, masterPoolNeeded?: boolean, mapKey?: string);
|
|
30
34
|
getStateBlockNumber(): Readonly<number>;
|
|
31
|
-
initialize(blockNumber: number, options?: InitializeStateOptions<State>): Promise<void>;
|
|
35
|
+
initialize(blockNumber: number | 'latest', options?: InitializeStateOptions<State>): Promise<void>;
|
|
32
36
|
protected abstract processLog(state: DeepReadonly<State>, log: Readonly<Log>, blockHeader: Readonly<BlockHeader>): AsyncOrSync<DeepReadonly<State> | null>;
|
|
33
37
|
protected processBlockLogs(state: DeepReadonly<State>, logs: Readonly<Log>[], blockHeader: Readonly<BlockHeader>): Promise<DeepReadonly<State> | null>;
|
|
34
|
-
abstract generateState(blockNumber?: number | 'latest'): AsyncOrSync<
|
|
38
|
+
abstract generateState(blockNumber?: number | 'latest'): AsyncOrSync<StateWithBlock<State>>;
|
|
35
39
|
restart(blockNumber: number): void;
|
|
36
40
|
update(logs: Readonly<Log>[], blockHeaders: Readonly<{
|
|
37
41
|
[blockNumber: number]: Readonly<BlockHeader>;
|
|
@@ -47,8 +47,9 @@ class StatefulEventSubscriber {
|
|
|
47
47
|
// instance subscribed to a pool from dex this.parentName and name this.name.
|
|
48
48
|
async initialize(blockNumber, options) {
|
|
49
49
|
let masterBn = undefined;
|
|
50
|
-
if (options && options.
|
|
51
|
-
this.setState(options.state, blockNumber);
|
|
50
|
+
if (options && options.stateWithBn) {
|
|
51
|
+
this.setState(options.stateWithBn.state, options.stateWithBn.blockNumber);
|
|
52
|
+
masterBn = options.stateWithBn.blockNumber;
|
|
52
53
|
}
|
|
53
54
|
else {
|
|
54
55
|
if (this.dexHelper.config.isSlave && this.masterPoolNeeded) {
|
|
@@ -58,29 +59,31 @@ class StatefulEventSubscriber {
|
|
|
58
59
|
const state = utils_1.Utils.Parse(stateAsString);
|
|
59
60
|
if (state.state === null) {
|
|
60
61
|
this.logger.warn(`${this.parentName}: ${this.name}: found null state in cache generate new one`);
|
|
61
|
-
|
|
62
|
+
const stateAndBn = await this.generateState(blockNumber);
|
|
63
|
+
state.state = stateAndBn.state;
|
|
64
|
+
state.bn = stateAndBn.blockNumber;
|
|
65
|
+
masterBn = state.bn;
|
|
66
|
+
this.setState(state.state, state.bn);
|
|
62
67
|
}
|
|
63
68
|
else {
|
|
64
|
-
this.logger.
|
|
65
|
-
blockNumber = state.bn;
|
|
69
|
+
this.logger.trace(`${this.parentName}: ${this.name}: found state from cache`);
|
|
66
70
|
const _masterBn = await this.dexHelper.cache.rawget(this.dexHelper.config.masterBlockNumberCacheKey);
|
|
67
71
|
if (_masterBn) {
|
|
68
72
|
masterBn = parseInt(_masterBn, 10);
|
|
69
|
-
this.logger.
|
|
73
|
+
this.logger.trace(`${this.dexHelper.config.data.network} found master blockNumber ${masterBn}`);
|
|
74
|
+
this.setState(state.state, state.bn);
|
|
70
75
|
}
|
|
71
76
|
else {
|
|
72
|
-
|
|
77
|
+
throw new Error(`${this.dexHelper.config.data.network} did not found blockNumber in cache`);
|
|
73
78
|
}
|
|
74
79
|
}
|
|
75
|
-
// set state and the according blockNumber. state.bn can be smaller, greater or equal
|
|
76
|
-
// to blockNumber
|
|
77
|
-
this.setState(state.state, blockNumber);
|
|
78
80
|
}
|
|
79
81
|
else {
|
|
80
82
|
// if no state found in cache generate new state using rpc
|
|
81
83
|
this.logger.info(`${this.parentName}: ${this.name}: did not found state on cache generating new one`);
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
+
const stateAndBn = await this.generateState(blockNumber);
|
|
85
|
+
masterBn = stateAndBn.blockNumber;
|
|
86
|
+
this.setState(stateAndBn.state, stateAndBn.blockNumber);
|
|
84
87
|
// we should publish only if generateState succeeded
|
|
85
88
|
this.dexHelper.cache.publish('new_pools', this.cacheName);
|
|
86
89
|
}
|
|
@@ -88,8 +91,9 @@ class StatefulEventSubscriber {
|
|
|
88
91
|
else {
|
|
89
92
|
// if you are not a slave instance always generate new state
|
|
90
93
|
this.logger.info(`${this.parentName}: ${this.name}: cache generating state`);
|
|
91
|
-
const
|
|
92
|
-
|
|
94
|
+
const stateAndBn = await this.generateState(blockNumber);
|
|
95
|
+
masterBn = stateAndBn.blockNumber;
|
|
96
|
+
this.setState(stateAndBn.state, stateAndBn.blockNumber);
|
|
93
97
|
}
|
|
94
98
|
}
|
|
95
99
|
// apply a callback on the state
|
|
@@ -99,7 +103,7 @@ class StatefulEventSubscriber {
|
|
|
99
103
|
}
|
|
100
104
|
}
|
|
101
105
|
// always subscribeToLogs
|
|
102
|
-
this.dexHelper.blockManager.subscribeToLogs(this, this.addressesSubscribed, masterBn
|
|
106
|
+
this.dexHelper.blockManager.subscribeToLogs(this, this.addressesSubscribed, masterBn);
|
|
103
107
|
this.isInitialized = true;
|
|
104
108
|
}
|
|
105
109
|
//This function processes all logs for a single block (the block number is
|
|
@@ -158,8 +162,8 @@ class StatefulEventSubscriber {
|
|
|
158
162
|
++indexBlockEnd;
|
|
159
163
|
}
|
|
160
164
|
if (!this.state) {
|
|
161
|
-
const
|
|
162
|
-
this.setState(
|
|
165
|
+
const freshStateAndBn = await this.generateState('latest');
|
|
166
|
+
this.setState(freshStateAndBn.state, freshStateAndBn.blockNumber);
|
|
163
167
|
}
|
|
164
168
|
//Find the last state before the blockNumber of the logs
|
|
165
169
|
let stateBeforeLog;
|
|
@@ -187,15 +191,14 @@ class StatefulEventSubscriber {
|
|
|
187
191
|
if (this.state !== null) {
|
|
188
192
|
return true;
|
|
189
193
|
}
|
|
190
|
-
|
|
191
|
-
this.logger.warn(`${network}: ${this.parentName}: ${this.name}: master generate (latest: ${latestBlockNumber}) new state because state is null`);
|
|
194
|
+
this.logger.warn(`${network}: ${this.parentName}: ${this.name}: master generate (latest) new state because state is null`);
|
|
192
195
|
try {
|
|
193
|
-
const
|
|
194
|
-
this.setState(state,
|
|
196
|
+
const stateAndBn = await this.generateState('latest');
|
|
197
|
+
this.setState(stateAndBn.state, stateAndBn.blockNumber);
|
|
195
198
|
return true;
|
|
196
199
|
}
|
|
197
200
|
catch (e) {
|
|
198
|
-
this.logger.error(`${network}: ${this.parentName} ${this.name}: (
|
|
201
|
+
this.logger.error(`${network}: ${this.parentName} ${this.name}: (latest) failed fetch state:`, e);
|
|
199
202
|
}
|
|
200
203
|
return false;
|
|
201
204
|
};
|