Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion node/coinstacks/arbitrum-nova/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0"
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0"
}
}
2 changes: 1 addition & 1 deletion node/coinstacks/arbitrum-nova/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
Registry,
BlockHandler,
TransactionHandler,
Prometheus,
} from '@shapeshiftoss/common-api'
import { Tx as BlockbookTx, WebsocketClient, getAddresses, NewBlock } from '@shapeshiftoss/blockbook'
import { Logger } from '@shapeshiftoss/logger'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { gasOracle, service } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
3 changes: 2 additions & 1 deletion node/coinstacks/arbitrum/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0"
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0"
}
}
3 changes: 2 additions & 1 deletion node/coinstacks/arbitrum/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import express from 'express'
import { join } from 'path'
import { Server } from 'ws'
import swaggerUi from 'swagger-ui-express'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler, Prometheus } from '@shapeshiftoss/common-api'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler } from '@shapeshiftoss/common-api'
import { Logger } from '@shapeshiftoss/logger'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { cache, service } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
3 changes: 2 additions & 1 deletion node/coinstacks/avalanche/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0"
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0"
}
}
3 changes: 2 additions & 1 deletion node/coinstacks/avalanche/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import express from 'express'
import { join } from 'path'
import { Server } from 'ws'
import swaggerUi from 'swagger-ui-express'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler, Prometheus } from '@shapeshiftoss/common-api'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler } from '@shapeshiftoss/common-api'
import { Logger } from '@shapeshiftoss/logger'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { service } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
3 changes: 2 additions & 1 deletion node/coinstacks/base/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0"
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0"
}
}
2 changes: 1 addition & 1 deletion node/coinstacks/base/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
Registry,
AddressFormatter,
TransactionHandler,
Prometheus,
} from '@shapeshiftoss/common-api'
import { Tx as BlockbookTx, WebsocketClient, getAddresses } from '@shapeshiftoss/blockbook'
import { Logger } from '@shapeshiftoss/logger'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { BlockbookService } from '../../../common/api/src/evm/blockbookService'
import { MoralisService } from '../../../common/api/src/evm/moralisService'
import { gasOracle, service } from './controller'
Expand Down
1 change: 1 addition & 0 deletions node/coinstacks/bitcoin/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0",
"bech32": "^2.0.0"
}
}
10 changes: 2 additions & 8 deletions node/coinstacks/bitcoin/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ import { join } from 'path'
import { Server } from 'ws'
import swaggerUi from 'swagger-ui-express'
import { Logger } from '@shapeshiftoss/logger'
import {
middleware,
ConnectionHandler,
Registry,
BlockHandler,
TransactionHandler,
Prometheus,
} from '@shapeshiftoss/common-api'
import { middleware, ConnectionHandler, Registry, BlockHandler, TransactionHandler } from '@shapeshiftoss/common-api'
import { getAddresses, NewBlock, Tx as BlockbookTx, WebsocketClient } from '@shapeshiftoss/blockbook'
import { utxo } from '@shapeshiftoss/common-api'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { service, formatAddress } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
1 change: 1 addition & 0 deletions node/coinstacks/bitcoincash/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0",
"bech32": "^2.0.0"
}
}
10 changes: 2 additions & 8 deletions node/coinstacks/bitcoincash/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,10 @@ import { join } from 'path'
import { Server } from 'ws'
import swaggerUi from 'swagger-ui-express'
import { Logger } from '@shapeshiftoss/logger'
import {
middleware,
ConnectionHandler,
Registry,
BlockHandler,
TransactionHandler,
Prometheus,
} from '@shapeshiftoss/common-api'
import { middleware, ConnectionHandler, Registry, BlockHandler, TransactionHandler } from '@shapeshiftoss/common-api'
import { getAddresses, NewBlock, Tx as BlockbookTx, WebsocketClient } from '@shapeshiftoss/blockbook'
import { utxo } from '@shapeshiftoss/common-api'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { service, formatAddress } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
3 changes: 2 additions & 1 deletion node/coinstacks/bnbsmartchain/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/common-api": "^10.0.0"
"@shapeshiftoss/common-api": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0"
}
}
3 changes: 2 additions & 1 deletion node/coinstacks/bnbsmartchain/api/src/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import express from 'express'
import { join } from 'path'
import { Server } from 'ws'
import swaggerUi from 'swagger-ui-express'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler, Prometheus } from '@shapeshiftoss/common-api'
import { evm, middleware, ConnectionHandler, Registry, TransactionHandler } from '@shapeshiftoss/common-api'
import { Logger } from '@shapeshiftoss/logger'
import { Prometheus } from '@shapeshiftoss/prometheus'
import { service } from './controller'
import { RegisterRoutes } from './routes'

