Skip to content
Open
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
13 changes: 13 additions & 0 deletions config/default.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,16 @@ binance:
url: '' # rpc url
timeout: 10 # rpc request timeout (in seconds)
# authToken: # rpc auth token
handshake:
type: 'rpc' # options: rpc
initial:
height: -1 # initial height of scanning
interval: 180 # scanning interval (in seconds)
rpc:
timeout: 10 # rpc request timeout (in seconds)
url: '' # rpc url
# username: '' # rpc username for authentication required instances
# password: '' # rpc password for authentication required instances
ergo:
network: 'Mainnet' # ergo network type. testnet or mainnet
type: 'node' # ergo scanner type. options: node, explorer
Expand Down Expand Up @@ -137,6 +147,9 @@ healthCheck:
scanner:
warnDifference: 5 # warning difference between existing and scanned blocks height
criticalDifference: 20 # critical difference between existing and scanned blocks height
handshakeScanner:
warnDifference: 2 # warning difference between existing and scanned blocks height
criticalDifference: 10 # critical difference between existing and scanned blocks height
permit:
warnCommitmentCount: 4 # warning remaining permits for creating commitment
criticalCommitmentCount: 0 # critical remaining permits for creating commitment
Expand Down
2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@
"@rosen-bridge/evm-observation-extractor": "^5.4.1",
"@rosen-bridge/evm-scanner": "^0.1.4",
"@rosen-bridge/extended-typeorm": "1.0.1",
"@rosen-bridge/handshake-rpc-observation-extractor": "^0.1.0",
"@rosen-bridge/handshake-rpc-scanner": "^0.1.0",
"@rosen-bridge/health-check": "^8.0.0",
"@rosen-bridge/json-bigint": "^1.1.0",
"@rosen-bridge/log-level-check": "^3.0.0",
Expand Down
36 changes: 36 additions & 0 deletions src/config/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const supportedNetworks: Array<NetworkType> = [
Constants.DOGE_CHAIN_NAME,
Constants.ETHEREUM_CHAIN_NAME,
Constants.BINANCE_CHAIN_NAME,
Constants.HANDSHAKE_CHAIN_NAME,
];

