@xyo-network/bridge 0.41.0 → 2.32.0-rc.2

package/dist/xyo-bridge-bound-witness-success-listener.js

@@ -1,100 +0,0 @@
-"use strict";
-/*
-* @Author: XY | The Findables Company <ryanxyo>
-* @Date:   Thursday, 7th February 2019 11:32:52 am
-* @Email:  developer@xyfindables.com
-* @Filename: xyo-bound-witness-success-listener.ts
-* @Last modified by: ryanxyo
-* @Last modified time: Thursday, 7th February 2019 11:33:33 am
-* @License: All Rights Reserved
-* @Copyright: Copyright XY | The Findables Company
-*/
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const peer_interaction_1 = require("@xyo-network/peer-interaction");
-const bound_witness_1 = require("@xyo-network/bound-witness");
-const base_1 = require("@xyo-network/base");
-const origin_chain_1 = require("@xyo-network/origin-chain");
-const network_1 = require("@xyo-network/network");
-class XyoBridgeBoundWitnessSuccessListener extends base_1.XyoBase {
-    constructor(hashingProvider, boundWitnessValidator, originChainRepository, originBlockRepository, bridgeQueue, bridgeOption) {
-        super();
-        this.hashingProvider = hashingProvider;
-        this.boundWitnessValidator = boundWitnessValidator;
-        this.originChainRepository = originChainRepository;
-        this.originBlockRepository = originBlockRepository;
-        this.bridgeQueue = bridgeQueue;
-        this.bridgeOption = bridgeOption;
-    }
-    onBoundWitnessSuccess(boundWitness, mutex, choice) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const hashValue = yield this.hashingProvider.createHash(boundWitness.getSigningData());
-            try {
-                yield this.boundWitnessValidator.validateBoundWitness(hashValue, boundWitness);
-            }
-            catch (err) {
-                this.logError(`Origin block failed validation. Will not add.`, err);
-                throw err;
-            }
-            this.bridgeQueue.addQueueItem(hashValue.serialize());
-            const removedSubItemsBlock = this.removeSubBoundWitnesses(boundWitness);
-            yield this.originBlockRepository.addOriginBlock(hashValue, removedSubItemsBlock);
-            yield this.boundWitnessValidator.validateBoundWitness(hashValue, boundWitness);
-            yield this.originChainRepository.updateOriginChainState(hashValue, removedSubItemsBlock, mutex);
-            this.logInfo(`${hashValue.serializeHex()} added to Origin-Chain and Origin-Block-Repository`);
-            const nestedBoundWitnesses = new peer_interaction_1.XyoNestedBoundWitnessExtractor().extractNestedBoundWitnesses(boundWitness);
-            yield nestedBoundWitnesses.reduce((promiseChain, nestedBoundWitness) => __awaiter(this, void 0, void 0, function* () {
-                yield promiseChain;
-                const nestedHashValue = yield this.hashingProvider.createHash(nestedBoundWitness.getSigningData());
-                const nestedHash = nestedHashValue.serialize();
-                this.logInfo(`Extracted nested block with hash ${nestedHash.toString('hex')}`);
-                const containsBlock = yield this.originBlockRepository.containsOriginBlock(nestedHash);
-                if (!containsBlock) {
-                    try {
-                        this.bridgeQueue.addQueueItem(nestedHash);
-                        yield this.boundWitnessValidator.validateBoundWitness(nestedHashValue, nestedBoundWitness);
-                    }
-                    catch (err) {
-                        this.logError(`Origin block failed validation. Will not add.`, err);
-                        throw err;
-                    }
-                    yield this.originBlockRepository.addOriginBlock(nestedHashValue, nestedBoundWitness, hashValue);
-                }
-            }), Promise.resolve());
-            if (choice === network_1.CatalogueItem.TAKE_ORIGIN_CHAIN) {
-                this.bridgeOption.onCompleted();
-            }
-            return;
-        });
-    }
-    removeSubBoundWitnesses(boundWitness) {
-        // tslint:disable-next-line:prefer-array-literal
-        const newBoundWitnessArray = [];
-        boundWitness.fetterWitnesses.forEach((fOW) => {
-            if (fOW instanceof bound_witness_1.XyoWitness) {
-                const newItems = [];
-                const array = fOW.getData();
-                array.forEach((item) => {
-                    if (item.schemaObjectId !== origin_chain_1.XyoBridgeBlockSet.deserializer.schemaObjectId &&
-                        item.schemaObjectId !== bound_witness_1.XyoSignatureSet.deserializer.schemaObjectId) {
-                        newItems.push(item);
-                    }
-                });
-                newBoundWitnessArray.push(new bound_witness_1.XyoWitness(fOW.signatureSet, newItems));
-            }
-            else if (fOW instanceof bound_witness_1.XyoFetter) {
-                newBoundWitnessArray.push(fOW);
-            }
-        });
-        return new bound_witness_1.XyoBoundWitness(newBoundWitnessArray);
-    }
-}
-exports.XyoBridgeBoundWitnessSuccessListener = XyoBridgeBoundWitnessSuccessListener;
-//# sourceMappingURL=xyo-bridge-bound-witness-success-listener.js.map

