conflict_resolution
stringlengths
27
16k
<<<<<<< ======= var bulk = model.collection.initializeUnorderedBulkOp(); >>>>>>> <<<<<<< let newModel = mongooseHelper.getNewModelFromObject(model, result); var objectId = new Mongoose.Types.ObjectId(result._id); ======= var objectId = Utils.getCastObjectId(model, result._i...
<<<<<<< //this.getHalModel1(association, this.repository.modelName(), this.repository.getEntityType()); //this.sendresult(req, res, association); var parent = (<any>result).toObject(); var association = parent[req.params.pr...
<<<<<<< function isJsonMapEnabled(params: IAssociationParams) { if (params && (params.storageType == StorageType.JSONMAP)) { return true; } return false; } function embedChild(objects: Array<any>, prop, relMetadata: MetaData, parentModelName: string): Q.Promise<any> { ======= function embedChil...
<<<<<<< MetaUtils.addMetaData(target, Decorators.ONETOMANY, DecoratorType.PROPERTY, params, key); //console.log('onetomany - propertyKey: ', key, ', target:', target); ======= Utils.addMetaData(target, Decorators.ONETOMANY, DecoratorType.PROPERTY, params, key); >>>>>>> MetaUtils.addM...
<<<<<<< private dependencyOrder: Map<ClassType, number>; addService(fn: Function, params: any) { serviceMap.set(fn, params); //services.push({ fn: fn, params: params }); } resolve<T>(cls: ClassType): T { this.dependencyOrder = new Map<ClassType, number>(); if (serviceMa...
<<<<<<< import {getEntity, getModel} from './model-entity'; import {MetaUtils} from "../metadata/utils"; import {Decorators} from '../constants'; ======= import {pathRepoMap, getEntity, getModel} from './model-entity'; import {MetaUtils} from "../metadata/utils"; >>>>>>> import {pathRepoMap, getEntity, getModel} fro...
<<<<<<< router.get(this.path + "/search", securityImpl.ensureLoggedIn(), (req, res) => { ======= router.get(this.path + "/search", securityUtils.ensureLoggedIn(), (req, res) => { let links = { "self": { "href": this.getFullBaseUrlUsingRepo(req, this.repository.modelName()) + "/search" } };...
<<<<<<< /* * final state sent to issuer is built as follows: * state = nonce + nonceStateSeparator + additional state * Default separator is ';' (encoded %3B). * In rare cases, this character might be forbidden or inconvenient to use by the issuer so it can be customized. */ public non...
<<<<<<< * * { provide: OAuthStorage, useValue: localStorage } * ======= * * * { provide: OAuthStorage, useFactory: oAuthStorageFactory } * export function oAuthStorageFactory(): OAuthStorage { return localStorage; } * >>>>>>> * * * { provide: OAuthStorage, use...
<<<<<<< import Log from "../utils/log"; import { mergeVideo, mergeVideoNew, download, decrypt } from "../utils/media"; ======= import Logger from '../utils/log'; let Log = Logger.getInstance(); import { mergeVideo, mergeVideoNew } from "../utils/media"; >>>>>>> import Logger from '../utils/log'; let Log = Logger.get...
<<<<<<< techniqueIDSelectionLock: boolean = true; changeTechniqueIDSelectionLock(){ this.techniqueIDSelectionLock = !this.techniqueIDSelectionLock; } ======= showTacticRowBackground: boolean = false; tacticRowBackground: string = "#dddddd"; >>>>>>> techniqueIDSelectionLock: boolean...
<<<<<<< layerLayerOperation(scoreExpression: string, scoreVariables: Map<string, ViewModel>, comments: ViewModel, coloring: ViewModel, enabledness: ViewModel, layerName: string, filters: ViewModel, legendItems: ViewModel): ViewModel { let result = new ViewModel("layer by operation", this.domain); ======= ...
<<<<<<< /** * return an acronym version of the given string * @param words the string of words to get the acrnoym of * @return the acronym string */ acronym(words: string): string { let skipWords = ["on","and", "the", "with", "a", "an", "of", "in", "for", "from"] let ...
<<<<<<< import {RouterModule, Routes} from '@angular/router'; ======= import {MatFormFieldModule} from '@angular/material/form-field'; >>>>>>> import {MatFormFieldModule} from '@angular/material/form-field'; import {RouterModule, Routes} from '@angular/router'; <<<<<<< MdButtonModule, MdCheckboxModule, ...
<<<<<<< function configureFixtureForExternalFeedbackStyleConfiguration( fixture: ComponentFixture<test_components.ConvaiCheckerCustomDemoSettings>) { let demoSettings = getCopyOfDefaultDemoSettings(); demoSettings.communityId = 'testCommunityId'; fixture.componentInstance.setDemoSettings(demoSettings); } ==...
<<<<<<< //% color=300 weight=100 declare namespace neopixel { /** * Gets the default pin for built in neopixels */ //% parts="neopixel" shim=neopixel::defaultPin function defaultPin(): DigitalPin; /** * Sends a neopixel buffer to the specified digital pin * @param pin The pin t...
<<<<<<< * Capacitive pin A4 */ //% indexedInstanceNS=input indexedInstanceShim=pxt::getTouchButton //% block="pin A4" fixedInstance shim=pxt::getTouchButton(0) const pinA4: Button; /** * Capacitive pin A5 */ //% block="pin A5" fixedInstance shim=pxt::getTouchButton(1) const ...
<<<<<<< const copiesById = getCopiesById(state) return copiesById[id] } ======= const { servicePath, keepCopiesInStore, serverAlias } = state if (keepCopiesInStore) { return state.copiesById[id] } else { const Model = _get(models, [serverAlias, 'byServicePath', servi...
<<<<<<< import * as fs from "fs"; ======= import fileType = require("file-type"); import * as fs from "fs-extra"; import * as Zip from "jszip"; >>>>>>> import fileType = require("file-type"); import * as fs from "fs"; <<<<<<< import { ZipFile } from "yauzl"; import { bufferEntry, Entry, open, walkEntries } from "ya...
<<<<<<< volumePower: 5, ======= >>>>>>> volumePower: 5, <<<<<<< if (this.state.stackhelper && _event.detail.needsRender) { window.console.log('INTERACTION_FINISHED'); this.state.renderTask = Math.pow(2, this.state.volumePower); ======= if (this.state.stackhelper) { this.state...
<<<<<<< populateBuiltins(): { blocks: Blocks, inlines: Inlines } { return populateBuiltins(); } abstract hasHelper(helperName: Option<string>[], blockMeta: TemplateMeta): boolean; abstract lookupHelper(helperName: Option<string>[], blockMeta: TemplateMeta): Helper; ======= abstract hasHelper(helperName...
<<<<<<< return new RenderInverseIdentitySyntax({ args, templates }); case 'each': return new EachSyntax({ args, templates }); ======= return new RenderInverseIdentitySyntax({ args: block.args, templates: block.templates }); >>>>>>> return new RenderInverseIdentitySynta...
<<<<<<< ======= public component = <Component>null, public manager: Option<ComponentManager<Component>> = null, public shadow: Option<InlineBlock> = null >>>>>>> <<<<<<< push(start: number, end: number) { ======= push(start: number, end: number, component = <Component>null, manager: Option<Compone...
<<<<<<< import { VM } from './vm'; import RenderResult from './vm/render-result'; import Scanner, { Program, Block } from './scanner'; ======= import { VM, RenderResult, IteratorResult } from './vm'; import Scanner, { EntryPoint, PartialBlock, Layout } from './scanner'; >>>>>>> import { VM, RenderResult, Itera...
<<<<<<< // case 'each': // return new EachSyntax({ args, templates }); ======= case 'each': return new EachSyntax({ args: block.args, templates: block.templates }); >>>>>>> case 'each': return new EachSyntax({ args, templates });
<<<<<<< onChooseValue: (item: TemplateValue) => void ======= onUpdateDefaultTemplateValue: (v: string) => void notify?: (message: Notification) => void >>>>>>> onUpdateDefaultTemplateValue: (item: TemplateValue) => void notify?: (message: Notification) => void
<<<<<<< private _zIndex: number = 0; set zIndex(zIndex: number) { this._renderer.setElementStyle(this._ngEl.nativeElement, "z-index", zIndex.toString()); this._zIndex = zIndex; } get zIndex(): number { return this._zIndex; } ======= private _resizeDirections: string[] = []; >>>>>>> private _resizeDire...
<<<<<<< var addOne = (resp, suff) => { logs.push(RT.App.createInfoMessage('')); logs.push(RT.App.createInfoMessage('---------------------')); logs.push(RT.App.createInfoMessage(wa.website + " -- server log -- " +...
<<<<<<< findReferences: true, gotoNavigation: true, selectStatements: true, stringEditFullScreen: true, recordsSection: true, persistanceRadio: true, databaseSection: true, ...
<<<<<<< const activeRect = new Rect2(ctx.bounds.position, new Vec2(ctx.bounds.width * relative, ctx.bounds.height)); const activeItem = ctx.renderer.createRoundedRectangle(activeRect, 0, 0); ======= const activeBounds = new Rect2(ctx.bounds.x, ctx.bounds.y, ctx.bounds.width * relative, ctx.bou...
<<<<<<< if (!showDebugMarkers) { const boxItem = ctx.renderer.createRectangle(1); ======= if (!showDebugMarkers) { const boxItem = ctx.renderer.createRoundedRectangle(ctx.bounds.inflate(1, 1), 1, 0); >>>>>>> if (showDebugMarkers) { const boxItem = ctx.rende...
<<<<<<< import { Client, ClientConstructor, AccountInfo } from './types/Global' ======= import GoogleAdsError from './Error' import { Client, ClientConstructor } from './types/Global' >>>>>>> import GoogleAdsError from './Error' import { Client, ClientConstructor, AccountInfo } from './types/Global' <<<<<<< ...
<<<<<<< import { IPatchInfoRequestData, IPatchValidateInfoResult, IRpoInfoData as RpoInfoResult } from "./rpoInfo/rpoPath"; import { PatchResult } from "./patch/patchGenerate"; export interface IPermissionsResult { message: string; serverPermissions: { operation: string[]; } } ======= import { IRpoInfoData...
<<<<<<< ======= export const LANGUAGES = [ { label: 'Mongolian', value: 'mn' }, { label: 'English', value: 'en' }, { label: 'French', value: 'fr' }, { label: 'Deustch', value: 'de' }, { label: 'Korean', value: 'kr' }, { label: 'Spanish', value: 'es' }, { label: 'Portuguese', value: 'pt_br' }, { label:...
<<<<<<< bgColor ======= isWatched >>>>>>> bgColor isWatched
<<<<<<< }; export interface IFormProps { errors: any; values: any[]; registerChild: (child: any) => void; runValidations?: (callback: any) => void; } ======= }; export type IOption = { label: string; value: string; avatar?: string; }; >>>>>>> }; export interface IFormProps { errors: any; values:...
<<<<<<< image: '/images/icons/erxes-22.svg', to: '/insights/summary-report', ======= image: '', to: '/inbox/insights/summary-report', >>>>>>> image: '/images/icons/erxes-22.svg', to: '/inbox/insights/summary-report', <<<<<<< image: '/images/icons/erxes-23.svg', to: '/insights/export-...
<<<<<<< import { coins, Erc20Coin } from '@bitgo/statics'; import { BuildTransactionError } from '../baseCoin/errors'; import { InvalidParameterValueError } from '../baseCoin/errors'; import { sendMultiSigData, sendMultiSigTokenData } from './utils'; import { sendMultisigMethodId, sendMultiSigTypes, sendMultiSigT...
<<<<<<< const isAddressMarker = (marker: Marker): marker is AddressMarker => { return (<AddressMarker>marker).address !== undefined; } const isLatLongMarker = (marker: Marker): marker is LatLongMarker => { return (<LatLongMarker>marker).latitude !== undefined && (<LatLongMarker>marker).longitude !== undefined;...
<<<<<<< header?: HeaderFooterPictureWidgetConfig | HeaderFooterButtonWidgetConfig; footer?: HeaderFooterPictureWidgetConfig | HeaderFooterButtonWidgetConfig; } export interface HeaderFooterPictureWidgetConfig extends LovelaceCardConfig { type: "picture" image: string tap_action?: ActionConfig; hold_action?...
<<<<<<< put(PhotoViewingActions.refreshThreadsRequest()), call(refreshTokens), ======= put(ThreadsActions.refreshThreadsRequest()), >>>>>>> put(PhotoViewingActions.refreshThreadsRequest()),
<<<<<<< // import sourceSagas from './containers/Source/sagas' // import bizlogicSagas from './containers/Bizlogic/sagas' import widgetSagas from './containers/Widget/sagas' ======= import sourceSagas from './containers/Source/sagas' import bizlogicSagas from './containers/Bizlogic/sagas' // import widgetSagas from '...
<<<<<<< ======= >>>>>>> <<<<<<< ======= declare var zone: Zone; >>>>>>> declare var zone: Zone;
<<<<<<< import { Home } from './home'; import { RouterActive } from './router-active'; import { MyItemComponent } from './appointment/appointment.component'; import { AppointmentForm } from './appointment/new-appointment.component'; ======= >>>>>>> <<<<<<< pipes: [ ], providers: [ ], directives: [RouterActi...
<<<<<<< import {BeaconChain, ChainEventEmitter, IBeaconChain} from "../../../../src/chain"; ======= import {BeaconChain, IBeaconChain} from "../../../../src/chain"; import {silentLogger} from "../../../utils/logger"; >>>>>>> import {BeaconChain, ChainEventEmitter, IBeaconChain} from "../../../../src/chain"; import {...
<<<<<<< attestation.signature = this.privateKey.signMessage( hashTreeRoot(attestation.data, this.config.types.AttestationData), ======= attestation.signature = this.keypair.privateKey.signMessage( hashTreeRoot(this.config.types.AttestationData, attestation.data), >>>>>>> attestation.signature...
<<<<<<< import {LodestarEventIterator} from "../../../util/events"; ======= import {IBeaconBlocksApi} from "./blocks"; >>>>>>> import {LodestarEventIterator} from "../../../util/events"; import {IBeaconBlocksApi} from "./blocks";
<<<<<<< netA = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger}); netB = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger}); ======= netA = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger: logger, metrics}); netB = new Libp2pNetwork(o...
<<<<<<< import {BeaconDB, LevelDbPersistance} from "../db"; import {EthersEth1Notifier} from "../eth1"; import {P2PNetwork} from "../p2p"; ======= import {LevelDB} from "../db"; import {EthersEth1Notifier, EthersEth1Options} from "../eth1"; import {P2PNetwork, P2pOptions} from "../p2p"; >>>>>>> import {BeaconDB, Le...
<<<<<<< // @ts-ignore import promisify from "promisify-es6"; import {Status, ResponseBody} from "@chainsafe/eth2.0-types"; ======= import {promisify} from "es6-promisify"; import {Hello, ResponseBody} from "@chainsafe/eth2.0-types"; >>>>>>> import {promisify} from "es6-promisify"; import {Status, ResponseBody} fro...
<<<<<<< import {processProposerSlashing} from "../../../../src/chain/stateTransition/block/proposerSlashings"; import {proposerSlashingFromYaml} from "../../../utils/proposerSlashing"; import {equals} from "@chainsafe/ssz"; import {BeaconState} from "../../../../src/types"; ======= import {processProposerSlashing} f...
<<<<<<< const state = await this.db.state.getLatest(); ======= this.logger.verbose("Starting chain"); const state = this.latestState || await this.db.state.getLatest(); this.eth1.initBlockCache(this.config, state); >>>>>>> this.logger.verbose("Starting chain"); const state = await this.db.sta...
<<<<<<< import {processSlots} from "@chainsafe/lodestar-beacon-state-transition/lib/fast/slot"; import {BlockErrorCode} from "../../chain/errors/blockError"; import {IBlockProcessJob} from "../../chain"; import {AttestationErrorCode} from "../../chain/errors/attestationError"; ======= >>>>>>> import {BlockErrorCode}...
<<<<<<< import { clamp, getActiveValidatorIndices, getEpochStartSlot, intSqrt, isActiveValidator, readUIntBE, slotToEpoch, split, } from "../../helpers/stateTransitionHelpers"; import {EpochNumber, SlotNumber, Validator} from "../../types"; import {generateMnemonic} from "bip39"; import {generateValidator} from "../u...
<<<<<<< import {BeaconDB, LevelDbController} from "../db"; import {EthersEth1Notifier, IEth1Notifier} from "../eth1"; import {INetwork, Libp2pNetwork, NodejsNode} from "../network"; ======= import {BeaconDB, LevelDbController, ValidatorDB} from "../db"; import {EthersEth1Notifier, EthersEth1Options, IEth1Notifier} fr...
<<<<<<< import { Slot, bytes32, bytes, uint16, uint64, bytes8, Epoch, number64, Version, Hash, } from "./primitive"; import {BeaconBlock} from "./block"; ======= import {Slot, Hash, bytes, uint16, uint64, bytes8, Epoch, number64} from "./primitive"; import {BeaconBlockBody} from "./block"; import {BeaconBlockHead...
<<<<<<< return await this.getAllData(Bucket.deposit, Deposit); ======= return await this.getAllData(Bucket.genesisDeposit, this.config.types.Deposit); >>>>>>> return await this.getAllData(Bucket.deposit, this.config.types.Deposit); <<<<<<< await this.db.put(encodeKey(Bucket.deposit, index), serializ...
<<<<<<< fastify.get(produceBlockController.url, produceBlockController.opts, produceBlockController.handler); ======= fastify.get(proposerDutiesController.url, proposerDutiesController.opts, proposerDutiesController.handler); >>>>>>> fastify.get(produceBlockController.url, produceBlockController.op...
<<<<<<< try { const [headBlock, validatorIndex] = await Promise.all([ db.block.get(chain.forkChoice.head()), db.getValidatorIndex(validatorPubKey) ]); const headState = await db.state.get(headBlock.stateRoot); await processSlots(config, headState, slot); return await assembleAttestatio...
<<<<<<< import {hash, signingRoot} from "@chainsafe/ssz"; ======= >>>>>>> import {hash, signingRoot} from "@chainsafe/ssz"; <<<<<<< ======= import {signingRoot} from "@chainsafe/ssz"; import {hash} from "../util/crypto"; >>>>>>>
<<<<<<< // import sourceReducer from './containers/Source/reducer' // import bizlogicReducer from './containers/Bizlogic/reducer' import widgetReducer from './containers/Widget/reducer' ======= import sourceReducer from './containers/Source/reducer' import bizlogicReducer from './containers/Bizlogic/reducer' // impor...
<<<<<<< import {IDatabaseController, SearchOptions} from "../interface"; import {Attestation} from "../../../types"; ======= import {SearchOptions} from "../interface"; import {Attestation} from "@chainsafe/eth2.0-types"; import {IDatabaseController} from "../interface"; >>>>>>> import {IDatabaseController, SearchOp...
<<<<<<< export * from "./math"; export * from "./bytes"; export * from "./converters"; ======= export * from "./math"; export * from "./yaml"; >>>>>>> export * from "./math"; export * from "./bytes"; export * from "./converters"; export * from "./yaml";
<<<<<<< import {getCurrentSlot} from "../../chain/stateTransition/util/genesis"; ======= import {INewEpochCallback, INewSlotCallback, IRpcClient} from "./interface"; >>>>>>> import {getCurrentSlot} from "../../chain/stateTransition/util/genesis"; import {INewEpochCallback, INewSlotCallback, IRpcClient} from "./inter...
<<<<<<< it("should reject - bad block", async function () { chainStub.getGenesisTime.returns(Date.now() / 1000 - config.params.SECONDS_PER_SLOT); ======= it("bad block", async function () { sinon.stub(chainStub.clock, "currentSlot").get(() => 1); >>>>>>> it("should reject - bad block", async function (...
<<<<<<< import {BeaconBlock, bytes48, Slot, ValidatorIndex} from "../types"; import {getRandaoMix, slotToEpoch} from "../chain/stateTransition/util"; import {RpcClient} from "./rpc"; ======= /** * @module validator */ import ssz from "@chainsafe/ssz"; import {ValidatorIndex, BeaconBlock, BeaconState, bytes48} fro...
<<<<<<< import {ILMDGHOST, StatefulDagLMDGHOST} from "./forkChoice"; import {computeEpochOfSlot, getAttestingIndices} from "./stateTransition/util"; ======= import {LMDGHOST, StatefulDagLMDGHOST} from "./forkChoice"; import {getAttestingIndices, computeEpochOfSlot, isActiveValidator} from "./stateTransition/util"; >...
<<<<<<< netA = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger}); netB = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger}); ======= netA = new Libp2pNetwork(opts, {config, libp2p: createNode(multiaddr), logger: logger, metrics}); netB = new Libp2pNetwork(o...
<<<<<<< private encodeResponse(method: Method, body: ResponseBody): Buffer { let output: Uint8Array; switch (method) { case Method.Status: output = this.config.types.Status.serialize(body as Status); break; case Method.Goodbye: output = this.config.types.Goodbye.serialize(b...
<<<<<<< import {Module} from "../logger/abstract"; import defaultChainOption, {IChainOptions} from "./options"; import deepmerge from "deepmerge"; ======= import {OpPool} from "../opPool"; import {Block} from "ethers/providers"; export interface IBeaconChainModules { config: IBeaconConfig; opPool: OpPool; db: ...
<<<<<<< await (new Eth1Wallet(wallet.privateKey, defaults.depositContract.abi, config, logger, provider)) .submitValidatorDeposit(options.contract, ethers.utils.parseEther(options.value)); ======= await (new Eth1Wallet(wallet.privateKey, abi, config, logger, provider)) ...
<<<<<<< import {IPeerMetadataStore} from "../../../src/network/peers/interface"; import {Libp2pPeerMetadataStore} from "../../../src/network/peers/metastore"; ======= import {silentLogger} from "../../utils/logger"; >>>>>>> import {IPeerMetadataStore} from "../../../src/network/peers/interface"; import {Libp2pPeerMe...
<<<<<<< * Obtains validator index attached to his public key * @param validatorPublicKey ======= * Requests the BeaconNode to provide a set of “duties”, which are actions that should be performed by ValidatorClients. This API call should be polled at every slot, to ensure that any chain reorganisations are c...
<<<<<<< import {deserialize, serialize} from "@chainsafe/ssz"; ======= >>>>>>>
<<<<<<< import {ArrayDagLMDGHOST, BeaconChain, ChainEventEmitter, IBeaconChain, ILMDGHOST} from "../../../../src/chain"; import {WinstonLogger} from "@chainsafe/lodestar-utils/lib/logger"; ======= import {BeaconChain, IBeaconChain, ILMDGHOST, ArrayDagLMDGHOST, ChainEventEmitter} from "../../../../src/chain"; >>>>>>>...
<<<<<<< slot, index, beaconBlockRoot: signingRoot(headBlock, config.types.BeaconBlock), ======= crosslink: getCrosslinkVote(config, headState, shard, currentEpoch), beaconBlockRoot: signingRoot(config.types.BeaconBlock, headBlock), >>>>>>> slot, index, beaconBlockRoot: signingRoot(con...
<<<<<<< export type Settings = { welcomeShown: boolean; analytics: boolean; bannerDismissed: string[]; logSizeLimit: number; truncateRouteName: boolean; routeMenuSize: number; logsMenuSize: number; }; export interface PreMigrationSettings extends Settings { lastMigration: number; } export type Setting...
<<<<<<< import {bytes48, Slot, Shard, ValidatorIndex, BLSPubkey} from "../types"; import {RpcClient} from "./rpc"; ======= import {Shard, Slot, ValidatorIndex} from "../types"; import {Keypair} from "@chainsafe/bls-js/lib/keypair"; >>>>>>> import {Shard, Slot, ValidatorIndex} from "../types"; import {RpcClient} from...
<<<<<<< choices: ["beacon", "validator"], description: "Pick namespaces to expose for HTTP API", ======= choices: ["beacon", "node", "validator"], >>>>>>> choices: ["beacon", "node", "validator"], description: "Pick namespaces to expose for HTTP API",
<<<<<<< import defaultConf, {IBeaconNodeOptions} from "./options"; ======= >>>>>>> <<<<<<< this.logger = logger.child(this.conf.logger.node); ======= this.logger = logger; this.metrics = new BeaconMetrics(this.conf.metrics); this.metricsServer = new HttpMetricsServer(this.conf.metrics, {metrics: t...
<<<<<<< import { EnvironmentLogs } from 'src/app/types/server.type'; import { dragulaNamespaces as DraggableContainerNames } from 'src/app/types/ui.type'; ======= import { EnvironmentLogs } from 'src/app/types/server.type.js'; import { dragulaNamespaces as DraggableContainerNames, Scroll } from 'src/app/types/ui.typ...
<<<<<<< this.node = new BeaconNode(optionsMap); await this.node.start(); ======= const node = new BeaconNode(optionsMap, {logger}); await node.start(); >>>>>>> this.node = new BeaconNode(optionsMap, {logger}); await this.node.start();
<<<<<<< import {RequestId,} from "../constants"; ======= import {CommitteeIndex} from "@chainsafe/eth2.0-types"; import {RequestId, SHARD_SUBNET_COUNT, SHARD_ATTESTATION_TOPIC, BLOCK_TOPIC, ATTESTATION_TOPIC} from "../constants"; >>>>>>> import {RequestId,} from "../constants"; import {CommitteeIndex} from "@chains...
<<<<<<< logger: logger || new WinstonLogger({level: LogLevel.error}), ======= logger: logger || silentLogger, eth1: new InteropEth1Notifier(), >>>>>>> logger: logger || silentLogger,
<<<<<<< import BN from "bn.js"; import {assert, expect} from "chai"; ======= import {assert} from "chai"; >>>>>>> import {assert, expect} from "chai";
<<<<<<< import defaultLoggerOptions, {IBeaconLoggerOptions, BeaconLoggerOptions} from "./loggerOptions"; ======= import defaultMetricsOptions, {IMetricsOptions} from "../metrics/options"; >>>>>>> import defaultLoggerOptions, {IBeaconLoggerOptions, BeaconLoggerOptions} from "./loggerOptions"; import defaultMetricsOpt...
<<<<<<< import { addEnvironmentAction, addRouteAction, addRouteResponseAction, moveEnvironmentsAction, moveRouteResponsesAction, moveRoutesAction, navigateEnvironmentsAction, navigateRoutesAction, removeEnvironmentAction, removeRouteAction, removeRouteResponseAction, setActiveEnvironmentAction, setActiveEnvironmentLogT...
<<<<<<< import {promisify} from "es6-promisify"; ======= import {serialize} from "@chainsafe/ssz"; >>>>>>> <<<<<<< await promisify<void, string, Uint8Array>(this.pubsub.publish.bind(this.pubsub))( getGossipTopic(GossipEvent.VOLUNTARY_EXIT), Buffer.from(this.config.types.SignedVoluntaryExit.serialize(voluntary...
<<<<<<< import {GossipEncoding} from "../../../../src/network/gossip/encoding"; ======= import {BeaconState} from "@chainsafe/lodestar-types"; >>>>>>> import {GossipEncoding} from "../../../../src/network/gossip/encoding"; import {BeaconState} from "@chainsafe/lodestar-types";
<<<<<<< import {IDiscv5DiscoveryInputOptions} from "@chainsafe/discv5"; import {BeaconNode} from "@chainsafe/lodestar/lib/node"; ======= import {BeaconNode} from "@chainsafe/lodestar"; >>>>>>> import {BeaconNode} from "@chainsafe/lodestar/lib/node"; <<<<<<< ======= import {Validator} from "@chainsafe/lodestar-val...
<<<<<<< // TODO: enable after we add peerbook persisting // //refresh peer statuses // const myStatus = await this.createStatus(); // await Promise.all( // this.network.getPeers().map(async (peerInfo) => { // this.reps.get(peerInfo.id.toB58String()).latestStatus = // await this...
<<<<<<< encodeKeyStub.withArgs(Bucket.deposit, Buffer.alloc(0)).returns('lower'); encodeKeyStub.withArgs(Bucket.deposit + 1, Buffer.alloc(0)).returns('higher'); dbStub.search.resolves([serialize(generateDeposit(), Deposit)]); ======= encodeKeyStub.withArgs(Bucket.genesisDeposit, Buffer.alloc(0)).retur...
<<<<<<< import {AttestationOperations, OpPool} from "../../../../../src/opPool"; import {generateEmptyBlock} from "../../../../utils/block"; import {expect} from "chai"; import {generateState} from "../../../../utils/state"; ======= import {OpPool} from "../../../../../src/opPool"; >>>>>>> import {OpPool} from "../....
<<<<<<< ======= let loggingOptions; if (options.loggingLevel) { loggingOptions = { loggingLevel: LogLevel[options.loggingLevel], }; }else { loggingOptions = { loggingLevel: LogLevel.DEFAULT, }; } logger.setLogLevel(loggingOptions.loggingLevel); >>>>>>> <...
<<<<<<< import {SyncRpc} from "../network/libp2p/syncRpc"; ======= import {ILoggingOptions} from "../logger/interface"; import {Module} from "../logger/abstract"; >>>>>>> import {SyncRpc} from "../network/libp2p/syncRpc"; import {Module} from "../logger/abstract"; <<<<<<< public constructor(opts: Partial<IBeacon...
<<<<<<< import BN from "bn.js"; import { BeaconState, BLSSignature, CommitteeIndex, Epoch, Slot, uint64, Validator, ValidatorIndex, } from "@chainsafe/eth2.0-types"; ======= import {BeaconState, Epoch, uint64, Validator, ValidatorIndex,} from "@chainsafe/eth2.0-types"; >>>>>>> import { BeaconState,...
<<<<<<< ======= "SignedBeaconBlockHeader", "FFGData", >>>>>>> "SignedBeaconBlockHeader",
<<<<<<< for (const type in operations) { types[type] = operations[type](types, params); } for (const type in block) { types[type] = block[type](types, params); } for (const type in state) { types[type] = state[type](types, params); } for (const type in validator) { types[type] = validator[...
<<<<<<< 'use strict'; ======= import {TCP} from "libp2p-tcp"; import {Mplex} from "libp2p-mplex"; import {Bootstrap} from "libp2p-bootstrap"; import {WStar} from "libp2p-webrtc-star"; import {KadDHT} from "libp2p-kad-dht"; import {PeerInfo} from "peer-info"; import {defaultsDeep} from "@nodeutils/defaults-deep"; impo...
<<<<<<< import {BlockRepository, StateRepository} from "../../../src/db/api/beacon/repositories"; import {WinstonLogger} from "@chainsafe/lodestar-utils/lib/logger"; import {generateEmptySignedBlock} from "../../utils/block"; import {generateEmptyAttestation} from "../../utils/attestation"; import {generateState} from ...