interface ConfigType {
Expand All @@ -30,6 +31,7 @@ interface ConfigType {
ethereum: EthereumConfig;
binance: BinanceConfig;
doge: DogeConfig;
handshake: HandshakeConfig;
general: Config;
rosen: RosenConfig;
database: DatabaseConfig;
Expand Down Expand Up @@ -596,6 +598,37 @@ class BinanceConfig {
}
}

class HandshakeConfig {
type: string;
initialHeight: number;
interval: number;
rpc?: {
url: string;
timeout: number;
username?: string;
password?: string;
};

constructor(network: string) {
this.type = config.get<string>('handshake.type');
if (network === Constants.HANDSHAKE_CHAIN_NAME) {
this.initialHeight = getRequiredNumber('handshake.initial.height');
this.interval = getRequiredNumber('handshake.interval');
if (this.type == Constants.RPC_TYPE) {
const url = getRequiredString('handshake.rpc.url');
const timeout = getRequiredNumber('handshake.rpc.timeout');
const username = getOptionalString('handshake.rpc.username', undefined);
const password = getOptionalString('handshake.rpc.password', undefined);
this.rpc = { url, timeout, username, password };
} else {
throw new Error(
`Improperly configured. handshake configuration type is invalid available choices are '${Constants.RPC_TYPE}'`
);
}
}
}
}

class DatabaseConfig {
type: string;
path = '';
Expand Down Expand Up @@ -706,6 +739,7 @@ const getConfig = (): ConfigType => {
const doge = new DogeConfig(general.networkWatcher);
const ethereum = new EthereumConfig(general.networkWatcher);
const binance = new BinanceConfig(general.networkWatcher);
const handshake = new HandshakeConfig(general.networkWatcher);
const rosen = new RosenConfig(
general.networkWatcher,
general.rosenConfigPath
Expand All @@ -720,6 +754,7 @@ const getConfig = (): ConfigType => {
doge,
ethereum,
binance,
handshake,
logger,
general,
rosen,
Expand All @@ -741,4 +776,5 @@ export {
EthereumConfig,
BinanceConfig,
DogeConfig,
HandshakeConfig,
};
2 changes: 2 additions & 0 deletions src/config/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ export const BITCOIN_RUNES_CHAIN_NAME = 'bitcoin-runes';
export const DOGE_CHAIN_NAME = 'doge';
export const ETHEREUM_CHAIN_NAME = 'ethereum';
export const BINANCE_CHAIN_NAME = 'binance';
export const HANDSHAKE_CHAIN_NAME = 'handshake';
export const ERGO_NATIVE_ASSET = 'erg';
export const ERGO_DECIMALS = 9;
export const DEFAULT_API_LIMIT = 20;
Expand All @@ -33,5 +34,6 @@ export const CARDANO_BLOCK_TIME = 20;
export const ERGO_BLOCK_TIME = 120;
export const ETHEREUM_BLOCK_TIME = 12;
export const DOGE_BLOCK_TIME = 60;
export const HANDSHAKE_BLOCK_TIME = 600;
export const UNISAT_TYPE = 'unisat';
export const ORDISCAN_TYPE = 'ordiscan';
7 changes: 7 additions & 0 deletions src/jobs/initScanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ const {
doge: dogeConfig,
ethereum: ethereumConfig,
binance: binanceConfig,
handshake: handshakeConfig,
} = allConfig;

const logger = CallbackLoggerFactory.getInstance().getLogger(import.meta.url);
Expand Down Expand Up @@ -80,6 +81,12 @@ export const scannerInit = () => {
scanner.getObservationScanner() as EvmRpcScanner
).then(() => null);
break;
case Constants.HANDSHAKE_CHAIN_NAME:
scanningJob(
handshakeConfig.interval,
scanner.getObservationScanner() as GeneralScanner<unknown>
).then(() => null);
break;
case Constants.ERGO_CHAIN_NAME:
break;
default:
Expand Down
3 changes: 2 additions & 1 deletion src/types/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ type NetworkType =
| typeof Constants.BITCOIN_RUNES_CHAIN_NAME
| typeof Constants.DOGE_CHAIN_NAME
| typeof Constants.ETHEREUM_CHAIN_NAME
| typeof Constants.BINANCE_CHAIN_NAME;
| typeof Constants.BINANCE_CHAIN_NAME
| typeof Constants.HANDSHAKE_CHAIN_NAME;

export { NetworkType };
7 changes: 7 additions & 0 deletions src/utils/healthCheck.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ import {
ETHEREUM_BLOCK_TIME,
ETHEREUM_CHAIN_NAME,
EXPLORER_TYPE,
HANDSHAKE_BLOCK_TIME,
HANDSHAKE_CHAIN_NAME,
NODE_TYPE,
OGMIOS_TYPE,
} from '../config/constants';
Expand Down Expand Up @@ -248,6 +250,11 @@ class HealthCheckSingleton {
chainBlockTime = BINANCE_BLOCK_TIME;
updateInterval = getConfig().binance.interval;
break;
case HANDSHAKE_CHAIN_NAME:
chainName = HANDSHAKE_CHAIN_NAME;
chainBlockTime = HANDSHAKE_BLOCK_TIME;
updateInterval = getConfig().handshake.interval;
break;
}

scannerSyncCheck = new ScannerSyncHealthCheckParam(
Expand Down
38 changes: 38 additions & 0 deletions src/utils/networkConnectorManagers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ import {
EsploraNetwork,
BitcoinEsploraTransaction,
} from '@rosen-bridge/bitcoin-scanner';
import {
HandshakeRpcTransaction,
HandshakeRpcNetwork,
} from '@rosen-bridge/handshake-rpc-scanner';
import {
KoiosNetwork,
BlockFrostNetwork,
Expand All @@ -40,6 +44,8 @@ const bitcoinLogger =
CallbackLoggerFactory.getInstance().getLogger('bitcoin-connector');
const dogeLogger =
CallbackLoggerFactory.getInstance().getLogger('doge-connector');
const handshakeLogger =
CallbackLoggerFactory.getInstance().getLogger('handshake-connector');
const cardanoKoiosLogger = CallbackLoggerFactory.getInstance().getLogger(
'cardano-koios-connector'
);
Expand Down Expand Up @@ -282,3 +288,35 @@ export const createEvmNetworkConnectorManager = (chainName: string) => {

return networkConnectorManager;
};

/**
* Creates and configures a NetworkConnectorManager instance for Handshake RPC scanner
*/
export const createHandshakeRpcNetworkConnectorManager = () => {
const networkConnectorManager =
new NetworkConnectorManager<HandshakeRpcTransaction>(
new FailoverStrategy(),
handshakeLogger
);

if (config.handshake.rpc) {
networkConnectorManager.addConnector(
new HandshakeRpcNetwork(
config.handshake.rpc.url,
config.handshake.rpc.timeout * 1000,
config.handshake.rpc.username && config.handshake.rpc.password
? {
username: config.handshake.rpc.username,
password: config.handshake.rpc.password,
}
: undefined
)
);
} else {
throw new Error(
'Rpc configuration must be provided for Handshake Rpc network'
);
}

return networkConnectorManager;
};
41 changes: 39 additions & 2 deletions src/utils/scanner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@ import {
BitcoinRpcScanner,
DogeRpcScanner,
} from '@rosen-bridge/bitcoin-scanner';
import { HandshakeRpcScanner } from '@rosen-bridge/handshake-rpc-scanner';
import {
BitcoinEsploraObservationExtractor,
BitcoinRpcObservationExtractor,
DogeEsploraObservationExtractor,
DogeRpcObservationExtractor,
} from '@rosen-bridge/bitcoin-observation-extractor';
import { HandshakeRpcObservationExtractor } from '@rosen-bridge/handshake-rpc-observation-extractor';
import { CallbackLoggerFactory } from '@rosen-bridge/callback-logger';
import { ErgoObservationExtractor } from '@rosen-bridge/ergo-observation-extractor';
import {
Expand Down Expand Up @@ -55,6 +57,7 @@ import {
RosenConfig,
DogeConfig,
BitcoinRunesConfig,
HandshakeConfig,
} from '../config/config';
import * as Constants from '../config/constants';
import { TokensConfig } from '../config/tokensConfig';
Expand All @@ -68,6 +71,7 @@ import {
createEvmNetworkConnectorManager,
createErgoNodeNetworkConnectorManager,
createErgoExplorerNetworkConnectorManager,
createHandshakeRpcNetworkConnectorManager,
} from './networkConnectorManagers';

/**
Expand Down Expand Up @@ -111,7 +115,8 @@ class CreateScanner {
| BitcoinRpcScanner
| DogeEsploraScanner
| DogeRpcScanner
| EvmRpcScanner;
| EvmRpcScanner
| HandshakeRpcScanner;

private constructor() {
// do nothing
Expand All @@ -133,6 +138,7 @@ class CreateScanner {
doge: dogeConfig,
ethereum: ethereumConfig,
binance: binanceConfig,
handshake: handshakeConfig,
} = allConfig;

await CreateScanner.instance.createErgoScanner(config, rosenConfig);
Expand Down Expand Up @@ -180,6 +186,12 @@ class CreateScanner {
config.observationStoreRawData
);
break;
case Constants.HANDSHAKE_CHAIN_NAME:
await CreateScanner.instance.createHandshakeScanner(
handshakeConfig,
rosenConfig
);
break;
}
if (!CreateScanner.instance.observationScanner)
throw Error(
Expand Down Expand Up @@ -221,7 +233,8 @@ class CreateScanner {
| BitcoinRpcScanner
| DogeEsploraScanner
| DogeRpcScanner
| EvmRpcScanner => {
| EvmRpcScanner
| HandshakeRpcScanner => {
if (!CreateScanner.instance) {
throw new Error('Scanner is not initialized');
}
Expand Down Expand Up @@ -577,6 +590,30 @@ class CreateScanner {
}
}
};

private createHandshakeScanner = async (
handshakeConfig: HandshakeConfig,
rosenConfig: RosenConfig
) => {
if (!this.observationScanner) {
if (handshakeConfig.rpc) {
this.observationScanner = new HandshakeRpcScanner({
dataSource,
initialHeight: handshakeConfig.initialHeight,
network: createHandshakeRpcNetworkConnectorManager(),
logger: loggers.observationScannerLogger,
});

const observationExtractor = new HandshakeRpcObservationExtractor(
rosenConfig.lockAddress,
dataSource,
TokensConfig.getInstance().getTokenMap(),
loggers.observationExtractorLogger
);
this.observationScanner.registerExtractor(observationExtractor);
}
}
};
}

export { CreateScanner };