package/dist/xyo-bridge-bound-witness-success-listener.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xyo-bridge-bound-witness-success-listener.js","sourceRoot":"","sources":["../src/xyo-bridge-bound-witness-success-listener.ts"],"names":[],"mappings":"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"}

package/dist/xyo-bridge-procedure-catalogue.d.ts

@@ -1,9 +0,0 @@
-import { IXyoNetworkProcedureCatalogue, CatalogueItem } from '@xyo-network/network';
-export declare class XyoBrideProcedureCatalogue implements IXyoNetworkProcedureCatalogue {
-    private advertising;
-    constructor(advertising: CatalogueItem[]);
-    canDo(catalogueItem: CatalogueItem): boolean;
-    getCurrentCatalogue(): CatalogueItem[];
-    setCatalogue(catalogue: CatalogueItem[]): void;
-}
-//# sourceMappingURL=xyo-bridge-procedure-catalogue.d.ts.map

package/dist/xyo-bridge-procedure-catalogue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xyo-bridge-procedure-catalogue.d.ts","sourceRoot":"","sources":["../src/xyo-bridge-procedure-catalogue.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,aAAa,EAAuB,MAAM,sBAAsB,CAAA;AAExG,qBAAa,0BAA2B,YAAW,6BAA6B;IAElE,OAAO,CAAC,WAAW;gBAAX,WAAW,EAAE,aAAa,EAAE;IAIzC,KAAK,CAAE,aAAa,EAAE,aAAa,GAAG,OAAO;IAgB7C,mBAAmB,IAAK,aAAa,EAAE;IAIvC,YAAY,CAAE,SAAS,EAAE,aAAa,EAAE,GAAG,IAAI;CAGvD"}

package/dist/xyo-bridge-procedure-catalogue.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const network_1 = require("@xyo-network/network");
-class XyoBrideProcedureCatalogue {
-    constructor(advertising) {
-        this.advertising = advertising;
-    }
-    canDo(catalogueItem) {
-        if (catalogueItem === network_1.CatalogueItem.GIVE_ORIGIN_CHAIN) {
-            return true;
-        }
-        if (catalogueItem === network_1.CatalogueItem.TAKE_ORIGIN_CHAIN) {
-            return true;
-        }
-        if (catalogueItem === network_1.CatalogueItem.BOUND_WITNESS) {
-            return true;
-        }
-        return false;
-    }
-    getCurrentCatalogue() {
-        return this.advertising;
-    }
-    setCatalogue(catalogue) {
-        throw Error("Bridge catalogue setting not supported");
-    }
-}
-exports.XyoBrideProcedureCatalogue = XyoBrideProcedureCatalogue;
-//# sourceMappingURL=xyo-bridge-procedure-catalogue.js.map

package/dist/xyo-bridge-procedure-catalogue.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xyo-bridge-procedure-catalogue.js","sourceRoot":"","sources":["../src/xyo-bridge-procedure-catalogue.ts"],"names":[],"mappings":";;AACA,kDAAwG;AAExG,MAAa,0BAA0B;IAErC,YAAoB,WAA4B;QAA5B,gBAAW,GAAX,WAAW,CAAiB;IAEhD,CAAC;IAEM,KAAK,CAAE,aAA4B;QACxC,IAAI,aAAa,KAAK,uBAAa,CAAC,iBAAiB,EAAE;YACrD,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,aAAa,KAAK,uBAAa,CAAC,iBAAiB,EAAE;YACrD,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,aAAa,KAAK,uBAAa,CAAC,aAAa,EAAE;YACjD,OAAO,IAAI,CAAA;SACZ;QAED,OAAO,KAAK,CAAA;IACd,CAAC;IAEM,mBAAmB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAA;IACzB,CAAC;IAEM,YAAY,CAAE,SAA0B;QAC7C,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAA;IACvD,CAAC;CACF;AA7BD,gEA6BC"}