Expand Down
1 change: 1 addition & 0 deletions node/coinstacks/common/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
},
"dependencies": {
"@shapeshiftoss/blockbook": "^10.0.0",
"@shapeshiftoss/prometheus": "^10.0.0",
"@shapeshiftoss/websocket": "^10.0.0",
"bignumber.js": "^9.1.2",
"uuid": "^9.0.1",
Expand Down
5 changes: 3 additions & 2 deletions node/coinstacks/common/api/src/evm/moralisService.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { EvmChain } from '@moralisweb3/common-evm-utils'
import { EvmStreamResult } from '@moralisweb3/common-streams-utils'
import { Logger } from '@shapeshiftoss/logger'
import { AddressSubscriptionClient } from '@shapeshiftoss/websocket'
import axios from 'axios'
import BigNumber from 'bignumber.js'
import Moralis from 'moralis'
import PQueue from 'p-queue'
import { getAddress, isHex, parseUnits, PublicClient, toHex } from 'viem'
import type { BaseAPI, EstimateGasBody, RPCRequest, RPCResponse, SendTxBody, SubscriptionClient } from '..'
import type { BaseAPI, EstimateGasBody, RPCRequest, RPCResponse, SendTxBody } from '..'
import { ApiError, BadRequestError } from '..'
import { createAxiosRetry, exponentialDelay, handleError, rpcId, validatePageSize } from '../utils'
import type { Account, API, Tx, TxHistory, GasFees, InternalTx, GasEstimate, TokenMetadata } from './models'
Expand Down Expand Up @@ -42,7 +43,7 @@ export interface MoralisServiceArgs {
minPriorityFee?: string
}

export class MoralisService implements Omit<BaseAPI, 'getInfo'>, API, SubscriptionClient {
export class MoralisService implements Omit<BaseAPI, 'getInfo'>, API, AddressSubscriptionClient {
private readonly chain: EvmChain
private readonly logger: Logger
private readonly client: PublicClient
Expand Down
1 change: 0 additions & 1 deletion node/coinstacks/common/api/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export * from './models'
export * as middleware from './middleware'
export * from './websocket'
export * from './registry'
export * from './prometheus'
export * from './utils'

export * as evm from './evm'
Expand Down
2 changes: 1 addition & 1 deletion node/coinstacks/common/api/src/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { Prometheus } from '@shapeshiftoss/prometheus'
import { json, urlencoded, NextFunction, Request, Response } from 'express'
import compression from 'compression'
import morgan from 'morgan'
import cors from 'cors'
import { ValidateError } from 'tsoa'
import { ApiError, NotFoundError } from '.'
import { Prometheus } from './prometheus'

export function errorHandler(err: Error, req: Request, res: Response, next: NextFunction): Response | void {
if (err instanceof ValidateError) {
Expand Down
2 changes: 1 addition & 1 deletion node/coinstacks/common/api/src/registry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export class Registry {

for (const [id, connection] of this.addresses[address].entries()) {
const { subscriptionId } = Registry.fromId(id)
connection.publish(subscriptionId, address, tx)
connection.publish(subscriptionId, { address, data: tx })
}
})
}
Expand Down
Loading