@velocity-exchange/sdk 0.1.0 → 0.2.1
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/CHANGELOG.md +4 -32
- package/lib/browser/accounts/basicUserAccountSubscriber.d.ts +5 -3
- package/lib/browser/accounts/basicUserAccountSubscriber.js +4 -3
- package/lib/browser/accounts/basicUserStatsAccountSubscriber.d.ts +5 -3
- package/lib/browser/accounts/basicUserStatsAccountSubscriber.js +4 -3
- package/lib/browser/accounts/bulkAccountLoader.d.ts +5 -5
- package/lib/browser/accounts/bulkAccountLoader.js +12 -1
- package/lib/browser/accounts/grpcAccountSubscriber.d.ts +2 -1
- package/lib/browser/accounts/grpcAccountSubscriber.js +8 -2
- package/lib/browser/accounts/grpcMultiAccountSubscriber.d.ts +3 -2
- package/lib/browser/accounts/grpcMultiAccountSubscriber.js +13 -5
- package/lib/browser/accounts/grpcMultiUserAccountSubscriber.d.ts +2 -1
- package/lib/browser/accounts/grpcMultiUserAccountSubscriber.js +12 -8
- package/lib/browser/accounts/grpcProgramAccountSubscriber.d.ts +2 -1
- package/lib/browser/accounts/grpcProgramAccountSubscriber.js +8 -2
- package/lib/browser/accounts/grpcVelocityClientAccountSubscriber.js +18 -3
- package/lib/browser/accounts/grpcVelocityClientAccountSubscriberV2.d.ts +1 -1
- package/lib/browser/accounts/grpcVelocityClientAccountSubscriberV2.js +40 -17
- package/lib/browser/accounts/laserProgramAccountSubscriber.js +3 -0
- package/lib/browser/accounts/oneShotUserAccountSubscriber.js +4 -3
- package/lib/browser/accounts/oneShotUserStatsAccountSubscriber.js +7 -3
- package/lib/browser/accounts/pollingInsuranceFundStakeAccountSubscriber.d.ts +4 -2
- package/lib/browser/accounts/pollingInsuranceFundStakeAccountSubscriber.js +3 -3
- package/lib/browser/accounts/pollingOracleAccountSubscriber.d.ts +0 -2
- package/lib/browser/accounts/pollingOracleAccountSubscriber.js +16 -5
- package/lib/browser/accounts/pollingTokenAccountSubscriber.d.ts +0 -2
- package/lib/browser/accounts/pollingTokenAccountSubscriber.js +16 -5
- package/lib/browser/accounts/pollingUserAccountSubscriber.d.ts +8 -4
- package/lib/browser/accounts/pollingUserAccountSubscriber.js +17 -11
- package/lib/browser/accounts/pollingUserStatsAccountSubscriber.d.ts +4 -2
- package/lib/browser/accounts/pollingUserStatsAccountSubscriber.js +6 -6
- package/lib/browser/accounts/pollingVelocityClientAccountSubscriber.d.ts +7 -1
- package/lib/browser/accounts/pollingVelocityClientAccountSubscriber.js +64 -28
- package/lib/browser/accounts/types.d.ts +4 -4
- package/lib/browser/accounts/utils.d.ts +1 -0
- package/lib/browser/accounts/utils.js +8 -1
- package/lib/browser/accounts/webSocketAccountSubscriber.d.ts +4 -2
- package/lib/browser/accounts/webSocketAccountSubscriber.js +17 -5
- package/lib/browser/accounts/webSocketAccountSubscriberV2.d.ts +4 -2
- package/lib/browser/accounts/webSocketAccountSubscriberV2.js +17 -6
- package/lib/browser/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts +4 -2
- package/lib/browser/accounts/webSocketInsuranceFundStakeAccountSubscriber.js +9 -0
- package/lib/browser/accounts/webSocketProgramAccountSubscriber.d.ts +3 -1
- package/lib/browser/accounts/webSocketProgramAccountSubscriber.js +14 -3
- package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.d.ts +3 -1
- package/lib/browser/accounts/webSocketProgramAccountSubscriberV2.js +15 -3
- package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.d.ts +3 -1
- package/lib/browser/accounts/webSocketProgramAccountsSubscriberV2.js +14 -4
- package/lib/browser/accounts/webSocketUserAccountSubscriber.d.ts +4 -2
- package/lib/browser/accounts/webSocketUserAccountSubscriber.js +9 -0
- package/lib/browser/accounts/webSocketUserStatsAccountSubsriber.d.ts +4 -2
- package/lib/browser/accounts/webSocketUserStatsAccountSubsriber.js +9 -0
- package/lib/browser/accounts/webSocketVelocityClientAccountSubscriber.d.ts +4 -4
- package/lib/browser/accounts/webSocketVelocityClientAccountSubscriber.js +48 -20
- package/lib/browser/accounts/webSocketVelocityClientAccountSubscriberV2.d.ts +7 -3
- package/lib/browser/accounts/webSocketVelocityClientAccountSubscriberV2.js +45 -14
- package/lib/browser/accounts/websocketProgramUserAccountSubscriber.d.ts +1 -1
- package/lib/browser/accounts/websocketProgramUserAccountSubscriber.js +0 -3
- package/lib/browser/addresses/marketAddresses.js +3 -2
- package/lib/browser/addresses/pda.d.ts +0 -2
- package/lib/browser/addresses/pda.js +1 -14
- package/lib/browser/adminClient.d.ts +24 -29
- package/lib/browser/adminClient.js +156 -157
- package/lib/browser/auctionSubscriber/auctionSubscriber.d.ts +1 -1
- package/lib/browser/auctionSubscriber/auctionSubscriber.js +6 -4
- package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.d.ts +1 -1
- package/lib/browser/auctionSubscriber/auctionSubscriberGrpc.js +9 -4
- package/lib/browser/bankrun/bankrunConnection.d.ts +8 -5
- package/lib/browser/bankrun/bankrunConnection.js +92 -32
- package/lib/browser/blockhashSubscriber/BlockhashSubscriber.d.ts +1 -1
- package/lib/browser/blockhashSubscriber/BlockhashSubscriber.js +3 -2
- package/lib/browser/clock/clockSubscriber.d.ts +6 -6
- package/lib/browser/clock/clockSubscriber.js +4 -3
- package/lib/browser/config.d.ts +1 -1
- package/lib/browser/config.js +8 -4
- package/lib/browser/constants/index.d.ts +1 -2
- package/lib/browser/constants/index.js +1 -2
- package/lib/browser/constants/numericConstants.d.ts +1 -2
- package/lib/browser/constants/numericConstants.js +7 -5
- package/lib/browser/constants/spotMarkets.d.ts +0 -1
- package/lib/browser/constituentMap/constituentMap.js +5 -1
- package/lib/browser/constituentMap/pollingConstituentAccountSubscriber.js +3 -2
- package/lib/browser/constituentMap/webSocketConstituentAccountSubscriber.d.ts +2 -3
- package/lib/browser/constituentMap/webSocketConstituentAccountSubscriber.js +10 -3
- package/lib/browser/core/VelocityCore.d.ts +0 -1
- package/lib/browser/core/instructions/deposit.d.ts +0 -1
- package/lib/browser/core/instructions/perpOrders.d.ts +14 -0
- package/lib/browser/core/instructions/perpOrders.js +14 -0
- package/lib/browser/core/instructions/withdraw.d.ts +0 -1
- package/lib/browser/core/remainingAccounts.d.ts +2 -2
- package/lib/browser/core/remainingAccounts.js +2 -2
- package/lib/browser/decode/user.js +9 -1
- package/lib/browser/dlob/DLOB.d.ts +6 -2
- package/lib/browser/dlob/DLOB.js +201 -138
- package/lib/browser/dlob/DLOBNode.d.ts +5 -3
- package/lib/browser/dlob/DLOBNode.js +7 -0
- package/lib/browser/dlob/DLOBSubscriber.d.ts +0 -1
- package/lib/browser/dlob/DLOBSubscriber.js +37 -32
- package/lib/browser/dlob/NodeList.d.ts +0 -1
- package/lib/browser/dlob/NodeList.js +8 -7
- package/lib/browser/dlob/orderBookLevels.d.ts +0 -1
- package/lib/browser/dlob/orderBookLevels.js +19 -12
- package/lib/browser/events/eventList.d.ts +3 -3
- package/lib/browser/events/eventList.js +4 -1
- package/lib/browser/events/eventSubscriber.d.ts +5 -2
- package/lib/browser/events/eventSubscriber.js +75 -26
- package/lib/browser/events/eventsServerLogProvider.d.ts +2 -2
- package/lib/browser/events/eventsServerLogProvider.js +15 -8
- package/lib/browser/events/fetchLogs.d.ts +1 -1
- package/lib/browser/events/fetchLogs.js +4 -2
- package/lib/browser/events/pollingLogProvider.d.ts +2 -2
- package/lib/browser/events/pollingLogProvider.js +1 -0
- package/lib/browser/events/txEventCache.d.ts +3 -3
- package/lib/browser/events/txEventCache.js +6 -2
- package/lib/browser/events/types.d.ts +2 -4
- package/lib/browser/events/types.js +0 -2
- package/lib/browser/events/webSocketLogProvider.d.ts +2 -2
- package/lib/browser/events/webSocketLogProvider.js +5 -2
- package/lib/browser/factory/bigNum.d.ts +0 -1
- package/lib/browser/factory/bigNum.js +1 -1
- package/lib/browser/idl/velocity.d.ts +1243 -1586
- package/lib/browser/idl/velocity.json +1234 -1577
- package/lib/browser/index.d.ts +0 -2
- package/lib/browser/index.js +0 -2
- package/lib/browser/indicative-quotes/indicativeQuotesSender.d.ts +0 -1
- package/lib/browser/jupiter/jupiterClient.d.ts +1 -2
- package/lib/browser/jupiter/jupiterClient.js +18 -8
- package/lib/browser/marginCalculation.d.ts +0 -1
- package/lib/browser/marginCalculation.js +1 -0
- package/lib/browser/marinade/index.d.ts +2 -3
- package/lib/browser/marinade/index.js +5 -0
- package/lib/browser/math/amm.d.ts +31 -14
- package/lib/browser/math/amm.js +77 -22
- package/lib/browser/math/auction.d.ts +0 -1
- package/lib/browser/math/bankruptcy.js +1 -1
- package/lib/browser/math/conversion.d.ts +0 -1
- package/lib/browser/math/funding.d.ts +0 -1
- package/lib/browser/math/funding.js +6 -6
- package/lib/browser/math/insurance.d.ts +1 -2
- package/lib/browser/math/insurance.js +4 -5
- package/lib/browser/math/liquidation.d.ts +0 -1
- package/lib/browser/math/margin.d.ts +1 -10
- package/lib/browser/math/margin.js +3 -62
- package/lib/browser/math/market.d.ts +4 -13
- package/lib/browser/math/market.js +6 -40
- package/lib/browser/math/oracles.d.ts +0 -4
- package/lib/browser/math/oracles.js +1 -14
- package/lib/browser/math/orders.d.ts +0 -6
- package/lib/browser/math/orders.js +2 -74
- package/lib/browser/math/position.d.ts +1 -6
- package/lib/browser/math/position.js +5 -10
- package/lib/browser/math/repeg.d.ts +0 -2
- package/lib/browser/math/repeg.js +1 -23
- package/lib/browser/math/spotBalance.d.ts +4 -5
- package/lib/browser/math/spotBalance.js +6 -6
- package/lib/browser/math/spotMarket.d.ts +0 -7
- package/lib/browser/math/spotMarket.js +1 -16
- package/lib/browser/math/spotPosition.d.ts +4 -5
- package/lib/browser/math/state.d.ts +0 -3
- package/lib/browser/math/state.js +1 -9
- package/lib/browser/math/superStake.d.ts +3 -54
- package/lib/browser/math/superStake.js +16 -13
- package/lib/browser/math/trade.d.ts +2 -3
- package/lib/browser/math/trade.js +6 -6
- package/lib/browser/math/utils.d.ts +0 -1
- package/lib/browser/memcmp.d.ts +0 -1
- package/lib/browser/memcmp.js +1 -10
- package/lib/browser/oracles/oracleClientCache.d.ts +1 -1
- package/lib/browser/oracles/prelaunchOracleClient.js +3 -2
- package/lib/browser/oracles/pythClient.d.ts +0 -1
- package/lib/browser/oracles/pythClient.js +9 -3
- package/lib/browser/oracles/pythLazerClient.d.ts +0 -1
- package/lib/browser/oracles/pythLazerClient.js +3 -2
- package/lib/browser/oracles/strictOraclePrice.d.ts +0 -1
- package/lib/browser/oracles/types.d.ts +0 -1
- package/lib/browser/oracles/utils.d.ts +4 -1
- package/lib/browser/oracles/utils.js +9 -1
- package/lib/browser/orderParams.d.ts +0 -1
- package/lib/browser/orderSubscriber/OrderSubscriber.d.ts +1 -1
- package/lib/browser/orderSubscriber/OrderSubscriber.js +8 -2
- package/lib/browser/priorityFee/heliusPriorityFeeMethod.d.ts +1 -1
- package/lib/browser/priorityFee/priorityFeeSubscriber.d.ts +1 -1
- package/lib/browser/priorityFee/priorityFeeSubscriber.js +32 -8
- package/lib/browser/priorityFee/solanaPriorityFeeMethod.d.ts +1 -1
- package/lib/browser/pyth/types.d.ts +0 -1
- package/lib/browser/slot/SlotSubscriber.d.ts +1 -1
- package/lib/browser/slot/SlotSubscriber.js +2 -1
- package/lib/browser/slot/SlothashSubscriber.d.ts +3 -2
- package/lib/browser/slot/SlothashSubscriber.js +11 -4
- package/lib/browser/swap/UnifiedSwapClient.d.ts +0 -1
- package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.d.ts +0 -3
- package/lib/browser/swift/grpcSignedMsgUserAccountSubscriber.js +5 -5
- package/lib/browser/swift/signedMsgUserAccountSubscriber.d.ts +3 -2
- package/lib/browser/swift/signedMsgUserAccountSubscriber.js +13 -5
- package/lib/browser/swift/swiftOrderSubscriber.d.ts +1 -1
- package/lib/browser/swift/swiftOrderSubscriber.js +10 -5
- package/lib/browser/testClient.js +3 -2
- package/lib/browser/titan/titanClient.d.ts +0 -1
- package/lib/browser/tokenFaucet.d.ts +0 -1
- package/lib/browser/tokenFaucet.js +16 -2
- package/lib/browser/tx/baseTxSender.d.ts +4 -4
- package/lib/browser/tx/baseTxSender.js +5 -4
- package/lib/browser/tx/fastSingleTxSender.d.ts +3 -3
- package/lib/browser/tx/fastSingleTxSender.js +9 -5
- package/lib/browser/tx/reportTransactionError.d.ts +2 -2
- package/lib/browser/tx/reportTransactionError.js +5 -1
- package/lib/browser/tx/retryTxSender.d.ts +1 -1
- package/lib/browser/tx/retryTxSender.js +4 -2
- package/lib/browser/tx/txHandler.d.ts +9 -3
- package/lib/browser/tx/txHandler.js +54 -40
- package/lib/browser/tx/txParamProcessor.d.ts +4 -1
- package/lib/browser/tx/txParamProcessor.js +6 -0
- package/lib/browser/tx/types.d.ts +1 -1
- package/lib/browser/tx/whileValidTxSender.d.ts +1 -6
- package/lib/browser/tx/whileValidTxSender.js +35 -13
- package/lib/browser/types.d.ts +25 -69
- package/lib/browser/types.js +2 -2
- package/lib/browser/user.d.ts +21 -8
- package/lib/browser/user.js +156 -132
- package/lib/browser/userMap/WebsocketSubscription.d.ts +1 -1
- package/lib/browser/userMap/grpcSubscription.d.ts +1 -1
- package/lib/browser/userMap/referrerMap.js +10 -3
- package/lib/browser/userMap/revenueShareEscrowMap.js +4 -0
- package/lib/browser/userMap/userMap.d.ts +1 -1
- package/lib/browser/userMap/userMap.js +36 -23
- package/lib/browser/userMap/userStatsMap.d.ts +1 -1
- package/lib/browser/userMap/userStatsMap.js +18 -13
- package/lib/browser/userStats.d.ts +7 -2
- package/lib/browser/userStats.js +18 -4
- package/lib/browser/util/TransactionConfirmationManager.js +4 -2
- package/lib/browser/util/chainClock.d.ts +1 -1
- package/lib/browser/util/computeUnits.d.ts +1 -1
- package/lib/browser/util/computeUnits.js +6 -1
- package/lib/browser/velocityClient.d.ts +93 -36
- package/lib/browser/velocityClient.js +414 -280
- package/lib/node/accounts/basicUserAccountSubscriber.d.ts +5 -3
- package/lib/node/accounts/basicUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/basicUserAccountSubscriber.js +4 -3
- package/lib/node/accounts/basicUserStatsAccountSubscriber.d.ts +5 -3
- package/lib/node/accounts/basicUserStatsAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/basicUserStatsAccountSubscriber.js +4 -3
- package/lib/node/accounts/bulkAccountLoader.d.ts +5 -5
- package/lib/node/accounts/bulkAccountLoader.d.ts.map +1 -1
- package/lib/node/accounts/bulkAccountLoader.js +12 -1
- package/lib/node/accounts/grpcAccountSubscriber.d.ts +2 -1
- package/lib/node/accounts/grpcAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/grpcAccountSubscriber.js +8 -2
- package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts +3 -2
- package/lib/node/accounts/grpcMultiAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/grpcMultiAccountSubscriber.js +13 -5
- package/lib/node/accounts/grpcMultiUserAccountSubscriber.d.ts +2 -1
- package/lib/node/accounts/grpcMultiUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/grpcMultiUserAccountSubscriber.js +12 -8
- package/lib/node/accounts/grpcProgramAccountSubscriber.d.ts +2 -1
- package/lib/node/accounts/grpcProgramAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/grpcProgramAccountSubscriber.js +8 -2
- package/lib/node/accounts/grpcVelocityClientAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/grpcVelocityClientAccountSubscriber.js +18 -3
- package/lib/node/accounts/grpcVelocityClientAccountSubscriberV2.d.ts +1 -1
- package/lib/node/accounts/grpcVelocityClientAccountSubscriberV2.d.ts.map +1 -1
- package/lib/node/accounts/grpcVelocityClientAccountSubscriberV2.js +40 -17
- package/lib/node/accounts/laserProgramAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/laserProgramAccountSubscriber.js +3 -0
- package/lib/node/accounts/oneShotUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/oneShotUserAccountSubscriber.js +4 -3
- package/lib/node/accounts/oneShotUserStatsAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/oneShotUserStatsAccountSubscriber.js +7 -3
- package/lib/node/accounts/pollingInsuranceFundStakeAccountSubscriber.d.ts +4 -2
- package/lib/node/accounts/pollingInsuranceFundStakeAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingInsuranceFundStakeAccountSubscriber.js +3 -3
- package/lib/node/accounts/pollingOracleAccountSubscriber.d.ts +0 -2
- package/lib/node/accounts/pollingOracleAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingOracleAccountSubscriber.js +16 -5
- package/lib/node/accounts/pollingTokenAccountSubscriber.d.ts +0 -2
- package/lib/node/accounts/pollingTokenAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingTokenAccountSubscriber.js +16 -5
- package/lib/node/accounts/pollingUserAccountSubscriber.d.ts +8 -4
- package/lib/node/accounts/pollingUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingUserAccountSubscriber.js +17 -11
- package/lib/node/accounts/pollingUserStatsAccountSubscriber.d.ts +4 -2
- package/lib/node/accounts/pollingUserStatsAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingUserStatsAccountSubscriber.js +6 -6
- package/lib/node/accounts/pollingVelocityClientAccountSubscriber.d.ts +7 -1
- package/lib/node/accounts/pollingVelocityClientAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/pollingVelocityClientAccountSubscriber.js +64 -28
- package/lib/node/accounts/types.d.ts +4 -4
- package/lib/node/accounts/types.d.ts.map +1 -1
- package/lib/node/accounts/utils.d.ts +1 -0
- package/lib/node/accounts/utils.d.ts.map +1 -1
- package/lib/node/accounts/utils.js +8 -1
- package/lib/node/accounts/webSocketAccountSubscriber.d.ts +4 -2
- package/lib/node/accounts/webSocketAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketAccountSubscriber.js +17 -5
- package/lib/node/accounts/webSocketAccountSubscriberV2.d.ts +4 -2
- package/lib/node/accounts/webSocketAccountSubscriberV2.d.ts.map +1 -1
- package/lib/node/accounts/webSocketAccountSubscriberV2.js +17 -6
- package/lib/node/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts +4 -2
- package/lib/node/accounts/webSocketInsuranceFundStakeAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketInsuranceFundStakeAccountSubscriber.js +9 -0
- package/lib/node/accounts/webSocketProgramAccountSubscriber.d.ts +3 -1
- package/lib/node/accounts/webSocketProgramAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketProgramAccountSubscriber.js +14 -3
- package/lib/node/accounts/webSocketProgramAccountSubscriberV2.d.ts +3 -1
- package/lib/node/accounts/webSocketProgramAccountSubscriberV2.d.ts.map +1 -1
- package/lib/node/accounts/webSocketProgramAccountSubscriberV2.js +15 -3
- package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.d.ts +3 -1
- package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.d.ts.map +1 -1
- package/lib/node/accounts/webSocketProgramAccountsSubscriberV2.js +14 -4
- package/lib/node/accounts/webSocketUserAccountSubscriber.d.ts +4 -2
- package/lib/node/accounts/webSocketUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketUserAccountSubscriber.js +9 -0
- package/lib/node/accounts/webSocketUserStatsAccountSubsriber.d.ts +4 -2
- package/lib/node/accounts/webSocketUserStatsAccountSubsriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketUserStatsAccountSubsriber.js +9 -0
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.d.ts +4 -4
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriber.js +48 -20
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriberV2.d.ts +7 -3
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriberV2.d.ts.map +1 -1
- package/lib/node/accounts/webSocketVelocityClientAccountSubscriberV2.js +45 -14
- package/lib/node/accounts/websocketProgramUserAccountSubscriber.d.ts +1 -1
- package/lib/node/accounts/websocketProgramUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/accounts/websocketProgramUserAccountSubscriber.js +0 -3
- package/lib/node/addresses/marketAddresses.d.ts.map +1 -1
- package/lib/node/addresses/marketAddresses.js +3 -2
- package/lib/node/addresses/pda.d.ts +0 -2
- package/lib/node/addresses/pda.d.ts.map +1 -1
- package/lib/node/addresses/pda.js +1 -14
- package/lib/node/adminClient.d.ts +24 -29
- package/lib/node/adminClient.d.ts.map +1 -1
- package/lib/node/adminClient.js +156 -157
- package/lib/node/auctionSubscriber/auctionSubscriber.d.ts +1 -1
- package/lib/node/auctionSubscriber/auctionSubscriber.d.ts.map +1 -1
- package/lib/node/auctionSubscriber/auctionSubscriber.js +6 -4
- package/lib/node/auctionSubscriber/auctionSubscriberGrpc.d.ts +1 -1
- package/lib/node/auctionSubscriber/auctionSubscriberGrpc.d.ts.map +1 -1
- package/lib/node/auctionSubscriber/auctionSubscriberGrpc.js +9 -4
- package/lib/node/bankrun/bankrunConnection.d.ts +8 -5
- package/lib/node/bankrun/bankrunConnection.d.ts.map +1 -1
- package/lib/node/bankrun/bankrunConnection.js +92 -32
- package/lib/node/blockhashSubscriber/BlockhashSubscriber.d.ts +1 -1
- package/lib/node/blockhashSubscriber/BlockhashSubscriber.d.ts.map +1 -1
- package/lib/node/blockhashSubscriber/BlockhashSubscriber.js +3 -2
- package/lib/node/clock/clockSubscriber.d.ts +6 -6
- package/lib/node/clock/clockSubscriber.d.ts.map +1 -1
- package/lib/node/clock/clockSubscriber.js +4 -3
- package/lib/node/config.d.ts +1 -1
- package/lib/node/config.d.ts.map +1 -1
- package/lib/node/config.js +8 -4
- package/lib/node/constants/index.d.ts +1 -2
- package/lib/node/constants/index.d.ts.map +1 -1
- package/lib/node/constants/index.js +1 -2
- package/lib/node/constants/numericConstants.d.ts +1 -2
- package/lib/node/constants/numericConstants.d.ts.map +1 -1
- package/lib/node/constants/numericConstants.js +7 -5
- package/lib/node/constants/spotMarkets.d.ts +0 -1
- package/lib/node/constants/spotMarkets.d.ts.map +1 -1
- package/lib/node/constituentMap/constituentMap.d.ts.map +1 -1
- package/lib/node/constituentMap/constituentMap.js +5 -1
- package/lib/node/constituentMap/pollingConstituentAccountSubscriber.d.ts.map +1 -1
- package/lib/node/constituentMap/pollingConstituentAccountSubscriber.js +3 -2
- package/lib/node/constituentMap/webSocketConstituentAccountSubscriber.d.ts +2 -3
- package/lib/node/constituentMap/webSocketConstituentAccountSubscriber.d.ts.map +1 -1
- package/lib/node/constituentMap/webSocketConstituentAccountSubscriber.js +10 -3
- package/lib/node/core/VelocityCore.d.ts +0 -1
- package/lib/node/core/VelocityCore.d.ts.map +1 -1
- package/lib/node/core/instructions/deposit.d.ts +0 -1
- package/lib/node/core/instructions/deposit.d.ts.map +1 -1
- package/lib/node/core/instructions/perpOrders.d.ts +14 -0
- package/lib/node/core/instructions/perpOrders.d.ts.map +1 -1
- package/lib/node/core/instructions/perpOrders.js +14 -0
- package/lib/node/core/instructions/withdraw.d.ts +0 -1
- package/lib/node/core/instructions/withdraw.d.ts.map +1 -1
- package/lib/node/core/remainingAccounts.d.ts +2 -2
- package/lib/node/core/remainingAccounts.d.ts.map +1 -1
- package/lib/node/core/remainingAccounts.js +2 -2
- package/lib/node/decode/user.d.ts.map +1 -1
- package/lib/node/decode/user.js +9 -1
- package/lib/node/dlob/DLOB.d.ts +6 -2
- package/lib/node/dlob/DLOB.d.ts.map +1 -1
- package/lib/node/dlob/DLOB.js +201 -138
- package/lib/node/dlob/DLOBNode.d.ts +5 -3
- package/lib/node/dlob/DLOBNode.d.ts.map +1 -1
- package/lib/node/dlob/DLOBNode.js +7 -0
- package/lib/node/dlob/DLOBSubscriber.d.ts +0 -1
- package/lib/node/dlob/DLOBSubscriber.d.ts.map +1 -1
- package/lib/node/dlob/DLOBSubscriber.js +37 -32
- package/lib/node/dlob/NodeList.d.ts +0 -1
- package/lib/node/dlob/NodeList.d.ts.map +1 -1
- package/lib/node/dlob/NodeList.js +8 -7
- package/lib/node/dlob/orderBookLevels.d.ts +0 -1
- package/lib/node/dlob/orderBookLevels.d.ts.map +1 -1
- package/lib/node/dlob/orderBookLevels.js +19 -12
- package/lib/node/events/eventList.d.ts +3 -3
- package/lib/node/events/eventList.d.ts.map +1 -1
- package/lib/node/events/eventList.js +4 -1
- package/lib/node/events/eventSubscriber.d.ts +5 -2
- package/lib/node/events/eventSubscriber.d.ts.map +1 -1
- package/lib/node/events/eventSubscriber.js +75 -26
- package/lib/node/events/eventsServerLogProvider.d.ts +2 -2
- package/lib/node/events/eventsServerLogProvider.d.ts.map +1 -1
- package/lib/node/events/eventsServerLogProvider.js +15 -8
- package/lib/node/events/fetchLogs.d.ts +1 -1
- package/lib/node/events/fetchLogs.d.ts.map +1 -1
- package/lib/node/events/fetchLogs.js +4 -2
- package/lib/node/events/pollingLogProvider.d.ts +2 -2
- package/lib/node/events/pollingLogProvider.d.ts.map +1 -1
- package/lib/node/events/pollingLogProvider.js +1 -0
- package/lib/node/events/txEventCache.d.ts +3 -3
- package/lib/node/events/txEventCache.d.ts.map +1 -1
- package/lib/node/events/txEventCache.js +6 -2
- package/lib/node/events/types.d.ts +2 -4
- package/lib/node/events/types.d.ts.map +1 -1
- package/lib/node/events/types.js +0 -2
- package/lib/node/events/webSocketLogProvider.d.ts +2 -2
- package/lib/node/events/webSocketLogProvider.d.ts.map +1 -1
- package/lib/node/events/webSocketLogProvider.js +5 -2
- package/lib/node/factory/bigNum.d.ts +0 -1
- package/lib/node/factory/bigNum.d.ts.map +1 -1
- package/lib/node/factory/bigNum.js +1 -1
- package/lib/node/idl/velocity.d.ts +1243 -1586
- package/lib/node/idl/velocity.d.ts.map +1 -1
- package/lib/node/idl/velocity.json +1234 -1577
- package/lib/node/index.d.ts +0 -2
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +0 -2
- package/lib/node/indicative-quotes/indicativeQuotesSender.d.ts +0 -1
- package/lib/node/indicative-quotes/indicativeQuotesSender.d.ts.map +1 -1
- package/lib/node/jupiter/jupiterClient.d.ts +1 -2
- package/lib/node/jupiter/jupiterClient.d.ts.map +1 -1
- package/lib/node/jupiter/jupiterClient.js +18 -8
- package/lib/node/marginCalculation.d.ts +0 -1
- package/lib/node/marginCalculation.d.ts.map +1 -1
- package/lib/node/marginCalculation.js +1 -0
- package/lib/node/marinade/index.d.ts +2 -3
- package/lib/node/marinade/index.d.ts.map +1 -1
- package/lib/node/marinade/index.js +5 -0
- package/lib/node/math/amm.d.ts +31 -14
- package/lib/node/math/amm.d.ts.map +1 -1
- package/lib/node/math/amm.js +77 -22
- package/lib/node/math/auction.d.ts +0 -1
- package/lib/node/math/auction.d.ts.map +1 -1
- package/lib/node/math/bankruptcy.js +1 -1
- package/lib/node/math/conversion.d.ts +0 -1
- package/lib/node/math/conversion.d.ts.map +1 -1
- package/lib/node/math/funding.d.ts +0 -1
- package/lib/node/math/funding.d.ts.map +1 -1
- package/lib/node/math/funding.js +6 -6
- package/lib/node/math/insurance.d.ts +1 -2
- package/lib/node/math/insurance.d.ts.map +1 -1
- package/lib/node/math/insurance.js +4 -5
- package/lib/node/math/liquidation.d.ts +0 -1
- package/lib/node/math/liquidation.d.ts.map +1 -1
- package/lib/node/math/margin.d.ts +1 -10
- package/lib/node/math/margin.d.ts.map +1 -1
- package/lib/node/math/margin.js +3 -62
- package/lib/node/math/market.d.ts +4 -13
- package/lib/node/math/market.d.ts.map +1 -1
- package/lib/node/math/market.js +6 -40
- package/lib/node/math/oracles.d.ts +0 -4
- package/lib/node/math/oracles.d.ts.map +1 -1
- package/lib/node/math/oracles.js +1 -14
- package/lib/node/math/orders.d.ts +0 -6
- package/lib/node/math/orders.d.ts.map +1 -1
- package/lib/node/math/orders.js +2 -74
- package/lib/node/math/position.d.ts +1 -6
- package/lib/node/math/position.d.ts.map +1 -1
- package/lib/node/math/position.js +5 -10
- package/lib/node/math/repeg.d.ts +0 -2
- package/lib/node/math/repeg.d.ts.map +1 -1
- package/lib/node/math/repeg.js +1 -23
- package/lib/node/math/spotBalance.d.ts +4 -5
- package/lib/node/math/spotBalance.d.ts.map +1 -1
- package/lib/node/math/spotBalance.js +6 -6
- package/lib/node/math/spotMarket.d.ts +0 -7
- package/lib/node/math/spotMarket.d.ts.map +1 -1
- package/lib/node/math/spotMarket.js +1 -16
- package/lib/node/math/spotPosition.d.ts +4 -5
- package/lib/node/math/spotPosition.d.ts.map +1 -1
- package/lib/node/math/state.d.ts +0 -3
- package/lib/node/math/state.d.ts.map +1 -1
- package/lib/node/math/state.js +1 -9
- package/lib/node/math/superStake.d.ts +3 -54
- package/lib/node/math/superStake.d.ts.map +1 -1
- package/lib/node/math/superStake.js +16 -13
- package/lib/node/math/trade.d.ts +2 -3
- package/lib/node/math/trade.d.ts.map +1 -1
- package/lib/node/math/trade.js +6 -6
- package/lib/node/math/utils.d.ts +0 -1
- package/lib/node/math/utils.d.ts.map +1 -1
- package/lib/node/memcmp.d.ts +0 -1
- package/lib/node/memcmp.d.ts.map +1 -1
- package/lib/node/memcmp.js +1 -10
- package/lib/node/oracles/oracleClientCache.d.ts +1 -1
- package/lib/node/oracles/prelaunchOracleClient.d.ts.map +1 -1
- package/lib/node/oracles/prelaunchOracleClient.js +3 -2
- package/lib/node/oracles/pythClient.d.ts +0 -1
- package/lib/node/oracles/pythClient.d.ts.map +1 -1
- package/lib/node/oracles/pythClient.js +9 -3
- package/lib/node/oracles/pythLazerClient.d.ts +0 -1
- package/lib/node/oracles/pythLazerClient.d.ts.map +1 -1
- package/lib/node/oracles/pythLazerClient.js +3 -2
- package/lib/node/oracles/strictOraclePrice.d.ts +0 -1
- package/lib/node/oracles/strictOraclePrice.d.ts.map +1 -1
- package/lib/node/oracles/types.d.ts +0 -1
- package/lib/node/oracles/types.d.ts.map +1 -1
- package/lib/node/oracles/utils.d.ts +4 -1
- package/lib/node/oracles/utils.d.ts.map +1 -1
- package/lib/node/oracles/utils.js +9 -1
- package/lib/node/orderParams.d.ts +0 -1
- package/lib/node/orderParams.d.ts.map +1 -1
- package/lib/node/orderSubscriber/OrderSubscriber.d.ts +1 -1
- package/lib/node/orderSubscriber/OrderSubscriber.d.ts.map +1 -1
- package/lib/node/orderSubscriber/OrderSubscriber.js +8 -2
- package/lib/node/priorityFee/heliusPriorityFeeMethod.d.ts +1 -1
- package/lib/node/priorityFee/heliusPriorityFeeMethod.d.ts.map +1 -1
- package/lib/node/priorityFee/priorityFeeSubscriber.d.ts +1 -1
- package/lib/node/priorityFee/priorityFeeSubscriber.d.ts.map +1 -1
- package/lib/node/priorityFee/priorityFeeSubscriber.js +32 -8
- package/lib/node/priorityFee/solanaPriorityFeeMethod.d.ts +1 -1
- package/lib/node/priorityFee/solanaPriorityFeeMethod.d.ts.map +1 -1
- package/lib/node/pyth/types.d.ts +0 -1
- package/lib/node/pyth/types.d.ts.map +1 -1
- package/lib/node/slot/SlotSubscriber.d.ts +1 -1
- package/lib/node/slot/SlotSubscriber.d.ts.map +1 -1
- package/lib/node/slot/SlotSubscriber.js +2 -1
- package/lib/node/slot/SlothashSubscriber.d.ts +3 -2
- package/lib/node/slot/SlothashSubscriber.d.ts.map +1 -1
- package/lib/node/slot/SlothashSubscriber.js +11 -4
- package/lib/node/swap/UnifiedSwapClient.d.ts +0 -1
- package/lib/node/swap/UnifiedSwapClient.d.ts.map +1 -1
- package/lib/node/swift/grpcSignedMsgUserAccountSubscriber.d.ts +0 -3
- package/lib/node/swift/grpcSignedMsgUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/swift/grpcSignedMsgUserAccountSubscriber.js +5 -5
- package/lib/node/swift/signedMsgUserAccountSubscriber.d.ts +3 -2
- package/lib/node/swift/signedMsgUserAccountSubscriber.d.ts.map +1 -1
- package/lib/node/swift/signedMsgUserAccountSubscriber.js +13 -5
- package/lib/node/swift/swiftOrderSubscriber.d.ts +1 -1
- package/lib/node/swift/swiftOrderSubscriber.d.ts.map +1 -1
- package/lib/node/swift/swiftOrderSubscriber.js +10 -5
- package/lib/node/testClient.js +3 -2
- package/lib/node/titan/titanClient.d.ts +0 -1
- package/lib/node/titan/titanClient.d.ts.map +1 -1
- package/lib/node/tokenFaucet.d.ts +0 -1
- package/lib/node/tokenFaucet.d.ts.map +1 -1
- package/lib/node/tokenFaucet.js +16 -2
- package/lib/node/tx/baseTxSender.d.ts +4 -4
- package/lib/node/tx/baseTxSender.d.ts.map +1 -1
- package/lib/node/tx/baseTxSender.js +5 -4
- package/lib/node/tx/fastSingleTxSender.d.ts +3 -3
- package/lib/node/tx/fastSingleTxSender.d.ts.map +1 -1
- package/lib/node/tx/fastSingleTxSender.js +9 -5
- package/lib/node/tx/reportTransactionError.d.ts +2 -2
- package/lib/node/tx/reportTransactionError.d.ts.map +1 -1
- package/lib/node/tx/reportTransactionError.js +5 -1
- package/lib/node/tx/retryTxSender.d.ts +1 -1
- package/lib/node/tx/retryTxSender.d.ts.map +1 -1
- package/lib/node/tx/retryTxSender.js +4 -2
- package/lib/node/tx/txHandler.d.ts +9 -3
- package/lib/node/tx/txHandler.d.ts.map +1 -1
- package/lib/node/tx/txHandler.js +54 -40
- package/lib/node/tx/txParamProcessor.d.ts +4 -1
- package/lib/node/tx/txParamProcessor.d.ts.map +1 -1
- package/lib/node/tx/txParamProcessor.js +6 -0
- package/lib/node/tx/types.d.ts +1 -1
- package/lib/node/tx/types.d.ts.map +1 -1
- package/lib/node/tx/whileValidTxSender.d.ts +1 -6
- package/lib/node/tx/whileValidTxSender.d.ts.map +1 -1
- package/lib/node/tx/whileValidTxSender.js +35 -13
- package/lib/node/types.d.ts +25 -69
- package/lib/node/types.d.ts.map +1 -1
- package/lib/node/types.js +2 -2
- package/lib/node/user.d.ts +21 -8
- package/lib/node/user.d.ts.map +1 -1
- package/lib/node/user.js +156 -132
- package/lib/node/userMap/WebsocketSubscription.d.ts +1 -1
- package/lib/node/userMap/WebsocketSubscription.d.ts.map +1 -1
- package/lib/node/userMap/grpcSubscription.d.ts +1 -1
- package/lib/node/userMap/grpcSubscription.d.ts.map +1 -1
- package/lib/node/userMap/referrerMap.d.ts.map +1 -1
- package/lib/node/userMap/referrerMap.js +10 -3
- package/lib/node/userMap/revenueShareEscrowMap.d.ts.map +1 -1
- package/lib/node/userMap/revenueShareEscrowMap.js +4 -0
- package/lib/node/userMap/userMap.d.ts +1 -1
- package/lib/node/userMap/userMap.d.ts.map +1 -1
- package/lib/node/userMap/userMap.js +36 -23
- package/lib/node/userMap/userStatsMap.d.ts +1 -1
- package/lib/node/userMap/userStatsMap.d.ts.map +1 -1
- package/lib/node/userMap/userStatsMap.js +18 -13
- package/lib/node/userStats.d.ts +7 -2
- package/lib/node/userStats.d.ts.map +1 -1
- package/lib/node/userStats.js +18 -4
- package/lib/node/util/TransactionConfirmationManager.d.ts.map +1 -1
- package/lib/node/util/TransactionConfirmationManager.js +4 -2
- package/lib/node/util/chainClock.d.ts +1 -1
- package/lib/node/util/chainClock.d.ts.map +1 -1
- package/lib/node/util/computeUnits.d.ts +1 -1
- package/lib/node/util/computeUnits.d.ts.map +1 -1
- package/lib/node/util/computeUnits.js +6 -1
- package/lib/node/velocityClient.d.ts +93 -36
- package/lib/node/velocityClient.d.ts.map +1 -1
- package/lib/node/velocityClient.js +414 -280
- package/package.json +15 -8
- package/src/accounts/basicUserAccountSubscriber.ts +7 -5
- package/src/accounts/basicUserStatsAccountSubscriber.ts +9 -5
- package/src/accounts/bulkAccountLoader.ts +20 -7
- package/src/accounts/grpcAccountSubscriber.ts +11 -3
- package/src/accounts/grpcMultiAccountSubscriber.ts +24 -9
- package/src/accounts/grpcMultiUserAccountSubscriber.ts +16 -12
- package/src/accounts/grpcProgramAccountSubscriber.ts +11 -3
- package/src/accounts/grpcVelocityClientAccountSubscriber.ts +17 -7
- package/src/accounts/grpcVelocityClientAccountSubscriberV2.ts +66 -39
- package/src/accounts/laserProgramAccountSubscriber.ts +3 -0
- package/src/accounts/oneShotUserAccountSubscriber.ts +5 -3
- package/src/accounts/oneShotUserStatsAccountSubscriber.ts +8 -3
- package/src/accounts/pollingInsuranceFundStakeAccountSubscriber.ts +11 -5
- package/src/accounts/pollingOracleAccountSubscriber.ts +17 -10
- package/src/accounts/pollingTokenAccountSubscriber.ts +17 -10
- package/src/accounts/pollingUserAccountSubscriber.ts +26 -20
- package/src/accounts/pollingUserStatsAccountSubscriber.ts +12 -10
- package/src/accounts/pollingVelocityClientAccountSubscriber.ts +76 -30
- package/src/accounts/types.ts +6 -4
- package/src/accounts/utils.ts +10 -0
- package/src/accounts/webSocketAccountSubscriber.ts +23 -10
- package/src/accounts/webSocketAccountSubscriberV2.ts +23 -8
- package/src/accounts/webSocketInsuranceFundStakeAccountSubscriber.ts +17 -2
- package/src/accounts/webSocketProgramAccountSubscriber.ts +29 -4
- package/src/accounts/webSocketProgramAccountSubscriberV2.ts +30 -4
- package/src/accounts/webSocketProgramAccountsSubscriberV2.ts +29 -4
- package/src/accounts/webSocketUserAccountSubscriber.ts +11 -2
- package/src/accounts/webSocketUserStatsAccountSubsriber.ts +15 -2
- package/src/accounts/webSocketVelocityClientAccountSubscriber.ts +76 -48
- package/src/accounts/webSocketVelocityClientAccountSubscriberV2.ts +74 -35
- package/src/accounts/websocketProgramUserAccountSubscriber.ts +1 -6
- package/src/addresses/marketAddresses.ts +3 -2
- package/src/addresses/pda.ts +0 -25
- package/src/adminClient.ts +273 -303
- package/src/auctionSubscriber/auctionSubscriber.ts +7 -5
- package/src/auctionSubscriber/auctionSubscriberGrpc.ts +12 -5
- package/src/bankrun/bankrunConnection.ts +110 -40
- package/src/blockhashSubscriber/BlockhashSubscriber.ts +5 -4
- package/src/clock/clockSubscriber.ts +10 -9
- package/src/config.ts +8 -3
- package/src/constants/index.ts +1 -2
- package/src/constants/numericConstants.ts +8 -4
- package/src/constituentMap/constituentMap.ts +8 -1
- package/src/constituentMap/pollingConstituentAccountSubscriber.ts +4 -2
- package/src/constituentMap/webSocketConstituentAccountSubscriber.ts +13 -4
- package/src/core/instructions/perpOrders.ts +14 -0
- package/src/core/remainingAccounts.ts +4 -4
- package/src/decode/user.ts +8 -1
- package/src/dlob/DLOB.ts +296 -172
- package/src/dlob/DLOBNode.ts +23 -3
- package/src/dlob/DLOBSubscriber.ts +51 -34
- package/src/dlob/NodeList.ts +8 -7
- package/src/dlob/orderBookLevels.ts +45 -25
- package/src/events/eventList.ts +4 -1
- package/src/events/eventSubscriber.ts +107 -49
- package/src/events/eventsServerLogProvider.ts +22 -13
- package/src/events/fetchLogs.ts +3 -3
- package/src/events/pollingLogProvider.ts +2 -2
- package/src/events/txEventCache.ts +8 -2
- package/src/events/types.ts +0 -8
- package/src/events/webSocketLogProvider.ts +5 -3
- package/src/factory/bigNum.ts +2 -2
- package/src/idl/velocity.json +1234 -1577
- package/src/idl/velocity.ts +1234 -1577
- package/src/index.ts +0 -2
- package/src/jupiter/jupiterClient.ts +30 -10
- package/src/marginCalculation.ts +1 -0
- package/src/marinade/index.ts +11 -2
- package/src/math/amm.ts +188 -33
- package/src/math/bankruptcy.ts +1 -1
- package/src/math/funding.ts +7 -6
- package/src/math/insurance.ts +6 -8
- package/src/math/margin.ts +5 -112
- package/src/math/market.ts +6 -96
- package/src/math/oracles.ts +0 -17
- package/src/math/orders.ts +1 -110
- package/src/math/position.ts +4 -16
- package/src/math/repeg.ts +0 -29
- package/src/math/spotBalance.ts +14 -10
- package/src/math/spotMarket.ts +2 -28
- package/src/math/spotPosition.ts +4 -4
- package/src/math/state.ts +0 -8
- package/src/math/superStake.ts +19 -65
- package/src/math/trade.ts +2 -6
- package/src/memcmp.ts +0 -9
- package/src/oracles/prelaunchOracleClient.ts +7 -2
- package/src/oracles/pythClient.ts +12 -3
- package/src/oracles/pythLazerClient.ts +7 -2
- package/src/oracles/utils.ts +15 -0
- package/src/orderSubscriber/OrderSubscriber.ts +10 -4
- package/src/priorityFee/heliusPriorityFeeMethod.ts +1 -1
- package/src/priorityFee/priorityFeeSubscriber.ts +45 -9
- package/src/priorityFee/solanaPriorityFeeMethod.ts +1 -1
- package/src/pyth/types.ts +0 -2
- package/src/slot/SlotSubscriber.ts +3 -3
- package/src/slot/SlothashSubscriber.ts +17 -6
- package/src/swift/grpcSignedMsgUserAccountSubscriber.ts +5 -6
- package/src/swift/signedMsgUserAccountSubscriber.ts +16 -8
- package/src/swift/swiftOrderSubscriber.ts +10 -9
- package/src/testClient.ts +2 -2
- package/src/tokenFaucet.ts +22 -3
- package/src/tx/baseTxSender.ts +10 -10
- package/src/tx/fastSingleTxSender.ts +12 -8
- package/src/tx/reportTransactionError.ts +12 -7
- package/src/tx/retryTxSender.ts +6 -4
- package/src/tx/txHandler.ts +88 -43
- package/src/tx/txParamProcessor.ts +18 -3
- package/src/tx/types.ts +1 -1
- package/src/tx/whileValidTxSender.ts +51 -22
- package/src/types.ts +39 -75
- package/src/user.ts +200 -152
- package/src/userMap/WebsocketSubscription.ts +1 -1
- package/src/userMap/grpcSubscription.ts +1 -1
- package/src/userMap/referrerMap.ts +14 -10
- package/src/userMap/revenueShareEscrowMap.ts +8 -3
- package/src/userMap/userMap.ts +43 -25
- package/src/userMap/userStatsMap.ts +32 -19
- package/src/userStats.ts +21 -8
- package/src/util/TransactionConfirmationManager.ts +10 -2
- package/src/util/chainClock.ts +1 -1
- package/src/util/computeUnits.ts +7 -3
- package/src/velocityClient.ts +536 -383
- package/tests/VelocityCore/remainingAccounts.test.ts +4 -5
- package/tests/accounts/customizedCadenceBulkAccountLoader.test.ts +19 -11
- package/tests/amm/test.ts +300 -95
- package/tests/decode/userAccountBufferStrings.ts +100 -100
- package/tests/dlob/helpers.ts +162 -173
- package/tests/dlob/test.ts +155 -106
- package/tests/tx/TransactionConfirmationManager.test.ts +9 -2
- package/tests/user/getMarginCalculation.ts +1 -1
- package/tests/user/helpers.ts +3 -4
- package/tests/user/marginCalculations.test.ts +2 -2
- package/tests/user/test.ts +3 -3
- package/tsconfig.browser.json +3 -1
- package/tsconfig.json +21 -2
- package/.yarn/install-state.gz +0 -0
- package/VERSION +0 -1
- package/bun.lock +0 -1885
- package/lib/browser/constants/insuranceFund.d.ts +0 -5
- package/lib/browser/constants/insuranceFund.js +0 -9
- package/lib/browser/tx/forwardOnlyTxSender.d.ts +0 -37
- package/lib/browser/tx/forwardOnlyTxSender.js +0 -92
- package/lib/browser/util/tps.d.ts +0 -2
- package/lib/browser/util/tps.js +0 -16
- package/lib/node/constants/insuranceFund.d.ts +0 -6
- package/lib/node/constants/insuranceFund.d.ts.map +0 -1
- package/lib/node/constants/insuranceFund.js +0 -9
- package/lib/node/tx/forwardOnlyTxSender.d.ts +0 -38
- package/lib/node/tx/forwardOnlyTxSender.d.ts.map +0 -1
- package/lib/node/tx/forwardOnlyTxSender.js +0 -92
- package/lib/node/util/tps.d.ts +0 -3
- package/lib/node/util/tps.d.ts.map +0 -1
- package/lib/node/util/tps.js +0 -16
- package/scripts/updateVersion.js +0 -28
- package/src/constants/insuranceFund.ts +0 -8
- package/src/tx/forwardOnlyTxSender.ts +0 -145
- package/src/util/tps.ts +0 -27
- package/tests/decode/phoenix.ts +0 -71
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
/// <reference types="bn.js" />
|
|
2
1
|
import { BN } from '../isomorphic/anchor';
|
|
3
2
|
import { MarketTypeStr, Order } from '../types';
|
|
4
3
|
import { MMOraclePriceData, OraclePriceData } from '../oracles/types';
|
|
4
|
+
export type NodeOraclePriceData<T extends MarketTypeStr = MarketTypeStr> = T extends 'spot' ? OraclePriceData : MMOraclePriceData;
|
|
5
5
|
export interface DLOBNode {
|
|
6
|
-
getPrice<T extends MarketTypeStr>(oraclePriceData: T
|
|
6
|
+
getPrice<T extends MarketTypeStr>(oraclePriceData: NodeOraclePriceData<T>, slot: number): BN | undefined;
|
|
7
|
+
getPriceOrThrow<T extends MarketTypeStr>(oraclePriceData: NodeOraclePriceData<T>, slot: number): BN;
|
|
7
8
|
isVammNode(): boolean;
|
|
8
9
|
order: Order | undefined;
|
|
9
10
|
isBaseFilled(): boolean;
|
|
@@ -23,7 +24,8 @@ export declare abstract class OrderNode implements DLOBNode {
|
|
|
23
24
|
constructor(order: Order, userAccount: string, baseAssetAmount?: BN, isSignedMsg?: boolean);
|
|
24
25
|
abstract getSortValue(order: Order): BN;
|
|
25
26
|
getLabel(): string;
|
|
26
|
-
getPrice<T extends MarketTypeStr>(oraclePriceData: T
|
|
27
|
+
getPrice<T extends MarketTypeStr>(oraclePriceData: NodeOraclePriceData<T>, slot: number): BN | undefined;
|
|
28
|
+
getPriceOrThrow<T extends MarketTypeStr>(oraclePriceData: NodeOraclePriceData<T>, slot: number): BN;
|
|
27
29
|
isBaseFilled(): boolean;
|
|
28
30
|
isVammNode(): boolean;
|
|
29
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DLOBNode.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBNode.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DLOBNode.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBNode.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,6 +33,13 @@ class OrderNode {
|
|
|
33
33
|
getPrice(oraclePriceData, slot) {
|
|
34
34
|
return (0, orders_1.getLimitPrice)(this.order, oraclePriceData, slot);
|
|
35
35
|
}
|
|
36
|
+
getPriceOrThrow(oraclePriceData, slot) {
|
|
37
|
+
const price = this.getPrice(oraclePriceData, slot);
|
|
38
|
+
if (price === undefined) {
|
|
39
|
+
throw new Error(`OrderNode.getPrice: order ${this.order.orderId} has no limit price`);
|
|
40
|
+
}
|
|
41
|
+
return price;
|
|
42
|
+
}
|
|
36
43
|
isBaseFilled() {
|
|
37
44
|
return this.order.baseAssetAmountFilled.eq(this.order.baseAssetAmount);
|
|
38
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DLOBSubscriber.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBSubscriber.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DLOBSubscriber.d.ts","sourceRoot":"","sources":["../../../src/dlob/DLOBSubscriber.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EACN,UAAU,EACV,oBAAoB,EACpB,sBAAsB,EACtB,UAAU,EACV,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAa,UAAU,EAAE,MAAM,UAAU,CAAC;AACjD,OAAO,EAIN,WAAW,EACX,oBAAoB,EACpB,WAAW,EACX,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE1C,qBAAa,cAAc;IAC1B,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,UAAU,EAAE,UAAU,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC;IACJ,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,oBAAoB,CAAC,CAAC;gBAChE,MAAM,EAAE,sBAAsB;IAa7B,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAoBjC,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAI1B,OAAO,IAAI,IAAI;IAItB;;;;;;;;;;OAUG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,EACV,KAAU,EACV,WAAmB,EACnB,aAAa,EACb,oBAAyB,EACzB,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;QACxB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,oBAAoB,CAAC,EAAE,oBAAoB,EAAE,CAAC;QAC9C,UAAU,CAAC,EAAE,EAAE,CAAC;KAChB,GAAG,WAAW;IAsEf;;;;;;OAMG;IACI,KAAK,CAAC,EACZ,UAAU,EACV,WAAW,EACX,UAAU,GACV,EAAE;QACF,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,WAAW,CAAC,EAAE,MAAM,CAAC;QACrB,UAAU,CAAC,EAAE,UAAU,CAAC;KACxB,GAAG,WAAW;IAyCF,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;CAMzC"}
|
|
@@ -29,7 +29,7 @@ class DLOBSubscriber {
|
|
|
29
29
|
this.eventEmitter.emit('update', this.dlob);
|
|
30
30
|
}
|
|
31
31
|
catch (e) {
|
|
32
|
-
this.eventEmitter.emit('error', e);
|
|
32
|
+
this.eventEmitter.emit('error', e instanceof Error ? e : new Error(String(e)));
|
|
33
33
|
}
|
|
34
34
|
}, this.updateFrequency);
|
|
35
35
|
}
|
|
@@ -64,35 +64,39 @@ class DLOBSubscriber {
|
|
|
64
64
|
throw new Error('Either marketName or marketIndex and marketType must be provided');
|
|
65
65
|
}
|
|
66
66
|
}
|
|
67
|
-
let oraclePriceData;
|
|
68
67
|
const isPerp = (0, types_1.isVariant)(marketType, 'perp');
|
|
69
68
|
if (isPerp) {
|
|
70
|
-
const perpMarketAccount = this.velocityClient.
|
|
71
|
-
oraclePriceData = this.velocityClient.
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
69
|
+
const perpMarketAccount = this.velocityClient.getPerpMarketAccountOrThrow(marketIndex);
|
|
70
|
+
const oraclePriceData = this.velocityClient.getMMOracleDataForPerpMarket(perpMarketAccount.marketIndex);
|
|
71
|
+
if (includeVamm) {
|
|
72
|
+
if (fallbackL2Generators.length > 0) {
|
|
73
|
+
throw new Error('includeVamm can only be used if fallbackL2Generators is empty');
|
|
74
|
+
}
|
|
75
|
+
fallbackL2Generators = [
|
|
76
|
+
(0, orderBookLevels_1.getVammL2Generator)({
|
|
77
|
+
marketAccount: perpMarketAccount,
|
|
78
|
+
mmOraclePriceData: this.velocityClient.getMMOracleDataForPerpMarket(marketIndex),
|
|
79
|
+
numOrders: numVammOrders !== null && numVammOrders !== void 0 ? numVammOrders : depth,
|
|
80
|
+
topOfBookQuoteAmounts: marketIndex < 3
|
|
81
|
+
? orderBookLevels_1.MAJORS_TOP_OF_BOOK_QUOTE_AMOUNTS
|
|
82
|
+
: orderBookLevels_1.DEFAULT_TOP_OF_BOOK_QUOTE_AMOUNTS,
|
|
83
|
+
latestSlot,
|
|
84
|
+
}),
|
|
85
|
+
];
|
|
80
86
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
latestSlot,
|
|
90
|
-
}),
|
|
91
|
-
];
|
|
87
|
+
return this.dlob.getL2({
|
|
88
|
+
marketIndex,
|
|
89
|
+
marketType: types_1.MarketType.PERP,
|
|
90
|
+
depth,
|
|
91
|
+
oraclePriceData,
|
|
92
|
+
slot: this.slotSource.getSlot(),
|
|
93
|
+
fallbackL2Generators: fallbackL2Generators,
|
|
94
|
+
});
|
|
92
95
|
}
|
|
96
|
+
const oraclePriceData = this.velocityClient.getOracleDataForSpotMarket(marketIndex);
|
|
93
97
|
return this.dlob.getL2({
|
|
94
98
|
marketIndex,
|
|
95
|
-
marketType,
|
|
99
|
+
marketType: types_1.MarketType.SPOT,
|
|
96
100
|
depth,
|
|
97
101
|
oraclePriceData,
|
|
98
102
|
slot: this.slotSource.getSlot(),
|
|
@@ -120,19 +124,20 @@ class DLOBSubscriber {
|
|
|
120
124
|
throw new Error('Either marketName or marketIndex and marketType must be provided');
|
|
121
125
|
}
|
|
122
126
|
}
|
|
123
|
-
let oraclePriceData;
|
|
124
127
|
const isPerp = (0, types_1.isVariant)(marketType, 'perp');
|
|
125
128
|
if (isPerp) {
|
|
126
|
-
oraclePriceData =
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
this.
|
|
129
|
+
const oraclePriceData = this.velocityClient.getMMOracleDataForPerpMarket(marketIndex);
|
|
130
|
+
return this.dlob.getL3({
|
|
131
|
+
marketIndex,
|
|
132
|
+
marketType: types_1.MarketType.PERP,
|
|
133
|
+
oraclePriceData,
|
|
134
|
+
slot: this.slotSource.getSlot(),
|
|
135
|
+
});
|
|
132
136
|
}
|
|
137
|
+
const oraclePriceData = this.velocityClient.getOracleDataForSpotMarket(marketIndex);
|
|
133
138
|
return this.dlob.getL3({
|
|
134
139
|
marketIndex,
|
|
135
|
-
marketType,
|
|
140
|
+
marketType: types_1.MarketType.SPOT,
|
|
136
141
|
oraclePriceData,
|
|
137
142
|
slot: this.slotSource.getSlot(),
|
|
138
143
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeList.d.ts","sourceRoot":"","sources":["../../../src/dlob/NodeList.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"NodeList.d.ts","sourceRoot":"","sources":["../../../src/dlob/NodeList.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,aAAa,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAC3D,OAAO,EAAc,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,EAAE,EAAE,EAAE,MAAM,sBAAsB,CAAC;AAE1C,MAAM,MAAM,aAAa,GAAG,KAAK,GAAG,MAAM,CAAC;AAE3C,wBAAgB,iBAAiB,CAChC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GACjB,MAAM,CAER;AAED,MAAM,WAAW,iBAAiB;IACjC,YAAY,IAAI,SAAS,CAAC,QAAQ,CAAC,CAAC;CACpC;AAED,qBAAa,QAAQ,CAAC,QAAQ,SAAS,MAAM,WAAW,CACvD,YAAW,iBAAiB;IAO3B,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IANtB,IAAI,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAC7B,MAAM,SAAK;IACX,OAAO,qCAA4C;gBAG1C,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa;IAG9B,KAAK;IAML,MAAM,CACZ,KAAK,EAAE,KAAK,EACZ,UAAU,EAAE,aAAa,EACzB,WAAW,EAAE,MAAM,EACnB,eAAe,CAAC,EAAE,EAAE,GAClB,IAAI;IAiDP,WAAW,CACV,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,EAClC,OAAO,EAAE,WAAW,CAAC,QAAQ,CAAC,GAC5B,OAAO;IAkBH,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAS/C,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,IAAI;IAwBrD,YAAY,IAAI,SAAS,CAAC,QAAQ,CAAC;IAQ7B,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO;IAI/C,GAAG,CAAC,cAAc,EAAE,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,SAAS;IAI9D,KAAK,IAAI,IAAI;IAQb,QAAQ,IAAI,IAAI;CAOvB"}
|
|
@@ -45,9 +45,10 @@ class NodeList {
|
|
|
45
45
|
!this.prependNode(currentNode.next, newNode)) {
|
|
46
46
|
currentNode = currentNode.next;
|
|
47
47
|
}
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
const nextNode = currentNode.next;
|
|
49
|
+
newNode.next = nextNode;
|
|
50
|
+
if (nextNode !== undefined) {
|
|
51
|
+
nextNode.previous = newNode;
|
|
51
52
|
}
|
|
52
53
|
currentNode.next = newNode;
|
|
53
54
|
newNode.previous = currentNode;
|
|
@@ -69,16 +70,16 @@ class NodeList {
|
|
|
69
70
|
}
|
|
70
71
|
update(order, userAccount) {
|
|
71
72
|
const orderId = getOrderSignature(order.orderId, userAccount);
|
|
72
|
-
|
|
73
|
-
|
|
73
|
+
const node = this.nodeMap.get(orderId);
|
|
74
|
+
if (node !== undefined) {
|
|
74
75
|
Object.assign(node.order, order);
|
|
75
76
|
node.haveFilled = false;
|
|
76
77
|
}
|
|
77
78
|
}
|
|
78
79
|
remove(order, userAccount) {
|
|
79
80
|
const orderId = getOrderSignature(order.orderId, userAccount);
|
|
80
|
-
|
|
81
|
-
|
|
81
|
+
const node = this.nodeMap.get(orderId);
|
|
82
|
+
if (node !== undefined) {
|
|
82
83
|
if (node.next) {
|
|
83
84
|
node.next.previous = node.previous;
|
|
84
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orderBookLevels.d.ts","sourceRoot":"","sources":["../../../src/dlob/orderBookLevels.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"orderBookLevels.d.ts","sourceRoot":"","sources":["../../../src/dlob/orderBookLevels.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,13 +28,16 @@ const INDICATIVE_QUOTES_PUBKEY = 'inDNdu3ML4vG5LNExqcwuCQtLcCU8KfK5YM2qYV3JJz';
|
|
|
28
28
|
*/
|
|
29
29
|
function* getL2GeneratorFromDLOBNodes(dlobNodes, oraclePriceData, slot) {
|
|
30
30
|
for (const dlobNode of dlobNodes) {
|
|
31
|
+
if (!dlobNode.order) {
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
31
34
|
const size = dlobNode.baseAssetAmount.sub(dlobNode.order.baseAssetAmountFilled);
|
|
32
35
|
if (size.lte(numericConstants_1.ZERO)) {
|
|
33
36
|
continue;
|
|
34
37
|
}
|
|
35
38
|
yield {
|
|
36
39
|
size,
|
|
37
|
-
price: dlobNode.
|
|
40
|
+
price: dlobNode.getPriceOrThrow(oraclePriceData, slot),
|
|
38
41
|
sources: dlobNode.userAccount == INDICATIVE_QUOTES_PUBKEY
|
|
39
42
|
? { indicative: size }
|
|
40
43
|
: {
|
|
@@ -83,8 +86,9 @@ function createL2Levels(generator, depth) {
|
|
|
83
86
|
const currentLevel = levels[levels.length - 1];
|
|
84
87
|
currentLevel.size = currentLevel.size.add(size);
|
|
85
88
|
for (const [source, size] of Object.entries(level.sources)) {
|
|
86
|
-
|
|
87
|
-
|
|
89
|
+
const existingSize = currentLevel.sources[source];
|
|
90
|
+
if (existingSize) {
|
|
91
|
+
currentLevel.sources[source] = existingSize.add(size);
|
|
88
92
|
}
|
|
89
93
|
else {
|
|
90
94
|
currentLevel.sources[source] = size;
|
|
@@ -102,7 +106,7 @@ function createL2Levels(generator, depth) {
|
|
|
102
106
|
}
|
|
103
107
|
exports.createL2Levels = createL2Levels;
|
|
104
108
|
function getVammL2Generator({ marketAccount, mmOraclePriceData, numOrders, now = new anchor_1.BN(Math.floor(Date.now() / 1000)), topOfBookQuoteAmounts = [], latestSlot, }) {
|
|
105
|
-
const updatedAmm = (0, amm_1.calculateUpdatedAMM)(marketAccount.amm,
|
|
109
|
+
const updatedAmm = (0, amm_1.calculateUpdatedAMM)(marketAccount.amm, mmOraclePriceData);
|
|
106
110
|
const paused = (0, exchangeStatus_1.isOperationPaused)(marketAccount.pausedOperations, types_1.PerpOperation.AMM_FILL);
|
|
107
111
|
let [openBids, openAsks] = paused
|
|
108
112
|
? [numericConstants_1.ZERO, numericConstants_1.ZERO]
|
|
@@ -208,8 +212,9 @@ function groupL2Levels(levels, grouping, direction, depth) {
|
|
|
208
212
|
const currentLevel = cloneL2Level(groupedLevels[groupedLevels.length - 1]);
|
|
209
213
|
currentLevel.size = currentLevel.size.add(size);
|
|
210
214
|
for (const [source, size] of Object.entries(level.sources)) {
|
|
211
|
-
|
|
212
|
-
|
|
215
|
+
const existingSize = currentLevel.sources[source];
|
|
216
|
+
if (existingSize) {
|
|
217
|
+
currentLevel.sources[source] = existingSize.add(size);
|
|
213
218
|
}
|
|
214
219
|
else {
|
|
215
220
|
currentLevel.sources[source] = size;
|
|
@@ -238,12 +243,13 @@ const mergeByPrice = (bidsOrAsks) => {
|
|
|
238
243
|
const merged = new Map();
|
|
239
244
|
for (const level of bidsOrAsks) {
|
|
240
245
|
const key = level.price.toString();
|
|
241
|
-
|
|
242
|
-
|
|
246
|
+
const existing = merged.get(key);
|
|
247
|
+
if (existing) {
|
|
243
248
|
existing.size = existing.size.add(level.size);
|
|
244
249
|
for (const [source, size] of Object.entries(level.sources)) {
|
|
245
|
-
|
|
246
|
-
|
|
250
|
+
const existingSize = existing.sources[source];
|
|
251
|
+
if (existingSize) {
|
|
252
|
+
existing.sources[source] = existingSize.add(size);
|
|
247
253
|
}
|
|
248
254
|
else {
|
|
249
255
|
existing.sources[source] = size;
|
|
@@ -289,10 +295,11 @@ function uncrossL2(bids, asks, oraclePrice, oracleTwap5Min, markTwap5Min, groupi
|
|
|
289
295
|
if (levels.length > 0 && levels[levels.length - 1].price.eq(newPrice)) {
|
|
290
296
|
levels[levels.length - 1].size = levels[levels.length - 1].size.add(oldLevel.size);
|
|
291
297
|
for (const [source, size] of Object.entries(oldLevel.sources)) {
|
|
292
|
-
|
|
298
|
+
const existingSize = levels[levels.length - 1].sources[source];
|
|
299
|
+
if (existingSize) {
|
|
293
300
|
levels[levels.length - 1].sources = {
|
|
294
301
|
...levels[levels.length - 1].sources,
|
|
295
|
-
[source]:
|
|
302
|
+
[source]: existingSize.add(size),
|
|
296
303
|
};
|
|
297
304
|
}
|
|
298
305
|
else {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { EventType, EventMap, EventSubscriptionOrderDirection, SortFn } from './types';
|
|
2
2
|
declare class Node<Type extends EventType, Event extends EventMap[Type]> {
|
|
3
3
|
event: Event;
|
|
4
|
-
next?: Node<Type, Event
|
|
5
|
-
prev?: Node<Type, Event
|
|
6
|
-
constructor(event: Event, next?: Node<Type, Event
|
|
4
|
+
next?: Node<Type, Event> | undefined;
|
|
5
|
+
prev?: Node<Type, Event> | undefined;
|
|
6
|
+
constructor(event: Event, next?: Node<Type, Event> | undefined, prev?: Node<Type, Event> | undefined);
|
|
7
7
|
}
|
|
8
8
|
export declare class EventList<Type extends EventType> {
|
|
9
9
|
eventType: Type;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventList.d.ts","sourceRoot":"","sources":["../../../src/events/eventList.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,SAAS,EACT,QAAQ,EACR,+BAA+B,EAC/B,MAAM,EACN,MAAM,SAAS,CAAC;AAEjB,cAAM,IAAI,CAAC,IAAI,SAAS,SAAS,EAAE,KAAK,SAAS,QAAQ,CAAC,IAAI,CAAC;IAEtD,KAAK,EAAE,KAAK;IACZ,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"eventList.d.ts","sourceRoot":"","sources":["../../../src/events/eventList.ts"],"names":[],"mappings":"AAAA,OAAO,EACN,SAAS,EACT,QAAQ,EACR,+BAA+B,EAC/B,MAAM,EACN,MAAM,SAAS,CAAC;AAEjB,cAAM,IAAI,CAAC,IAAI,SAAS,SAAS,EAAE,KAAK,SAAS,QAAQ,CAAC,IAAI,CAAC;IAEtD,KAAK,EAAE,KAAK;IACZ,IAAI,CAAC;IACL,IAAI,CAAC;gBAFL,KAAK,EAAE,KAAK,EACZ,IAAI,CAAC,+BAAmB,EACxB,IAAI,CAAC,+BAAmB;CAEhC;AAED,qBAAa,SAAS,CAAC,IAAI,SAAS,SAAS;IAMpC,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,MAAM;IACtB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,cAAc;IARvB,IAAI,SAAK;IACT,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,IAAI,CAAC,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;gBAG1B,SAAS,EAAE,IAAI,EACf,OAAO,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,+BAA+B;IAGjD,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI;IAyC1C,MAAM,IAAI,IAAI;IAoBd,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,EAAE;IAI1B,CAAC,MAAM,CAAC,QAAQ,CAAC;CAOlB"}
|
|
@@ -37,7 +37,7 @@ class EventList {
|
|
|
37
37
|
currentNode = currentNode.next;
|
|
38
38
|
}
|
|
39
39
|
newNode.next = currentNode.next;
|
|
40
|
-
if (
|
|
40
|
+
if (newNode.next !== undefined) {
|
|
41
41
|
newNode.next.prev = newNode;
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
@@ -52,6 +52,9 @@ class EventList {
|
|
|
52
52
|
}
|
|
53
53
|
detach() {
|
|
54
54
|
const node = this.tail;
|
|
55
|
+
if (node === undefined) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
55
58
|
if (node.prev !== undefined) {
|
|
56
59
|
node.prev.next = node.next;
|
|
57
60
|
}
|
|
@@ -22,13 +22,16 @@ export declare class EventSubscriber {
|
|
|
22
22
|
private txEventCache;
|
|
23
23
|
private awaitTxPromises;
|
|
24
24
|
private awaitTxResolver;
|
|
25
|
-
private
|
|
25
|
+
private _logProvider?;
|
|
26
26
|
private _currentProviderType;
|
|
27
27
|
eventEmitter: StrictEventEmitter<EventEmitter, EventSubscriberEvents>;
|
|
28
28
|
private lastSeenSlot;
|
|
29
29
|
private lastSeenBlockTime;
|
|
30
|
-
lastSeenTxSig: string;
|
|
30
|
+
lastSeenTxSig: string | undefined;
|
|
31
|
+
private get logProvider();
|
|
31
32
|
constructor(connection: Connection, program: Program, options?: EventSubscriptionOptions);
|
|
33
|
+
private getLogProviderConfig;
|
|
34
|
+
private getEventTypes;
|
|
32
35
|
get currentProviderType(): LogProviderType;
|
|
33
36
|
private initializeLogProvider;
|
|
34
37
|
private populateInitialEventListMap;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventSubscriber.d.ts","sourceRoot":"","sources":["../../../src/events/eventSubscriber.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAa,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAEN,wBAAwB,EACxB,SAAS,EACT,aAAa,EACb,QAAQ,EAER,qBAAqB,EAGrB,eAAe,
|
|
1
|
+
{"version":3,"file":"eventSubscriber.d.ts","sourceRoot":"","sources":["../../../src/events/eventSubscriber.ts"],"names":[],"mappings":";AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,UAAU,EAAa,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAEN,wBAAwB,EACxB,SAAS,EACT,aAAa,EACb,QAAQ,EAER,qBAAqB,EAGrB,eAAe,EAIf,MAAM,SAAS,CAAC;AAEjB,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,kBAAkB,MAAM,4BAA4B,CAAC;AAK5D,qBAAa,eAAe;IAuB1B,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,OAAO;IACf,OAAO,CAAC,OAAO;IAxBhB,OAAO,CAAC,OAAO,CAAY;IAC3B,OAAO,CAAC,YAAY,CAAuC;IAC3D,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,eAAe,CAAoC;IAC3D,OAAO,CAAC,eAAe,CAAiC;IACxD,OAAO,CAAC,YAAY,CAAC,CAAc;IACnC,OAAO,CAAC,oBAAoB,CAAkB;IACvC,YAAY,EAAE,kBAAkB,CAAC,YAAY,EAAE,qBAAqB,CAAC,CAAC;IAC7E,OAAO,CAAC,YAAY,CAAqB;IACzC,OAAO,CAAC,iBAAiB,CAAqB;IACvC,aAAa,EAAE,MAAM,GAAG,SAAS,CAAC;IAEzC,OAAO,KAAK,WAAW,GAOtB;gBAGQ,UAAU,EAAE,UAAU,EACtB,OAAO,EAAE,OAAO,EAChB,OAAO,GAAE,wBAA0D;IAY5E,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,aAAa;IAOrB,IAAI,mBAAmB,oBAEtB;IAED,OAAO,CAAC,qBAAqB;IA0D7B,OAAO,CAAC,2BAA2B;IA0BnC;;;OAGG;IACH,OAAO,CAAC,0BAA0B;IAuBrB,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IA4D1C,OAAO,CAAC,YAAY;IA2DP,eAAe,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAmClD,WAAW,IAAI,OAAO,CAAC,OAAO,CAAC;IAS5C,OAAO,CAAC,mBAAmB;IA8BpB,OAAO,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBnD,YAAY,CAAC,IAAI,SAAS,MAAM,QAAQ,EAC9C,SAAS,EAAE,IAAI,GACb,SAAS,CAAC,IAAI,CAAC;IAIlB;;;;;OAKG;IACI,cAAc,CAAC,IAAI,SAAS,SAAS,EAC3C,SAAS,EAAE,IAAI,GACb,QAAQ,CAAC,IAAI,CAAC,EAAE;IAUZ,aAAa,CAAC,KAAK,EAAE,oBAAoB,GAAG,aAAa,GAAG,SAAS;CAG5E"}
|
|
@@ -12,6 +12,12 @@ const sort_1 = require("./sort");
|
|
|
12
12
|
const parse_1 = require("./parse");
|
|
13
13
|
const eventsServerLogProvider_1 = require("./eventsServerLogProvider");
|
|
14
14
|
class EventSubscriber {
|
|
15
|
+
get logProvider() {
|
|
16
|
+
if (!this._logProvider) {
|
|
17
|
+
throw new Error('EventSubscriber: logProvider accessed before initializeLogProvider()');
|
|
18
|
+
}
|
|
19
|
+
return this._logProvider;
|
|
20
|
+
}
|
|
15
21
|
constructor(connection, program, options = types_1.DefaultEventSubscriptionOptions) {
|
|
16
22
|
var _a;
|
|
17
23
|
this.connection = connection;
|
|
@@ -24,18 +30,31 @@ class EventSubscriber {
|
|
|
24
30
|
this.txEventCache = new txEventCache_1.TxEventCache(this.options.maxTx);
|
|
25
31
|
this.eventListMap = new Map();
|
|
26
32
|
this.eventEmitter = new events_1.EventEmitter();
|
|
27
|
-
this._currentProviderType = this.
|
|
33
|
+
this._currentProviderType = this.getLogProviderConfig().type;
|
|
28
34
|
this.initializeLogProvider();
|
|
29
35
|
}
|
|
36
|
+
getLogProviderConfig() {
|
|
37
|
+
if (this.options.logProviderConfig === undefined) {
|
|
38
|
+
throw new Error('EventSubscriber: logProviderConfig is not set');
|
|
39
|
+
}
|
|
40
|
+
return this.options.logProviderConfig;
|
|
41
|
+
}
|
|
42
|
+
getEventTypes() {
|
|
43
|
+
if (this.options.eventTypes === undefined) {
|
|
44
|
+
throw new Error('EventSubscriber: eventTypes is not set');
|
|
45
|
+
}
|
|
46
|
+
return this.options.eventTypes;
|
|
47
|
+
}
|
|
30
48
|
get currentProviderType() {
|
|
31
49
|
return this._currentProviderType;
|
|
32
50
|
}
|
|
33
51
|
initializeLogProvider(subscribe = false) {
|
|
34
|
-
|
|
52
|
+
var _a, _b;
|
|
53
|
+
const logProviderConfig = this.getLogProviderConfig();
|
|
35
54
|
if (this._currentProviderType === 'websocket') {
|
|
36
|
-
this.
|
|
55
|
+
this._logProvider = new webSocketLogProvider_1.WebSocketLogProvider(
|
|
37
56
|
// @ts-ignore
|
|
38
|
-
this.connection, this.address, this.options.commitment,
|
|
57
|
+
this.connection, this.address, (_a = this.options.commitment) !== null && _a !== void 0 ? _a : 'confirmed', logProviderConfig.resubTimeoutMs);
|
|
39
58
|
}
|
|
40
59
|
else if (this._currentProviderType === 'polling') {
|
|
41
60
|
const frequency = 'frequency' in logProviderConfig
|
|
@@ -44,12 +63,12 @@ class EventSubscriber {
|
|
|
44
63
|
const batchSize = 'batchSize' in logProviderConfig
|
|
45
64
|
? logProviderConfig.batchSize
|
|
46
65
|
: logProviderConfig.fallbackBatchSize;
|
|
47
|
-
this.
|
|
66
|
+
this._logProvider = new pollingLogProvider_1.PollingLogProvider(
|
|
48
67
|
// @ts-ignore
|
|
49
|
-
this.connection, this.address, this.options.commitment, frequency, batchSize);
|
|
68
|
+
this.connection, this.address, (_b = this.options.commitment) !== null && _b !== void 0 ? _b : 'confirmed', frequency, batchSize);
|
|
50
69
|
}
|
|
51
70
|
else if (this._currentProviderType === 'events-server') {
|
|
52
|
-
this.
|
|
71
|
+
this._logProvider = new eventsServerLogProvider_1.EventsServerLogProvider(logProviderConfig.url, this.getEventTypes(), this.options.address ? this.options.address.toString() : undefined);
|
|
53
72
|
}
|
|
54
73
|
else {
|
|
55
74
|
throw new Error(`Invalid log provider type: ${this._currentProviderType}`);
|
|
@@ -61,8 +80,16 @@ class EventSubscriber {
|
|
|
61
80
|
}
|
|
62
81
|
}
|
|
63
82
|
populateInitialEventListMap() {
|
|
64
|
-
|
|
65
|
-
|
|
83
|
+
const maxEventsPerType = this.options.maxEventsPerType;
|
|
84
|
+
const orderBy = this.options.orderBy;
|
|
85
|
+
const orderDir = this.options.orderDir;
|
|
86
|
+
if (maxEventsPerType === undefined ||
|
|
87
|
+
orderBy === undefined ||
|
|
88
|
+
orderDir === undefined) {
|
|
89
|
+
throw new Error('EventSubscriber: maxEventsPerType, orderBy and orderDir must be set');
|
|
90
|
+
}
|
|
91
|
+
for (const eventType of this.getEventTypes()) {
|
|
92
|
+
this.eventListMap.set(eventType, new eventList_1.EventList(eventType, maxEventsPerType, (0, sort_1.getSortFn)(orderBy, orderDir), orderDir));
|
|
66
93
|
}
|
|
67
94
|
}
|
|
68
95
|
/**
|
|
@@ -87,22 +114,27 @@ class EventSubscriber {
|
|
|
87
114
|
this._currentProviderType = nextProviderType;
|
|
88
115
|
}
|
|
89
116
|
async subscribe() {
|
|
117
|
+
var _a;
|
|
90
118
|
try {
|
|
91
119
|
if (this.logProvider.isSubscribed()) {
|
|
92
120
|
return true;
|
|
93
121
|
}
|
|
94
122
|
this.populateInitialEventListMap();
|
|
95
|
-
if (this.
|
|
96
|
-
this.
|
|
97
|
-
const logProviderConfig = this.
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
123
|
+
if (this.getLogProviderConfig().type === 'websocket' ||
|
|
124
|
+
this.getLogProviderConfig().type === 'events-server') {
|
|
125
|
+
const logProviderConfig = this.getLogProviderConfig();
|
|
126
|
+
// `maxReconnectAttempts` is optional; when unset the original
|
|
127
|
+
// `reconnectAttempts > undefined` comparison was always false, so
|
|
128
|
+
// fall back to Infinity to preserve that never-trigger behavior.
|
|
129
|
+
const maxReconnectAttempts = (_a = logProviderConfig.maxReconnectAttempts) !== null && _a !== void 0 ? _a : Infinity;
|
|
130
|
+
const eventEmitter = this.logProvider.eventEmitter;
|
|
131
|
+
if (eventEmitter) {
|
|
132
|
+
eventEmitter.on('reconnect', async (reconnectAttempts) => {
|
|
133
|
+
if (reconnectAttempts > maxReconnectAttempts) {
|
|
134
|
+
console.log(`EventSubscriber: Reconnect attempts ${reconnectAttempts}/${maxReconnectAttempts}, reconnecting...`);
|
|
135
|
+
eventEmitter.removeAllListeners('reconnect');
|
|
104
136
|
await this.unsubscribe();
|
|
105
|
-
this.updateFallbackProviderType(reconnectAttempts,
|
|
137
|
+
this.updateFallbackProviderType(reconnectAttempts, maxReconnectAttempts);
|
|
106
138
|
this.initializeLogProvider(true);
|
|
107
139
|
}
|
|
108
140
|
});
|
|
@@ -125,7 +157,11 @@ class EventSubscriber {
|
|
|
125
157
|
}
|
|
126
158
|
const wrappedEvents = this.parseEventsFromLogs(txSig, slot, logs, txSigIndex);
|
|
127
159
|
for (const wrappedEvent of wrappedEvents) {
|
|
128
|
-
this.eventListMap.get(wrappedEvent.eventType)
|
|
160
|
+
const eventList = this.eventListMap.get(wrappedEvent.eventType);
|
|
161
|
+
if (eventList === undefined) {
|
|
162
|
+
throw new Error(`EventSubscriber: no EventList for eventType ${wrappedEvent.eventType}`);
|
|
163
|
+
}
|
|
164
|
+
eventList.insert(wrappedEvent);
|
|
129
165
|
}
|
|
130
166
|
// dont emit event till we've added all the events to the eventListMap
|
|
131
167
|
for (const wrappedEvent of wrappedEvents) {
|
|
@@ -133,7 +169,10 @@ class EventSubscriber {
|
|
|
133
169
|
}
|
|
134
170
|
if (this.awaitTxPromises.has(txSig)) {
|
|
135
171
|
this.awaitTxPromises.delete(txSig);
|
|
136
|
-
this.awaitTxResolver.get(txSig)
|
|
172
|
+
const resolver = this.awaitTxResolver.get(txSig);
|
|
173
|
+
if (resolver !== undefined) {
|
|
174
|
+
resolver();
|
|
175
|
+
}
|
|
137
176
|
this.awaitTxResolver.delete(txSig);
|
|
138
177
|
}
|
|
139
178
|
if (!this.lastSeenSlot || slot > this.lastSeenSlot) {
|
|
@@ -141,7 +180,8 @@ class EventSubscriber {
|
|
|
141
180
|
this.lastSeenSlot = slot;
|
|
142
181
|
}
|
|
143
182
|
if (this.lastSeenBlockTime === undefined ||
|
|
144
|
-
mostRecentBlockTime
|
|
183
|
+
(mostRecentBlockTime !== undefined &&
|
|
184
|
+
mostRecentBlockTime > this.lastSeenBlockTime)) {
|
|
145
185
|
this.lastSeenBlockTime = mostRecentBlockTime;
|
|
146
186
|
}
|
|
147
187
|
this.txEventCache.add(txSig, wrappedEvents);
|
|
@@ -153,7 +193,11 @@ class EventSubscriber {
|
|
|
153
193
|
let txFetched = 0;
|
|
154
194
|
let beforeTx = undefined;
|
|
155
195
|
const untilTx = this.options.untilTx;
|
|
156
|
-
|
|
196
|
+
const maxTx = this.options.maxTx;
|
|
197
|
+
if (maxTx === undefined) {
|
|
198
|
+
throw new Error('EventSubscriber: maxTx is not set');
|
|
199
|
+
}
|
|
200
|
+
while (txFetched < maxTx) {
|
|
157
201
|
const response = await (0, fetchLogs_1.fetchLogs)(
|
|
158
202
|
// @ts-ignore
|
|
159
203
|
this.connection, this.address, this.options.commitment === 'finalized' ? 'finalized' : 'confirmed', beforeTx, untilTx);
|
|
@@ -198,8 +242,9 @@ class EventSubscriber {
|
|
|
198
242
|
return records;
|
|
199
243
|
}
|
|
200
244
|
awaitTx(txSig) {
|
|
201
|
-
|
|
202
|
-
|
|
245
|
+
const existingPromise = this.awaitTxPromises.get(txSig);
|
|
246
|
+
if (existingPromise !== undefined) {
|
|
247
|
+
return existingPromise;
|
|
203
248
|
}
|
|
204
249
|
if (this.txEventCache.has(txSig)) {
|
|
205
250
|
return Promise.resolve();
|
|
@@ -220,7 +265,11 @@ class EventSubscriber {
|
|
|
220
265
|
* @param eventType
|
|
221
266
|
*/
|
|
222
267
|
getEventsArray(eventType) {
|
|
223
|
-
|
|
268
|
+
const eventList = this.eventListMap.get(eventType);
|
|
269
|
+
if (eventList === undefined) {
|
|
270
|
+
throw new Error(`EventSubscriber: no EventList for eventType ${eventType}`);
|
|
271
|
+
}
|
|
272
|
+
return eventList.toArray();
|
|
224
273
|
}
|
|
225
274
|
getEventsByTx(txSig) {
|
|
226
275
|
return this.txEventCache.get(txSig);
|
|
@@ -12,8 +12,8 @@ export declare class EventsServerLogProvider implements LogProvider {
|
|
|
12
12
|
private lastHeartbeat;
|
|
13
13
|
private timeoutId?;
|
|
14
14
|
private reconnectAttempts;
|
|
15
|
-
eventEmitter
|
|
16
|
-
constructor(url: string, eventTypes: EventType[], userAccount?: string);
|
|
15
|
+
eventEmitter: EventEmitter;
|
|
16
|
+
constructor(url: string, eventTypes: EventType[], userAccount?: string | undefined);
|
|
17
17
|
isSubscribed(): boolean;
|
|
18
18
|
subscribe(callback: logProviderCallback): Promise<boolean>;
|
|
19
19
|
unsubscribe(external?: boolean): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventsServerLogProvider.d.ts","sourceRoot":"","sources":["../../../src/events/eventsServerLogProvider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAatC,qBAAa,uBAAwB,YAAW,WAAW;IAWzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAZ9B,OAAO,CAAC,EAAE,CAAC,CAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAsB;IACvC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,iBAAiB,CAAK;IAC9B,YAAY,
|
|
1
|
+
{"version":3,"file":"eventsServerLogProvider.d.ts","sourceRoot":"","sources":["../../../src/events/eventsServerLogProvider.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAatC,qBAAa,uBAAwB,YAAW,WAAW;IAWzD,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;IAZ9B,OAAO,CAAC,EAAE,CAAC,CAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,CAAsB;IACvC,OAAO,CAAC,eAAe,CAAS;IAChC,OAAO,CAAC,mBAAmB,CAAS;IACpC,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,SAAS,CAAC,CAAgC;IAClD,OAAO,CAAC,iBAAiB,CAAK;IAC9B,YAAY,EAAE,YAAY,CAAsB;gBAG9B,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,SAAS,EAAE,EACvB,WAAW,CAAC,oBAAQ;IAG/B,YAAY,IAAI,OAAO;IAIjB,SAAS,CAAC,QAAQ,EAAE,mBAAmB,GAAG,OAAO,CAAC,OAAO,CAAC;IAgF1D,WAAW,CAAC,QAAQ,UAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAkB5D,OAAO,CAAC,UAAU;CA2BlB"}
|