package/dist/xyo-bridge.d.ts

@@ -1,31 +0,0 @@
-import { IXyoNetworkProvider } from '@xyo-network/network';
-import { XyoBridgeQueue, XyoBridgeOption } from '@xyo-network/bridge-queue-repository';
-import { XyoBoundWitnessPayloadProvider } from '@xyo-network/peer-interaction';
-import { XyoSimplePeerConnectionDelegate } from '@xyo-network/peer-connections';
-import { IXyoBridgeConfig } from './@types';
-export declare class XyoBridge {
-    private bridgeFromNetwork;
-    private bridgeToNetwork;
-    private bridgeConfig;
-    bridgeEveryN: number;
-    networkDelegate: XyoSimplePeerConnectionDelegate;
-    toNetworkDelegate: XyoSimplePeerConnectionDelegate;
-    bridgeQueue: XyoBridgeQueue;
-    bridgeOption: XyoBridgeOption;
-    payloadProvider: XyoBoundWitnessPayloadProvider;
-    private running;
-    private networkCatResolver;
-    private networkRouter;
-    private boundWitnessValidator;
-    private networkHandler;
-    private success;
-    private interactionFactory;
-    private standardBoundWitnessHandlerProvider;
-    constructor(bridgeFromNetwork: IXyoNetworkProvider, bridgeToNetwork: IXyoNetworkProvider, bridgeConfig: IXyoBridgeConfig);
-    mainBridgeLoop: () => Promise<void>;
-    init(): Promise<void>;
-    start(): void;
-    stop(): void;
-    private asyncLoop;
-}
-//# sourceMappingURL=xyo-bridge.d.ts.map

package/dist/xyo-bridge.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"xyo-bridge.d.ts","sourceRoot":"","sources":["../src/xyo-bridge.ts"],"names":[],"mappings":"AAKA,OAAO,EAAiB,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAsC,8BAA8B,EAAkC,MAAM,+BAA+B,CAAA;AAIlJ,OAAO,EAAE,+BAA+B,EAAmD,MAAM,+BAA+B,CAAA;AAChI,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAA;AAE3C,qBAAa,SAAS;IA8DR,OAAO,CAAC,iBAAiB;IACzB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IA/DzB,YAAY,SAAK;IACjB,eAAe,EAAE,+BAA+B,CAAA;IAChD,iBAAiB,EAAE,+BAA+B,CAAA;IAClD,WAAW,iBAAwD;IAEnE,YAAY,kBAA+F;IAC3G,eAAe,iCAAuC;IAC7D,OAAO,CAAC,OAAO,CAAQ;IAEvB,OAAO,CAAC,kBAAkB,CAiBzB;IAED,OAAO,CAAC,aAAa,CAAiC;IAEtD,OAAO,CAAC,qBAAqB,CAAiC;IAE9D,OAAO,CAAC,cAAc,CAA4E;IAElG,OAAO,CAAC,OAAO,CAOd;IAED,OAAO,CAAC,kBAAkB,CASzB;IAED,OAAO,CAAC,mCAAmC,CAK1C;gBAEmB,iBAAiB,EAAE,mBAAmB,EACtC,eAAe,EAAE,mBAAmB,EACpC,YAAY,EAAE,gBAAgB;IA8B3C,cAAc,sBA6BpB;IAEY,IAAI;IA8BV,KAAK;IAKL,IAAI;YAIG,SAAS;CAKxB"}

package/dist/xyo-bridge.js

@@ -1,130 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const serializer_1 = require("@xyo-network/serializer");
-const signing_ecdsa_1 = require("@xyo-network/signing.ecdsa");
-const bound_witness_1 = require("@xyo-network/bound-witness");
-const peer_interaction_handlers_1 = require("@xyo-network/peer-interaction-handlers");
-const network_1 = require("@xyo-network/network");
-const bridge_queue_repository_1 = require("@xyo-network/bridge-queue-repository");
-const peer_interaction_1 = require("@xyo-network/peer-interaction");
-const xyo_bridge_bound_witness_success_listener_1 = require("./xyo-bridge-bound-witness-success-listener");
-const peer_interaction_router_1 = require("@xyo-network/peer-interaction-router");
-const xyo_bridge_procedure_catalogue_1 = require("./xyo-bridge-procedure-catalogue");
-const peer_connections_1 = require("@xyo-network/peer-connections");
-class XyoBridge {
-    constructor(bridgeFromNetwork, bridgeToNetwork, bridgeConfig) {
-        this.bridgeFromNetwork = bridgeFromNetwork;
-        this.bridgeToNetwork = bridgeToNetwork;
-        this.bridgeConfig = bridgeConfig;
-        this.bridgeEveryN = 10;
-        this.bridgeQueue = new bridge_queue_repository_1.XyoBridgeQueue(this.bridgeConfig.bridgeQueueRepo);
-        this.bridgeOption = new bridge_queue_repository_1.XyoBridgeOption(this.bridgeConfig.blockRepo, this.bridgeQueue, this.bridgeConfig.hasher);
-        this.payloadProvider = new peer_interaction_1.XyoBoundWitnessPayloadProvider();
-        this.running = false;
-        this.networkCatResolver = {
-            resolveCategory: (catalogueItems) => {
-                for (const item of catalogueItems) {
-                    if (item === network_1.CatalogueItem.GIVE_ORIGIN_CHAIN) {
-                        return network_1.CatalogueItem.TAKE_ORIGIN_CHAIN;
-                    }
-                }
-                for (const item of catalogueItems) {
-                    if (item === network_1.CatalogueItem.TAKE_ORIGIN_CHAIN) {
-                        return network_1.CatalogueItem.GIVE_ORIGIN_CHAIN;
-                    }
-                }
-                return network_1.CatalogueItem.BOUND_WITNESS;
-            }
-        };
-        this.networkRouter = new peer_interaction_router_1.XyoPeerInteractionRouter();
-        this.boundWitnessValidator = new bound_witness_1.XyoBoundWitnessValidator();
-        this.networkHandler = new peer_connections_1.XyoPeerConnectionHandler(this.networkRouter, this.networkCatResolver);
-        this.success = new xyo_bridge_bound_witness_success_listener_1.XyoBridgeBoundWitnessSuccessListener(this.bridgeConfig.hasher, this.boundWitnessValidator, this.bridgeConfig.chainRepo, this.bridgeConfig.blockRepo, this.bridgeQueue, this.bridgeOption);
-        this.interactionFactory = {
-            newInstance: (signersForBoundWitness, payload) => {
-                return new peer_interaction_handlers_1.XyoBoundWitnessInteraction(signersForBoundWitness, payload, serializer_1.serializer, network_1.CatalogueItem.BOUND_WITNESS);
-            }
-        };
-        this.standardBoundWitnessHandlerProvider = new peer_interaction_1.XyoBoundWitnessHandlerProvider(this.bridgeConfig.chainRepo, this.payloadProvider, this.success, this.interactionFactory);
-        this.mainBridgeLoop = () => __awaiter(this, void 0, void 0, function* () {
-            this.bridgeConfig.logger.info(`Bridge on new cycle`);
-            try {
-                const blePipe = yield this.networkDelegate.provideConnection();
-                yield this.networkDelegate.handlePeerConnection(blePipe);
-                if ((yield this.bridgeConfig.chainRepo.getIndex()) % this.bridgeEveryN === 0) {
-                    this.bridgeConfig.logger.info("Will try to bridge blocks");
-                    const tcpPipe = yield this.toNetworkDelegate.provideConnection();
-                    yield this.toNetworkDelegate.handlePeerConnection(tcpPipe);
-                    yield tcpPipe.close();
-                    const blocksToRemove = this.bridgeQueue.getBlocksToRemove();
-                    for (const block of blocksToRemove) {
-                        yield this.bridgeConfig.blockRepo.removeOriginBlock(block);
-                    }
-                    yield this.bridgeConfig.bridgeQueueRepo.commit();
-                }
-            }
-            catch (error) {
-                this.bridgeConfig.logger.error(`Uncaught error: ${error}`);
-            }
-            this.bridgeConfig.logger.info(`Bridge has block height: ${yield this.bridgeConfig.chainRepo.getIndex()}`);
-        });
-        const bridgeProcedureCatalogueCollect = new xyo_bridge_procedure_catalogue_1.XyoBrideProcedureCatalogue([
-            network_1.CatalogueItem.GIVE_ORIGIN_CHAIN,
-            network_1.CatalogueItem.TAKE_ORIGIN_CHAIN,
-            network_1.CatalogueItem.BOUND_WITNESS
-        ]);
-        const bridgeProcedureCatalogueSend = new xyo_bridge_procedure_catalogue_1.XyoBrideProcedureCatalogue([
-            network_1.CatalogueItem.GIVE_ORIGIN_CHAIN,
-            network_1.CatalogueItem.TAKE_ORIGIN_CHAIN,
-        ]);
-        this.networkDelegate = new peer_connections_1.XyoSimplePeerConnectionDelegate(bridgeFromNetwork, bridgeProcedureCatalogueCollect, this.networkHandler);
-        this.toNetworkDelegate = new peer_connections_1.XyoSimplePeerConnectionDelegate(bridgeToNetwork, bridgeProcedureCatalogueSend, this.networkHandler);
-    }
-    init() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.payloadProvider.addBoundWitnessOption(network_1.CatalogueItem.TAKE_ORIGIN_CHAIN, this.bridgeOption);
-            this.networkRouter.use(network_1.CatalogueItem.BOUND_WITNESS, () => {
-                return this.standardBoundWitnessHandlerProvider;
-            });
-            this.networkRouter.use(network_1.CatalogueItem.TAKE_ORIGIN_CHAIN, () => {
-                return this.standardBoundWitnessHandlerProvider;
-            });
-            this.networkRouter.use(network_1.CatalogueItem.GIVE_ORIGIN_CHAIN, () => {
-                return this.standardBoundWitnessHandlerProvider;
-            });
-            yield this.bridgeConfig.bridgeQueueRepo.restore();
-            if ((yield this.bridgeConfig.chainRepo.getIndex()) === 0) {
-                const newSigner = signing_ecdsa_1.getSignerProvider("secp256k1-sha256").newInstance();
-                this.bridgeConfig.logger
-                    .info(`Creating first signer, has public key: ${newSigner.publicKey.getData().toString('hex')}`);
-                yield this.bridgeConfig.chainRepo.setCurrentSigners([newSigner]);
-                const boundWitness = yield this.bridgeConfig.chainRepo.createGenesisBlock();
-                this.success.onBoundWitnessSuccess(boundWitness, undefined, network_1.CatalogueItem.BOUND_WITNESS);
-            }
-        });
-    }
-    start() {
-        this.running = true;
-        this.asyncLoop();
-    }
-    stop() {
-        this.running = false;
-    }
-    asyncLoop() {
-        return __awaiter(this, void 0, void 0, function* () {
-            while (this.running) {
-                yield this.mainBridgeLoop();
-            }
-        });
-    }
-}
-exports.XyoBridge = XyoBridge;
-//# sourceMappingURL=xyo-bridge.js.map

package/dist/xyo-bridge.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"xyo-bridge.js","sourceRoot":"","sources":["../src/xyo-bridge.ts"],"names":[],"mappings":"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"}

package/src/@types/index.ts

@@ -1,16 +0,0 @@
-import { resolvers, IResolvers } from '@xyo-network/base-node'
-import { IXyoHashProvider } from '@xyo-network/hashing'
-import { IXyoStorageProvider } from '@xyo-network/storage'
-import { IXyoBridgeQueueRepository } from '@xyo-network/bridge-queue-repository'
-import { IXyoOriginBlockRepository } from '@xyo-network/origin-block-repository'
-import { IXyoOriginChainRepository, XyoOriginChainLocalStorageRepository } from '../../../origin-chain/dist'
-import { XyoLogger } from '@xyo-network/logger'
-
-export interface IXyoBridgeConfig {
-  hasher: IXyoHashProvider
-  storageProvider: IXyoStorageProvider
-  bridgeQueueRepo: IXyoBridgeQueueRepository
-  blockRepo: IXyoOriginBlockRepository
-  chainRepo: XyoOriginChainLocalStorageRepository
-  logger: XyoLogger
-}

package/src/app/index.ts

@@ -1,55 +0,0 @@
-
-// import { XyoLogger } from '@xyo-network/logger'
-// import { XyoOriginBlockRepository } from '@xyo-network/origin-block-repository'
-// import { XyoOriginChainLocalStorageRepository } from '@xyo-network/origin-chain'
-// import { NobleScan } from '@xyo-network/ble.noble'
-// import { serializer } from '@xyo-network/serializer'
-// import { XyoBluetoothNetwork } from '@xyo-network/network.ble'
-// import { XyoStorageBridgeQueueRepository } from '@xyo-network/bridge-queue-repository.keyvalue'
-// import { XyoLevelDbStorageProvider } from '@xyo-network/storage.leveldb'
-// import { getHashingProvider } from '@xyo-network/hashing'
-// import { XyoClientTcpNetwork, IXyoNetworkAddressProvider, IXyoTCPNetworkAddress } from '@xyo-network/network.tcp'
-// import { IXyoBridgeConfig } from '../@types'
-// import { XyoBridge } from '../xyo-bridge'
-
-// export const bridgeEntryPoint = async () => {
-//   const hasher = getHashingProvider('sha256')
-//   const scanner = new NobleScan()
-//   const bleNetwork = new XyoBluetoothNetwork(scanner)
-//   const storageProvider = new XyoLevelDbStorageProvider("./w4feef/")
-//   const bridgeQueueRepo = new XyoStorageBridgeQueueRepository(storageProvider)
-//   const blockRepo = new XyoOriginBlockRepository(storageProvider, serializer, hasher)
-//   const chainRepo = new XyoOriginChainLocalStorageRepository(storageProvider, blockRepo, serializer)
-//   const logger = new XyoLogger(false, false)
-
-//   const tcpPeers: IXyoNetworkAddressProvider = {
-//     next: async () => {
-//       const peer: IXyoTCPNetworkAddress = {
-//         host: "alpha-peers.xyo.network",
-//         port: 11000
-//       }
-
-//       return peer
-//     }
-//   }
-//   const tcpClient = new XyoClientTcpNetwork(tcpPeers)
-
-//   const bridgeConfig: IXyoBridgeConfig  = {
-//     hasher,
-//     storageProvider,
-//     bridgeQueueRepo,
-//     blockRepo,
-//     chainRepo,
-//     logger
-//   }
-
-//   const bridge = new XyoBridge(bleNetwork, tcpClient, bridgeConfig)
-
-//   await bridge.init()
-
-//   setTimeout(() => {
-//     bridge.start()
-//   }, 2000)
-// }
-
-// bridgeEntryPoint()

package/src/xyo-bridge-bound-witness-success-listener.ts

@@ -1,108 +0,0 @@
-/*
-* @Author: XY | The Findables Company <ryanxyo>
-* @Date:   Thursday, 7th February 2019 11:32:52 am
-* @Email:  developer@xyfindables.com
-* @Filename: xyo-bound-witness-success-listener.ts
-* @Last modified by: ryanxyo
-* @Last modified time: Thursday, 7th February 2019 11:33:33 am
-* @License: All Rights Reserved
-* @Copyright: Copyright XY | The Findables Company
-*/
-
-import { IXyoBoundWitnessSuccessListener, XyoNestedBoundWitnessExtractor } from "@xyo-network/peer-interaction"
-import { IXyoBoundWitness, XyoBoundWitnessValidator, XyoBoundWitness, XyoFetter, XyoWitness, XyoKeySet, XyoSignatureSet } from "@xyo-network/bound-witness"
-import { XyoBase } from "@xyo-network/base"
-import { IXyoHashProvider } from "@xyo-network/hashing"
-import { IXyoOriginChainRepository, XyoBridgeBlockSet } from "@xyo-network/origin-chain"
-import { IXyoOriginBlockRepository } from "@xyo-network/origin-block-repository"
-import { CatalogueItem } from "@xyo-network/network"
-import { IXyoSerializableObject } from '@xyo-network/serialization'
-import { XyoBridgeQueue, XyoBridgeOption } from '@xyo-network/bridge-queue-repository'
-
-export class XyoBridgeBoundWitnessSuccessListener extends XyoBase implements IXyoBoundWitnessSuccessListener {
-
-  constructor (
-    private readonly hashingProvider: IXyoHashProvider,
-    private readonly boundWitnessValidator: XyoBoundWitnessValidator,
-    private readonly originChainRepository: IXyoOriginChainRepository,
-    private readonly originBlockRepository: IXyoOriginBlockRepository,
-    private readonly bridgeQueue: XyoBridgeQueue,
-    private readonly bridgeOption: XyoBridgeOption
-  ) {
-    super()
-  }
-
-  public async onBoundWitnessSuccess(boundWitness: IXyoBoundWitness, mutex: any, choice: CatalogueItem): Promise<void> {
-    const hashValue = await this.hashingProvider.createHash(boundWitness.getSigningData())
-
-    try {
-      await this.boundWitnessValidator.validateBoundWitness(hashValue, boundWitness)
-    } catch (err) {
-      this.logError(`Origin block failed validation. Will not add.`, err)
-      throw err
-    }
-
-    this.bridgeQueue.addQueueItem(hashValue.serialize())
-
-    const removedSubItemsBlock = this.removeSubBoundWitnesses(boundWitness)
-
-    await this.originBlockRepository.addOriginBlock(hashValue, removedSubItemsBlock)
-
-    await this.boundWitnessValidator.validateBoundWitness(hashValue, boundWitness)
-    await this.originChainRepository.updateOriginChainState(hashValue, removedSubItemsBlock, mutex)
-
-    this.logInfo(`${hashValue.serializeHex()} added to Origin-Chain and Origin-Block-Repository`)
-    const nestedBoundWitnesses = new XyoNestedBoundWitnessExtractor().extractNestedBoundWitnesses(boundWitness)
-
-    await nestedBoundWitnesses.reduce(async (promiseChain, nestedBoundWitness) => {
-      await promiseChain
-      const nestedHashValue = await this.hashingProvider.createHash(nestedBoundWitness.getSigningData())
-      const nestedHash = nestedHashValue.serialize() as Buffer
-      this.logInfo(`Extracted nested block with hash ${nestedHash.toString('hex')}`)
-
-      const containsBlock = await this.originBlockRepository.containsOriginBlock(nestedHash)
-      if (!containsBlock) {
-        try {
-          this.bridgeQueue.addQueueItem(nestedHash)
-          await this.boundWitnessValidator.validateBoundWitness(nestedHashValue, nestedBoundWitness)
-        } catch (err) {
-          this.logError(`Origin block failed validation. Will not add.`, err)
-          throw err
-        }
-
-        await this.originBlockRepository.addOriginBlock(nestedHashValue, nestedBoundWitness, hashValue)
-      }
-    }, Promise.resolve() as Promise<void>)
-
-    if (choice === CatalogueItem.TAKE_ORIGIN_CHAIN) {
-      this.bridgeOption.onCompleted()
-    }
-
-    return
-  }
-
-  private removeSubBoundWitnesses (boundWitness: IXyoBoundWitness): IXyoBoundWitness {
-    // tslint:disable-next-line:prefer-array-literal
-    const newBoundWitnessArray: Array<XyoFetter | XyoWitness> = []
-
-    boundWitness.fetterWitnesses.forEach((fOW) => {
-      if (fOW instanceof XyoWitness) {
-        const newItems: IXyoSerializableObject[] = []
-        const array = fOW.getData() as IXyoSerializableObject[]
-
-        array.forEach((item) => {
-          if (item.schemaObjectId !== XyoBridgeBlockSet.deserializer.schemaObjectId &&
-              item.schemaObjectId !== XyoSignatureSet.deserializer.schemaObjectId) {
-            newItems.push(item)
-          }
-        })
-
-        newBoundWitnessArray.push(new XyoWitness((fOW as XyoWitness).signatureSet, newItems))
-      } else if (fOW instanceof XyoFetter) {
-        newBoundWitnessArray.push(fOW as XyoFetter)
-      }
-    })
-
-    return new XyoBoundWitness(newBoundWitnessArray)
-  }
-}

package/src/xyo-bridge-procedure-catalogue.ts

@@ -1,33 +0,0 @@
-
-import { IXyoNetworkProcedureCatalogue, CatalogueItem, IXyoNetworkProvider } from '@xyo-network/network'
-
-export class XyoBrideProcedureCatalogue implements IXyoNetworkProcedureCatalogue {
-
-  constructor(private advertising: CatalogueItem[]) {
-
-  }
-
-  public canDo (catalogueItem: CatalogueItem): boolean {
-    if (catalogueItem === CatalogueItem.GIVE_ORIGIN_CHAIN) {
-      return true
-    }
-
-    if (catalogueItem === CatalogueItem.TAKE_ORIGIN_CHAIN) {
-      return true
-    }
-
-    if (catalogueItem === CatalogueItem.BOUND_WITNESS) {
-      return true
-    }
-
-    return false
-  }
-
-  public getCurrentCatalogue (): CatalogueItem[] {
-    return this.advertising
-  }
-
-  public setCatalogue (catalogue: CatalogueItem[]): void {
-    throw Error("Bridge catalogue setting not supported")
-  }
-}