@streamr/node 101.0.0-beta.1 → 101.0.0-beta.3

package/dist/src/plugins/operator/announceNodeToContract.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.announceNodeToContract = void 0;
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-const announceNodeToContract = async (writeIntervalInMs, contractFacade, streamrClient) => {
-    if (await isHeartbeatStale(writeIntervalInMs, contractFacade)) {
-        await writeHeartbeat(contractFacade, streamrClient);
+const announceNodeToContract = async (writeIntervalInMs, operator, streamrClient) => {
+    if (await isHeartbeatStale(writeIntervalInMs, operator)) {
+        await writeHeartbeat(operator, streamrClient);
     }
 };
 exports.announceNodeToContract = announceNodeToContract;
-const isHeartbeatStale = async (writeIntervalInMs, contractFacade) => {
+const isHeartbeatStale = async (writeIntervalInMs, operator) => {
     logger.debug('Polling last heartbeat timestamp', {
-        operatorContractAddress: await contractFacade.getOperatorContractAddress()
+        operatorContractAddress: await operator.getContractAddress()
     });
     let lastHeartbeatTs;
     try {
-        lastHeartbeatTs = await contractFacade.getTimestampOfLastHeartbeat();
+        lastHeartbeatTs = await operator.getTimestampOfLastHeartbeat();
     }
     catch (err) {
         logger.warn('Failed to poll last heartbeat timestamp', { reason: err?.message });
@@ -25,11 +25,11 @@ const isHeartbeatStale = async (writeIntervalInMs, contractFacade) => {
     logger.debug('Polled last heartbeat timestamp', { lastHeartbeatTs, stale });
     return stale;
 };
-const writeHeartbeat = async (contractFacade, streamrClient) => {
+const writeHeartbeat = async (operator, streamrClient) => {
     logger.info('Write heartbeat');
     try {
         const nodeDescriptor = await streamrClient.getPeerDescriptor();
-        await contractFacade.writeHeartbeat(nodeDescriptor);
+        await operator.writeHeartbeat(nodeDescriptor);
         logger.debug('Wrote heartbeat', { nodeDescriptor });
     }
     catch (err) {

package/dist/src/plugins/operator/announceNodeToContract.js.map

@@ -1 +1 @@
-{"version":3,"file":"announceNodeToContract.js","sourceRoot":"","sources":["../../../../src/plugins/operator/announceNodeToContract.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAIvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,sBAAsB,GAAG,KAAK,EACvC,iBAAyB,EACzB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,IAAI,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,CAAC,EAAE,CAAC;QAC5D,MAAM,cAAc,CAAC,cAAc,EAAE,aAAa,CAAC,CAAA;IACvD,CAAC;AACL,CAAC,CAAA;AARY,QAAA,sBAAsB,0BAQlC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC1B,iBAAyB,EACzB,cAA8B,EACd,EAAE;IAClB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;QAC7C,uBAAuB,EAAE,MAAM,cAAc,CAAC,0BAA0B,EAAE;KAC7E,CAAC,CAAA;IACF,IAAI,eAAe,CAAA;IACnB,IAAI,CAAC;QACD,eAAe,GAAG,MAAM,cAAc,CAAC,2BAA2B,EAAE,CAAA;IACxE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;QAChF,OAAO,KAAK,CAAA,CAAC,+EAA+E;IAChG,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,iBAAiB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtG,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3E,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,KAAK,EACxB,cAA8B,EAC9B,aAA4B,EACf,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,IAAI,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;QAC9D,MAAM,cAAc,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;QACnD,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;IACtE,CAAC;AACL,CAAC,CAAA"}
+{"version":3,"file":"announceNodeToContract.js","sourceRoot":"","sources":["../../../../src/plugins/operator/announceNodeToContract.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,sBAAsB,GAAG,KAAK,EACvC,iBAAyB,EACzB,QAAkB,EAClB,aAA4B,EACf,EAAE;IACf,IAAI,MAAM,gBAAgB,CAAC,iBAAiB,EAAE,QAAQ,CAAC,EAAE,CAAC;QACtD,MAAM,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAA;IACjD,CAAC;AACL,CAAC,CAAA;AARY,QAAA,sBAAsB,0BAQlC;AAED,MAAM,gBAAgB,GAAG,KAAK,EAC1B,iBAAyB,EACzB,QAAkB,EACF,EAAE;IAClB,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE;QAC7C,uBAAuB,EAAE,MAAM,QAAQ,CAAC,kBAAkB,EAAE;KAC/D,CAAC,CAAA;IACF,IAAI,eAAe,CAAA;IACnB,IAAI,CAAC;QACD,eAAe,GAAG,MAAM,QAAQ,CAAC,2BAA2B,EAAE,CAAA;IAClE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,yCAAyC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;QAChF,OAAO,KAAK,CAAA,CAAC,+EAA+E;IAChG,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,GAAG,iBAAiB,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;IACtG,MAAM,CAAC,KAAK,CAAC,iCAAiC,EAAE,EAAE,eAAe,EAAE,KAAK,EAAE,CAAC,CAAA;IAC3E,OAAO,KAAK,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,cAAc,GAAG,KAAK,EACxB,QAAkB,EAClB,aAA4B,EACf,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC9B,IAAI,CAAC;QACD,MAAM,cAAc,GAAG,MAAM,aAAa,CAAC,iBAAiB,EAAE,CAAA;QAC9D,MAAM,QAAQ,CAAC,cAAc,CAAC,cAAc,CAAC,CAAA;QAC7C,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,EAAE,cAAc,EAAE,CAAC,CAAA;IACvD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACX,MAAM,CAAC,IAAI,CAAC,2BAA2B,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAA;IACtE,CAAC;AACL,CAAC,CAAA"}

package/dist/src/plugins/operator/checkOperatorValueBreach.d.ts

@@ -1,2 +1,2 @@
-import { ContractFacade } from './ContractFacade';
-export declare const checkOperatorValueBreach: (contractFacade: ContractFacade, minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number) => Promise<void>;
+import { StreamrClient, Operator } from '@streamr/sdk';
+export declare const checkOperatorValueBreach: (myOperator: Operator, client: StreamrClient, minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number) => Promise<void>;

package/dist/src/plugins/operator/checkOperatorValueBreach.js

@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkOperatorValueBreach = void 0;
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-const checkOperatorValueBreach = async (contractFacade, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw) => {
-    const targetOperatorAddress = await contractFacade.getRandomOperator();
+const checkOperatorValueBreach = async (myOperator, client, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw) => {
+    const targetOperatorAddress = await myOperator.getRandomOperator();
     if (targetOperatorAddress === undefined) {
         logger.info('No operators found');
         return;
     }
     logger.info('Check other operator\'s earnings for breach', { targetOperatorAddress });
-    const { sumDataWei, maxAllowedEarningsDataWei, sponsorshipAddresses } = await contractFacade.getEarningsOf(targetOperatorAddress, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
+    const { sumDataWei, maxAllowedEarningsDataWei, sponsorshipAddresses } = await client.getOperator(targetOperatorAddress).getEarnings(minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
     logger.trace(` -> is ${sumDataWei} > ${maxAllowedEarningsDataWei}?`);
     if (sumDataWei > maxAllowedEarningsDataWei) {
         logger.info('Withdraw earnings from sponsorships (target operator value in breach)', { targetOperatorAddress, sponsorshipAddresses, sumDataWei, maxAllowedEarningsDataWei });
-        await contractFacade.triggerWithdraw(targetOperatorAddress, sponsorshipAddresses);
+        await myOperator.triggerAnotherOperatorWithdraw(targetOperatorAddress, sponsorshipAddresses);
     }
 };
 exports.checkOperatorValueBreach = checkOperatorValueBreach;

package/dist/src/plugins/operator/checkOperatorValueBreach.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkOperatorValueBreach.js","sourceRoot":"","sources":["../../../../src/plugins/operator/checkOperatorValueBreach.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AAGvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,wBAAwB,GAAG,KAAK,EACzC,cAA8B,EAC9B,gCAAwC,EACxC,yBAAiC,EACpB,EAAE;IACf,MAAM,qBAAqB,GAAG,MAAM,cAAc,CAAC,iBAAiB,EAAE,CAAA;IACtE,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACjC,OAAM;IACV,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAA;IACrF,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,GAAG,MAAM,cAAc,CAAC,aAAa,CACtG,qBAAqB,EACrB,gCAAgC,EAChC,yBAAyB,CAC5B,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,MAAM,yBAAyB,GAAG,CAAC,CAAA;IACpE,IAAI,UAAU,GAAG,yBAAyB,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,uEAAuE,EAC/E,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,UAAU,EAAE,yBAAyB,EAAE,CAAC,CAAA;QAC3F,MAAM,cAAc,CAAC,eAAe,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAA;IACrF,CAAC;AACL,CAAC,CAAA;AAtBY,QAAA,wBAAwB,4BAsBpC"}
+{"version":3,"file":"checkOperatorValueBreach.js","sourceRoot":"","sources":["../../../../src/plugins/operator/checkOperatorValueBreach.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,wBAAwB,GAAG,KAAK,EACzC,UAAoB,EACpB,MAAqB,EACrB,gCAAwC,EACxC,yBAAiC,EACpB,EAAE;IACf,MAAM,qBAAqB,GAAG,MAAM,UAAU,CAAC,iBAAiB,EAAE,CAAA;IAClE,IAAI,qBAAqB,KAAK,SAAS,EAAE,CAAC;QACtC,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;QACjC,OAAM;IACV,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,6CAA6C,EAAE,EAAE,qBAAqB,EAAE,CAAC,CAAA;IACrF,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,qBAAqB,CAAC,CAAC,WAAW,CAC/H,gCAAgC,EAChC,yBAAyB,CAC5B,CAAA;IACD,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,MAAM,yBAAyB,GAAG,CAAC,CAAA;IACpE,IAAI,UAAU,GAAG,yBAAyB,EAAE,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,uEAAuE,EAC/E,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,UAAU,EAAE,yBAAyB,EAAE,CAAC,CAAA;QAC3F,MAAM,UAAU,CAAC,8BAA8B,CAAC,qBAAqB,EAAE,oBAAoB,CAAC,CAAA;IAChG,CAAC;AACL,CAAC,CAAA;AAtBY,QAAA,wBAAwB,4BAsBpC"}

package/dist/src/plugins/operator/closeExpiredFlags.d.ts

@@ -1,3 +1,2 @@
-import { EthereumAddress } from '@streamr/utils';
-import { ContractFacade } from './ContractFacade';
-export declare const closeExpiredFlags: (maxAgeInMs: number, operatorContractAddress: EthereumAddress, contractFacade: ContractFacade) => Promise<void>;
+import { Operator } from '@streamr/sdk';
+export declare const closeExpiredFlags: (maxAgeInMs: number, operator: Operator) => Promise<void>;

package/dist/src/plugins/operator/closeExpiredFlags.js

@@ -3,21 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.closeExpiredFlags = void 0;
 const utils_1 = require("@streamr/utils");
 const logger = new utils_1.Logger(module);
-const closeExpiredFlags = async (maxAgeInMs, operatorContractAddress, contractFacade) => {
+const closeExpiredFlags = async (maxAgeInMs, operator) => {
     logger.info('Start');
-    const sponsorships = (await contractFacade.getSponsorshipsOfOperator(operatorContractAddress))
+    const sponsorships = (await operator.getSponsorships())
         .map((sponsorship) => sponsorship.sponsorshipAddress);
     logger.debug(`Found ${sponsorships.length} sponsorships`);
     if (sponsorships.length === 0) {
         return;
     }
-    const flags = await contractFacade.getExpiredFlags(sponsorships, maxAgeInMs);
+    const flags = await operator.getExpiredFlags(sponsorships, maxAgeInMs);
     logger.debug(`Found ${flags.length} expired flags to close`);
     for (const flag of flags) {
-        const operatorAddress = flag.target.id;
-        const sponsorship = flag.sponsorship.id;
+        const operatorAddress = flag.targetOperator;
+        const sponsorship = flag.sponsorship;
         logger.info('Close expired flag', { flag });
-        await contractFacade.closeFlag(sponsorship, operatorAddress);
+        await operator.closeFlag(sponsorship, operatorAddress);
     }
 };
 exports.closeExpiredFlags = closeExpiredFlags;

package/dist/src/plugins/operator/closeExpiredFlags.js.map

@@ -1 +1 @@
-{"version":3,"file":"closeExpiredFlags.js","sourceRoot":"","sources":["../../../../src/plugins/operator/closeExpiredFlags.ts"],"names":[],"mappings":";;;AAAA,0CAAwD;AAGxD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,iBAAiB,GAAG,KAAK,EAClC,UAAkB,EAClB,uBAAwC,EACxC,cAA8B,EACjB,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEpB,MAAM,YAAY,GAAG,CAAC,MAAM,cAAc,CAAC,yBAAyB,CAAC,uBAAuB,CAAC,CAAC;SACzF,GAAG,CAAC,CAAC,WAA8B,EAAE,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IAC5E,MAAM,CAAC,KAAK,CAAC,SAAS,YAAY,CAAC,MAAM,eAAe,CAAC,CAAA;IACzD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAM;IACV,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;IAC5E,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,MAAM,yBAAyB,CAAC,CAAA;IAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,EAAE,CAAA;QACtC,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,EAAE,CAAA;QACvC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3C,MAAM,cAAc,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;IAChE,CAAC;AACL,CAAC,CAAA;AArBY,QAAA,iBAAiB,qBAqB7B"}
+{"version":3,"file":"closeExpiredFlags.js","sourceRoot":"","sources":["../../../../src/plugins/operator/closeExpiredFlags.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AAEvC,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,iBAAiB,GAAG,KAAK,EAClC,UAAkB,EAClB,QAAkB,EACL,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEpB,MAAM,YAAY,GAAG,CAAC,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAC;SAClD,GAAG,CAAC,CAAC,WAA0C,EAAE,EAAE,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACxF,MAAM,CAAC,KAAK,CAAC,SAAS,YAAY,CAAC,MAAM,eAAe,CAAC,CAAA;IACzD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAM;IACV,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,YAAY,EAAE,UAAU,CAAC,CAAA;IACtE,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,CAAC,MAAM,yBAAyB,CAAC,CAAA;IAC5D,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACvB,MAAM,eAAe,GAAG,IAAI,CAAC,cAAc,CAAA;QAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;QACpC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3C,MAAM,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAA;IAC1D,CAAC;AACL,CAAC,CAAA;AApBY,QAAA,iBAAiB,qBAoB7B"}

package/dist/src/plugins/operator/formCoordinationStreamId.d.ts

@@ -1,3 +1,2 @@
-import { EthereumAddress } from '@streamr/utils';
-import { StreamID } from '@streamr/protocol';
+import { EthereumAddress, StreamID } from '@streamr/utils';
 export declare function formCoordinationStreamId(operatorContractAddress: EthereumAddress): StreamID;

package/dist/src/plugins/operator/formCoordinationStreamId.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formCoordinationStreamId = void 0;
-const protocol_1 = require("@streamr/protocol");
+const utils_1 = require("@streamr/utils");
 function formCoordinationStreamId(operatorContractAddress) {
-    return (0, protocol_1.toStreamID)('/operator/coordination', operatorContractAddress);
+    return (0, utils_1.toStreamID)('/operator/coordination', operatorContractAddress);
 }
 exports.formCoordinationStreamId = formCoordinationStreamId;
 //# sourceMappingURL=formCoordinationStreamId.js.map

package/dist/src/plugins/operator/formCoordinationStreamId.js.map

@@ -1 +1 @@
-{"version":3,"file":"formCoordinationStreamId.js","sourceRoot":"","sources":["../../../../src/plugins/operator/formCoordinationStreamId.ts"],"names":[],"mappings":";;;AACA,gDAAwD;AAExD,SAAgB,wBAAwB,CAAC,uBAAwC;IAC7E,OAAO,IAAA,qBAAU,EAAC,wBAAwB,EAAE,uBAAuB,CAAC,CAAA;AACxE,CAAC;AAFD,4DAEC"}
+{"version":3,"file":"formCoordinationStreamId.js","sourceRoot":"","sources":["../../../../src/plugins/operator/formCoordinationStreamId.ts"],"names":[],"mappings":";;;AAAA,0CAAsE;AAEtE,SAAgB,wBAAwB,CAAC,uBAAwC;IAC7E,OAAO,IAAA,kBAAU,EAAC,wBAAwB,EAAE,uBAAuB,CAAC,CAAA;AACxE,CAAC;AAFD,4DAEC"}

package/dist/src/plugins/operator/inspectRandomNode.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="node" />
+import { Operator, StreamrClient } from '@streamr/sdk';
 import { EthereumAddress } from '@streamr/utils';
+import { CreateOperatorFleetStateFn } from './OperatorFleetState';
 import { StreamPartAssignments } from './StreamPartAssignments';
-import { StreamrClient } from '@streamr/sdk';
 import { findTarget } from './inspectionUtils';
-import { ContractFacade } from './ContractFacade';
-import { CreateOperatorFleetStateFn } from './OperatorFleetState';
-export declare function inspectRandomNode(operatorContractAddress: EthereumAddress, contractFacade: ContractFacade, assignments: StreamPartAssignments, streamrClient: StreamrClient, heartbeatTimeoutInMs: number, getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>, createOperatorFleetState: CreateOperatorFleetStateFn, abortSignal: AbortSignal, findTargetFn?: typeof findTarget): Promise<void>;
+export declare function inspectRandomNode(operatorContractAddress: EthereumAddress, myOperator: Operator, assignments: StreamPartAssignments, streamrClient: StreamrClient, heartbeatTimeoutInMs: number, getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>, createOperatorFleetState: CreateOperatorFleetStateFn, abortSignal: AbortSignal, findTargetFn?: typeof findTarget): Promise<void>;

package/dist/src/plugins/operator/inspectRandomNode.js

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectRandomNode = void 0;
 const utils_1 = require("@streamr/utils");
-const protocol_1 = require("@streamr/protocol");
-const inspectionUtils_1 = require("./inspectionUtils");
 const inspectOverTime_1 = require("./inspectOverTime");
-async function inspectRandomNode(operatorContractAddress, contractFacade, assignments, streamrClient, heartbeatTimeoutInMs, getRedundancyFactor, createOperatorFleetState, abortSignal, findTargetFn = inspectionUtils_1.findTarget) {
+const inspectionUtils_1 = require("./inspectionUtils");
+async function inspectRandomNode(operatorContractAddress, myOperator, assignments, streamrClient, heartbeatTimeoutInMs, getRedundancyFactor, createOperatorFleetState, abortSignal, findTargetFn = inspectionUtils_1.findTarget) {
     const traceId = (0, utils_1.randomString)(6);
     const logger = new utils_1.Logger(module, { traceId });
     logger.info('Select a random operator to inspect');
-    const target = await findTargetFn(operatorContractAddress, contractFacade, assignments, logger);
+    const target = await findTargetFn(operatorContractAddress, myOperator, assignments, streamrClient, logger);
     if (target === undefined) {
         return;
     }
@@ -32,13 +31,13 @@ async function inspectRandomNode(operatorContractAddress, contractFacade, assign
         logger.info('Not raising flag', { target });
         return;
     }
-    const flagAlreadyRaised = await contractFacade.hasOpenFlag(target.operatorAddress, target.sponsorshipAddress);
+    const flagAlreadyRaised = await streamrClient.getOperator(target.operatorAddress).hasOpenFlag(target.sponsorshipAddress);
     if (flagAlreadyRaised) {
         logger.info('Not raising flag (target already has open flag)', { target });
         return;
     }
     logger.info('Raise flag', { target });
-    await contractFacade.flag(target.sponsorshipAddress, target.operatorAddress, protocol_1.StreamPartIDUtils.getStreamPartition(target.streamPart));
+    await myOperator.flag(target.sponsorshipAddress, target.operatorAddress, utils_1.StreamPartIDUtils.getStreamPartition(target.streamPart));
 }
 exports.inspectRandomNode = inspectRandomNode;
 //# sourceMappingURL=inspectRandomNode.js.map

package/dist/src/plugins/operator/inspectRandomNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"inspectRandomNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectRandomNode.ts"],"names":[],"mappings":";;;AAAA,0CAAsE;AAGtE,gDAAqD;AACrD,uDAA8C;AAG9C,uDAAmD;AAE5C,KAAK,UAAU,iBAAiB,CACnC,uBAAwC,EACxC,cAA8B,EAC9B,WAAkC,EAClC,aAA4B,EAC5B,oBAA4B,EAC5B,mBAA8F,EAC9F,wBAAoD,EACpD,WAAwB,EACxB,YAAY,GAAG,4BAAU;IAEzB,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,uBAAuB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,CAAA;IAC/F,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAE9C,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM;QACN,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,kCAAkC,EAAE,CAAC;QACrC,oBAAoB;QACpB,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACrC,cAAc,EAAE,EAAE;QAClB,mBAAmB,EAAE,IAAI;QACzB,WAAW;QACX,OAAO;KACV,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;IACtC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC3C,OAAM;IACV,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,kBAAkB,CAAC,CAAA;IAC7G,IAAI,iBAAiB,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1E,OAAM;IACV,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,MAAM,cAAc,CAAC,IAAI,CACrB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,eAAe,EACtB,4BAAiB,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAC1D,CAAA;AACL,CAAC;AArDD,8CAqDC"}
+{"version":3,"file":"inspectRandomNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/inspectRandomNode.ts"],"names":[],"mappings":";;;AACA,0CAAyF;AAGzF,uDAAmD;AACnD,uDAA8C;AAEvC,KAAK,UAAU,iBAAiB,CACnC,uBAAwC,EACxC,UAAoB,EACpB,WAAkC,EAClC,aAA4B,EAC5B,oBAA4B,EAC5B,mBAA8F,EAC9F,wBAAoD,EACpD,WAAwB,EACxB,YAAY,GAAG,4BAAU;IAEzB,MAAM,OAAO,GAAG,IAAA,oBAAY,EAAC,CAAC,CAAC,CAAA;IAC/B,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,CAAC,CAAA;IAC9C,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;IAElD,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,uBAAuB,EAAE,UAAU,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,CAAC,CAAA;IAC1G,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAM;IACV,CAAC;IACD,MAAM,CAAC,KAAK,CAAC,oBAAoB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IAE9C,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM;QACN,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,kCAAkC,EAAE,CAAC;QACrC,oBAAoB;QACpB,sBAAsB,EAAE,CAAC,GAAG,EAAE,GAAG,IAAI;QACrC,cAAc,EAAE,EAAE;QAClB,mBAAmB,EAAE,IAAI;QACzB,WAAW;QACX,OAAO;KACV,CAAC,CAAA;IAEF,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;IACtC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC3C,OAAM;IACV,CAAC;IAED,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAA;IACxH,IAAI,iBAAiB,EAAE,CAAC;QACpB,MAAM,CAAC,IAAI,CAAC,iDAAiD,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;QAC1E,OAAM;IACV,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,CAAC,CAAA;IACrC,MAAM,UAAU,CAAC,IAAI,CACjB,MAAM,CAAC,kBAAkB,EACzB,MAAM,CAAC,eAAe,EACtB,yBAAiB,CAAC,kBAAkB,CAAC,MAAM,CAAC,UAAU,CAAC,CAC1D,CAAA;AACL,CAAC;AArDD,8CAqDC"}

package/dist/src/plugins/operator/inspectionUtils.d.ts

@@ -1,10 +1,8 @@
 /// <reference types="node" />
-import { NetworkPeerDescriptor, StreamrClient } from '@streamr/sdk';
+import { NetworkPeerDescriptor, Operator, StreamrClient } from '@streamr/sdk';
+import { EthereumAddress, Logger, StreamPartID } from '@streamr/utils';
 import { OperatorFleetState } from './OperatorFleetState';
-import { StreamPartID } from '@streamr/protocol';
-import { EthereumAddress, Logger } from '@streamr/utils';
 import { StreamPartAssignments } from './StreamPartAssignments';
-import { ContractFacade } from './ContractFacade';
 export type FindNodesForTargetGivenFleetStateFn = typeof findNodesForTargetGivenFleetState;
 export type InspectTargetFn = typeof inspectTarget;
 export interface Target {
@@ -12,7 +10,7 @@ export interface Target {
     operatorAddress: EthereumAddress;
     streamPart: StreamPartID;
 }
-export declare function findTarget(myOperatorContractAddress: EthereumAddress, contractFacade: ContractFacade, assignments: StreamPartAssignments, logger: Logger): Promise<Target | undefined>;
+export declare function findTarget(myOperatorContractAddress: EthereumAddress, myOperator: Operator, assignments: StreamPartAssignments, streamrClient: StreamrClient, logger: Logger): Promise<Target | undefined>;
 export declare function findNodesForTargetGivenFleetState(target: Target, targetOperatorFleetState: OperatorFleetState, getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>, logger: Logger): Promise<NetworkPeerDescriptor[]>;
 export declare function inspectTarget({ target, targetPeerDescriptors, streamrClient, abortSignal, logger }: {
     target: Target;

package/dist/src/plugins/operator/inspectionUtils.js

@@ -4,15 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.inspectTarget = exports.findNodesForTargetGivenFleetState = exports.findTarget = void 0;
+const utils_1 = require("@streamr/utils");
 const lodash_1 = require("lodash");
-const protocol_1 = require("@streamr/protocol");
-const ConsistentHashRing_1 = require("./ConsistentHashRing");
-const weightedSample_1 = require("../../helpers/weightedSample");
 const sample_1 = __importDefault(require("lodash/sample"));
 const without_1 = __importDefault(require("lodash/without"));
+const weightedSample_1 = require("../../helpers/weightedSample");
+const ConsistentHashRing_1 = require("./ConsistentHashRing");
 function createStreamIDMatcher(streamId) {
     return (streamPart) => {
-        return protocol_1.StreamPartIDUtils.getStreamID(streamPart) === streamId;
+        return utils_1.StreamPartIDUtils.getStreamID(streamPart) === streamId;
     };
 }
 function isAnyPartitionOfStreamAssignedToMe(assignments, streamId) {
@@ -21,9 +21,9 @@ function isAnyPartitionOfStreamAssignedToMe(assignments, streamId) {
 function getPartitionsOfStreamAssignedToMe(assignments, streamId) {
     return assignments.getMyStreamParts().filter(createStreamIDMatcher(streamId));
 }
-async function findTarget(myOperatorContractAddress, contractFacade, assignments, logger) {
+async function findTarget(myOperatorContractAddress, myOperator, assignments, streamrClient, logger) {
     // choose sponsorship
-    const sponsorships = await contractFacade.getSponsorshipsOfOperator(myOperatorContractAddress);
+    const sponsorships = await myOperator.getSponsorships();
     const suitableSponsorships = sponsorships
         .filter(({ operatorCount }) => operatorCount >= 2) // exclude sponsorships with only self
         .filter(({ streamId }) => isAnyPartitionOfStreamAssignedToMe(assignments, streamId));
@@ -34,7 +34,7 @@ async function findTarget(myOperatorContractAddress, contractFacade, assignments
     const targetSponsorship = (0, weightedSample_1.weightedSample)(suitableSponsorships, ({ operatorCount }) => operatorCount - 1 // account for self to keep ratios correct
     );
     // choose operator
-    const operators = await contractFacade.getOperatorsInSponsorship(targetSponsorship.sponsorshipAddress);
+    const operators = await myOperator.getOperatorsInSponsorship(targetSponsorship.sponsorshipAddress);
     const targetOperatorAddress = (0, sample_1.default)((0, without_1.default)(operators, myOperatorContractAddress));
     if (targetOperatorAddress === undefined) {
         // Only happens if during the async awaits the other operator(s) were removed from the sponsorship.
@@ -49,7 +49,8 @@ async function findTarget(myOperatorContractAddress, contractFacade, assignments
         logger.info('Skip inspection (no suitable stream part)', { targetSponsorship, targetOperatorAddress });
         return undefined;
     }
-    const flagAlreadyRaised = await contractFacade.hasOpenFlag(targetOperatorAddress, targetSponsorship.sponsorshipAddress);
+    const targetOperator = streamrClient.getOperator(targetOperatorAddress);
+    const flagAlreadyRaised = await targetOperator.hasOpenFlag(targetSponsorship.sponsorshipAddress);
     if (flagAlreadyRaised) {
         logger.info('Skip inspection (target already has open flag)', { targetSponsorship, targetOperatorAddress });
         return undefined;
@@ -84,8 +85,8 @@ async function inspectTarget({ target, targetPeerDescriptors, streamrClient, abo
     });
     // need to subscribe before inspecting, otherwise inspect will instantly return false
     const sub = await streamrClient.subscribe({
-        id: protocol_1.StreamPartIDUtils.getStreamID(target.streamPart),
-        partition: protocol_1.StreamPartIDUtils.getStreamPartition(target.streamPart),
+        id: utils_1.StreamPartIDUtils.getStreamID(target.streamPart),
+        partition: utils_1.StreamPartIDUtils.getStreamPartition(target.streamPart),
         raw: true
     });
     try {

package/dist/src/plugins/operator/inspectionUtils.js.map

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

package/dist/src/plugins/operator/maintainOperatorValue.d.ts

@@ -1,2 +1,2 @@
-import { ContractFacade } from './ContractFacade';
-export declare const maintainOperatorValue: (withdrawLimitSafetyFraction: number, minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number, contractFacade: ContractFacade) => Promise<void>;
+import { Operator } from '@streamr/sdk';
+export declare const maintainOperatorValue: (withdrawLimitSafetyFraction: number, minSponsorshipEarningsInWithdraw: number, maxSponsorshipsInWithdraw: number, myOperator: Operator) => Promise<void>;

package/dist/src/plugins/operator/maintainOperatorValue.js

@@ -4,14 +4,14 @@ exports.maintainOperatorValue = void 0;
 const utils_1 = require("@streamr/utils");
 const multiply_1 = require("../../helpers/multiply");
 const logger = new utils_1.Logger(module);
-const maintainOperatorValue = async (withdrawLimitSafetyFraction, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw, contractFacade) => {
+const maintainOperatorValue = async (withdrawLimitSafetyFraction, minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw, myOperator) => {
     logger.info('Check whether it is time to withdraw my earnings');
-    const { sumDataWei, maxAllowedEarningsDataWei, sponsorshipAddresses } = await contractFacade.getMyEarnings(minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
+    const { sumDataWei, maxAllowedEarningsDataWei, sponsorshipAddresses } = await myOperator.getEarnings(minSponsorshipEarningsInWithdraw, maxSponsorshipsInWithdraw);
     const triggerWithdrawLimitDataWei = (0, multiply_1.multiply)(maxAllowedEarningsDataWei, 1 - withdrawLimitSafetyFraction);
     logger.trace(` -> is ${sumDataWei} > ${triggerWithdrawLimitDataWei} ?`);
     if (sumDataWei > triggerWithdrawLimitDataWei) {
         logger.info('Withdraw earnings from sponsorships', { sponsorshipAddresses });
-        await contractFacade.withdrawMyEarningsFromSponsorships(sponsorshipAddresses);
+        await myOperator.withdrawEarningsFromSponsorships(sponsorshipAddresses);
     }
     else {
         logger.info('Skip withdrawing earnings');

package/dist/src/plugins/operator/maintainOperatorValue.js.map

@@ -1 +1 @@
-{"version":3,"file":"maintainOperatorValue.js","sourceRoot":"","sources":["../../../../src/plugins/operator/maintainOperatorValue.ts"],"names":[],"mappings":";;;AAAA,0CAAuC;AACvC,qDAAiD;AAGjD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,qBAAqB,GAAG,KAAK,EACtC,2BAAmC,EACnC,gCAAwC,EACxC,yBAAiC,EACjC,cAA8B,EACjB,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAA;IAC/D,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,GAAG,MAAM,cAAc,CAAC,aAAa,CACtG,gCAAgC,EAChC,yBAAyB,CAC5B,CAAA;IACD,MAAM,2BAA2B,GAAG,IAAA,mBAAQ,EAAC,yBAAyB,EAAE,CAAC,GAAG,2BAA2B,CAAC,CAAA;IACxG,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,MAAM,2BAA2B,IAAI,CAAC,CAAA;IACvE,IAAI,UAAU,GAAG,2BAA2B,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAA;QAC5E,MAAM,cAAc,CAAC,kCAAkC,CAAC,oBAAoB,CAAC,CAAA;IACjF,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;IAC5C,CAAC;AACL,CAAC,CAAA;AAnBY,QAAA,qBAAqB,yBAmBjC"}
+{"version":3,"file":"maintainOperatorValue.js","sourceRoot":"","sources":["../../../../src/plugins/operator/maintainOperatorValue.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AACvC,qDAAiD;AAEjD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAE1B,MAAM,qBAAqB,GAAG,KAAK,EACtC,2BAAmC,EACnC,gCAAwC,EACxC,yBAAiC,EACjC,UAAoB,EACP,EAAE;IACf,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAA;IAC/D,MAAM,EAAE,UAAU,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,GAAG,MAAM,UAAU,CAAC,WAAW,CAChG,gCAAgC,EAChC,yBAAyB,CAC5B,CAAA;IACD,MAAM,2BAA2B,GAAG,IAAA,mBAAQ,EAAC,yBAAyB,EAAE,CAAC,GAAG,2BAA2B,CAAC,CAAA;IACxG,MAAM,CAAC,KAAK,CAAC,UAAU,UAAU,MAAM,2BAA2B,IAAI,CAAC,CAAA;IACvE,IAAI,UAAU,GAAG,2BAA2B,EAAE,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,qCAAqC,EAAE,EAAE,oBAAoB,EAAE,CAAC,CAAA;QAC5E,MAAM,UAAU,CAAC,gCAAgC,CAAC,oBAAoB,CAAC,CAAA;IAC3E,CAAC;SAAM,CAAC;QACJ,MAAM,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAA;IAC5C,CAAC;AACL,CAAC,CAAA;AAnBY,QAAA,qBAAqB,yBAmBjC"}

package/dist/src/plugins/operator/reviewSuspectNode.d.ts

@@ -1,13 +1,12 @@
 /// <reference types="node" />
+import { Operator, StreamrClient } from '@streamr/sdk';
 import { EthereumAddress } from '@streamr/utils';
-import { ContractFacade } from './ContractFacade';
-import { StreamrClient } from '@streamr/sdk';
 import { CreateOperatorFleetStateFn } from './OperatorFleetState';
 export interface ReviewProcessOpts {
     sponsorshipAddress: EthereumAddress;
     targetOperator: EthereumAddress;
     partition: number;
-    contractFacade: ContractFacade;
+    myOperator: Operator;
     streamrClient: StreamrClient;
     createOperatorFleetState: CreateOperatorFleetStateFn;
     getRedundancyFactor: (operatorContractAddress: EthereumAddress) => Promise<number | undefined>;
@@ -21,4 +20,4 @@ export interface ReviewProcessOpts {
     maxInspections: number;
     abortSignal: AbortSignal;
 }
-export declare const reviewSuspectNode: ({ sponsorshipAddress, targetOperator, partition, contractFacade, streamrClient, createOperatorFleetState, getRedundancyFactor, maxSleepTime, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspections, abortSignal }: ReviewProcessOpts) => Promise<void>;
+export declare const reviewSuspectNode: ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor, maxSleepTime, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspections, abortSignal }: ReviewProcessOpts) => Promise<void>;

package/dist/src/plugins/operator/reviewSuspectNode.js

@@ -5,22 +5,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.reviewSuspectNode = void 0;
 const utils_1 = require("@streamr/utils");
-const protocol_1 = require("@streamr/protocol");
 const random_1 = __importDefault(require("lodash/random"));
 const inspectOverTime_1 = require("./inspectOverTime");
 const logger = new utils_1.Logger(module);
-const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition, contractFacade, streamrClient, createOperatorFleetState, getRedundancyFactor, maxSleepTime, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspections, abortSignal }) => {
+const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition, myOperator, streamrClient, createOperatorFleetState, getRedundancyFactor, maxSleepTime, heartbeatTimeoutInMs, votingPeriod, inspectionIntervalInMs, maxInspections, abortSignal }) => {
     if (Date.now() + maxSleepTime > votingPeriod.startTime) {
         throw new Error('Max sleep time overlaps with voting period');
     }
-    const streamId = await contractFacade.getStreamId(sponsorshipAddress);
+    const streamId = await myOperator.getStreamId(sponsorshipAddress);
     // random sleep time to make sure multiple instances of voters don't all inspect at the same time
     const sleepTimeInMsBeforeFirstInspection = (0, random_1.default)(maxSleepTime);
     const consumeResults = (0, inspectOverTime_1.inspectOverTime)({
         target: {
             sponsorshipAddress: sponsorshipAddress,
             operatorAddress: targetOperator,
-            streamPart: (0, protocol_1.toStreamPartID)(streamId, partition),
+            streamPart: (0, utils_1.toStreamPartID)(streamId, partition),
         },
         streamrClient,
         createOperatorFleetState,
@@ -40,7 +39,7 @@ const reviewSuspectNode = async ({ sponsorshipAddress, targetOperator, partition
         const kick = results.filter((b) => b).length <= results.length / 2;
         logger.info('Vote on flag', { sponsorshipAddress, targetOperator, kick });
         try {
-            await contractFacade.voteOnFlag(sponsorshipAddress, targetOperator, kick);
+            await myOperator.voteOnFlag(sponsorshipAddress, targetOperator, kick);
         }
         catch (err) {
             logger.warn('Encountered error while voting on flag', {

package/dist/src/plugins/operator/reviewSuspectNode.js.map

@@ -1 +1 @@
-{"version":3,"file":"reviewSuspectNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/reviewSuspectNode.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA2F;AAI3F,gDAAkD;AAClD,2DAAkC;AAClC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAqB1B,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACpC,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,cAAc,EACd,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,cAAc,EACd,WAAW,EACK,EAAiB,EAAE;IACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACrE,iGAAiG;IACjG,MAAM,kCAAkC,GAAG,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM,EAAE;YACJ,kBAAkB,EAAE,kBAAkB;YACtC,eAAe,EAAE,cAAc;YAC/B,UAAU,EAAE,IAAA,yBAAc,EAAC,QAAQ,EAAE,SAAS,CAAC;SAClD;QACD,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,kCAAkC;QAClC,oBAAoB;QACpB,sBAAsB;QACtB,cAAc;QACd,mBAAmB,EAAE,KAAK;QAC1B,WAAW;QACX,OAAO,EAAE,IAAA,oBAAY,EAAC,CAAC,CAAC;KAC3B,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC5F,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAA;IAC9D,IAAA,2BAAmB,EAAC,KAAK,IAAI,EAAE;QAC3B,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAClE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACzE,IAAI,CAAC;YACD,MAAM,cAAc,CAAC,UAAU,CAAC,kBAAkB,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;QAC7E,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBAClD,kBAAkB;gBAClB,cAAc;gBACd,IAAI;gBACJ,MAAM,EAAE,GAAG,EAAE,OAAO;aACvB,CAAC,CAAA;QACN,CAAC;IACL,CAAC,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA;AAxDY,QAAA,iBAAiB,qBAwD7B"}
+{"version":3,"file":"reviewSuspectNode.js","sourceRoot":"","sources":["../../../../src/plugins/operator/reviewSuspectNode.ts"],"names":[],"mappings":";;;;;;AACA,0CAA2G;AAC3G,2DAAkC;AAElC,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,cAAM,CAAC,MAAM,CAAC,CAAA;AAqB1B,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACpC,kBAAkB,EAClB,cAAc,EACd,SAAS,EACT,UAAU,EACV,aAAa,EACb,wBAAwB,EACxB,mBAAmB,EACnB,YAAY,EACZ,oBAAoB,EACpB,YAAY,EACZ,sBAAsB,EACtB,cAAc,EACd,WAAW,EACK,EAAiB,EAAE;IACnC,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,GAAG,YAAY,CAAC,SAAS,EAAE,CAAC;QACrD,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAA;IACjE,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAA;IACjE,iGAAiG;IACjG,MAAM,kCAAkC,GAAG,IAAA,gBAAM,EAAC,YAAY,CAAC,CAAA;IAC/D,MAAM,cAAc,GAAG,IAAA,iCAAe,EAAC;QACnC,MAAM,EAAE;YACJ,kBAAkB,EAAE,kBAAkB;YACtC,eAAe,EAAE,cAAc;YAC/B,UAAU,EAAE,IAAA,sBAAc,EAAC,QAAQ,EAAE,SAAS,CAAC;SAClD;QACD,aAAa;QACb,wBAAwB;QACxB,mBAAmB;QACnB,kCAAkC;QAClC,oBAAoB;QACpB,sBAAsB;QACtB,cAAc;QACd,mBAAmB,EAAE,KAAK;QAC1B,WAAW;QACX,OAAO,EAAE,IAAA,oBAAY,EAAC,CAAC,CAAC;KAC3B,CAAC,CAAA;IAEF,MAAM,iBAAiB,GAAG,CAAC,CAAC,YAAY,CAAC,SAAS,GAAG,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;IAC5F,MAAM,CAAC,KAAK,CAAC,yBAAyB,EAAE,EAAE,iBAAiB,EAAE,CAAC,CAAA;IAC9D,IAAA,2BAAmB,EAAC,KAAK,IAAI,EAAE;QAC3B,MAAM,OAAO,GAAG,MAAM,cAAc,EAAE,CAAA;QACtC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,CAAA;QAClE,MAAM,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAA;QACzE,IAAI,CAAC;YACD,MAAM,UAAU,CAAC,UAAU,CAAC,kBAAkB,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;QACzE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE;gBAClD,kBAAkB;gBAClB,cAAc;gBACd,IAAI;gBACJ,MAAM,EAAE,GAAG,EAAE,OAAO;aACvB,CAAC,CAAA;QACN,CAAC;IACL,CAAC,EAAE,iBAAiB,EAAE,WAAW,CAAC,CAAA;AACtC,CAAC,CAAA;AAxDY,QAAA,iBAAiB,qBAwD7B"}

package/dist/src/plugins/storage/BatchManager.js

@@ -4,7 +4,6 @@ exports.BatchManager = void 0;
 const events_1 = require("events");
 const utils_1 = require("@streamr/utils");
 const Batch_1 = require("./Batch");
-const utils_2 = require("@streamr/utils");
 const INSERT_STATEMENT = 'INSERT INTO stream_data '
     + '(stream_id, partition, bucket_id, ts, sequence_no, publisher_id, msg_chain_id, payload) '
     + 'VALUES (?, ?, ?, ?, ?, ?, ?, ?)';
@@ -31,7 +30,7 @@ class BatchManager extends events_1.EventEmitter {
             batchCloseTimeout: 1000,
             batchMaxRetries: 1000 // in total max ~16 minutes timeout
         };
-        this.opts = (0, utils_2.merge)(defaultOptions, opts);
+        this.opts = (0, utils_1.merge)(defaultOptions, opts);
         // bucketId => batch
         this.batches = Object.create(null);
         // batchId => batch

package/dist/src/plugins/storage/BatchManager.js.map

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

package/dist/src/plugins/storage/BucketManager.js

@@ -4,11 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BucketManager = void 0;
-const heap_1 = __importDefault(require("heap"));
 const cassandra_driver_1 = require("cassandra-driver");
+const heap_1 = __importDefault(require("heap"));
 const utils_1 = require("@streamr/utils");
 const Bucket_1 = require("./Bucket");
-const utils_2 = require("@streamr/utils");
 const { TimeUuid } = cassandra_driver_1.types;
 const logger = new utils_1.Logger(module);
 const toKey = (streamId, partition) => `${streamId}-${partition}`;
@@ -31,7 +30,7 @@ class BucketManager {
             maxBucketRecords: 500 * 1000,
             bucketKeepAliveSeconds: 60
         };
-        this.opts = (0, utils_2.merge)(defaultOptions, opts);
+        this.opts = (0, utils_1.merge)(defaultOptions, opts);
         this.streamParts = Object.create(null);
         this.buckets = Object.create(null);
         this.cassandraClient = cassandraClient;

package/dist/src/plugins/storage/BucketManager.js.map

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

package/dist/src/plugins/storage/DataQueryFormat.d.ts

@@ -1,4 +1,4 @@
-import { StreamMessage } from '@streamr/protocol';
+import { StreamMessage } from '@streamr/sdk';
 export interface Format {
     formatMessage: ((bytes: Uint8Array) => string) | ((bytes: Uint8Array) => Uint8Array);
     contentType: string;

package/dist/src/plugins/storage/DataQueryFormat.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFormat = exports.toObject = void 0;
-const trackerless_network_1 = require("@streamr/trackerless-network");
+const sdk_1 = require("@streamr/sdk");
 const utils_1 = require("@streamr/utils");
 const createJsonFormat = (formatMessage) => {
     return {
@@ -40,7 +40,7 @@ const toObject = (msg) => {
 };
 exports.toObject = toObject;
 const FORMATS = {
-    'object': createJsonFormat((bytes) => JSON.stringify((0, exports.toObject)((0, trackerless_network_1.convertBytesToStreamMessage)(bytes)))),
+    'object': createJsonFormat((bytes) => JSON.stringify((0, exports.toObject)((0, sdk_1.convertBytesToStreamMessage)(bytes)))),
     'raw': createBinaryFormat(utils_1.toLengthPrefixedFrame)
 };
 const getFormat = (id) => {

package/dist/src/plugins/storage/DataQueryFormat.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataQueryFormat.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DataQueryFormat.ts"],"names":[],"mappings":";;;AACA,sEAA0E;AAC1E,0CAAmE;AAUnE,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAU,EAAE;IAC9E,OAAO;QACH,aAAa;QACb,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,GAAG;QACd,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;KACd,CAAA;AACL,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,aAAgD,EAAU,EAAE;IACpF,OAAO;QACH,aAAa;QACb,WAAW,EAAE,0BAA0B;KAC1C,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAkB,EAAO,EAAE;IAChD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC5C,MAAM,MAAM,GAAQ;QAChB,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE;QAC3B,eAAe,EAAE,GAAG,CAAC,kBAAkB,EAAE;QACzC,SAAS,EAAE,GAAG,CAAC,YAAY,EAAE;QAC7B,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE;QACvC,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE;QACjC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE;QAC/B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,OAAO,EAAE,aAAa,YAAY,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa;QACzF,SAAS,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;KACxC,CAAA;IACD,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAnBY,QAAA,QAAQ,YAmBpB;AAED,MAAM,OAAO,GAA2B;IACpC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAA,gBAAQ,EAAC,IAAA,iDAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/G,KAAK,EAAE,kBAAkB,CAAC,6BAAqB,CAAC;CACnD,CAAA;AAEM,MAAM,SAAS,GAAG,CAAC,EAAsB,EAAsB,EAAE;IACpE,MAAM,GAAG,GAAG,EAAE,IAAI,QAAQ,CAAA;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC,CAAA;AAHY,QAAA,SAAS,aAGrB"}
+{"version":3,"file":"DataQueryFormat.js","sourceRoot":"","sources":["../../../../src/plugins/storage/DataQueryFormat.ts"],"names":[],"mappings":";;;AAAA,sCAAyE;AACzE,0CAAmE;AAUnE,MAAM,gBAAgB,GAAG,CAAC,aAA4C,EAAU,EAAE;IAC9E,OAAO;QACH,aAAa;QACb,WAAW,EAAE,kBAAkB;QAC/B,SAAS,EAAE,GAAG;QACd,MAAM,EAAE,GAAG;QACX,MAAM,EAAE,GAAG;KACd,CAAA;AACL,CAAC,CAAA;AAED,MAAM,kBAAkB,GAAG,CAAC,aAAgD,EAAU,EAAE;IACpF,OAAO;QACH,aAAa;QACb,WAAW,EAAE,0BAA0B;KAC1C,CAAA;AACL,CAAC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAC,GAAkB,EAAO,EAAE;IAChD,MAAM,aAAa,GAAG,GAAG,CAAC,gBAAgB,EAAE,CAAA;IAC5C,MAAM,MAAM,GAAQ;QAChB,QAAQ,EAAE,GAAG,CAAC,WAAW,EAAE;QAC3B,eAAe,EAAE,GAAG,CAAC,kBAAkB,EAAE;QACzC,SAAS,EAAE,GAAG,CAAC,YAAY,EAAE;QAC7B,cAAc,EAAE,GAAG,CAAC,iBAAiB,EAAE;QACvC,WAAW,EAAE,GAAG,CAAC,cAAc,EAAE;QACjC,UAAU,EAAE,GAAG,CAAC,aAAa,EAAE;QAC/B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,cAAc,EAAE,GAAG,CAAC,cAAc;QAClC,OAAO,EAAE,aAAa,YAAY,UAAU,CAAC,CAAC,CAAC,IAAA,mBAAW,EAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa;QACzF,SAAS,EAAE,IAAA,mBAAW,EAAC,GAAG,CAAC,SAAS,CAAC;KACxC,CAAA;IACD,IAAI,GAAG,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/B,MAAM,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAA;IACtC,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC,CAAA;AAnBY,QAAA,QAAQ,YAmBpB;AAED,MAAM,OAAO,GAA2B;IACpC,QAAQ,EAAE,gBAAgB,CAAC,CAAC,KAAiB,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAA,gBAAQ,EAAC,IAAA,iCAA2B,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC/G,KAAK,EAAE,kBAAkB,CAAC,6BAAqB,CAAC;CACnD,CAAA;AAEM,MAAM,SAAS,GAAG,CAAC,EAAsB,EAAsB,EAAE;IACpE,MAAM,GAAG,GAAG,EAAE,IAAI,QAAQ,CAAA;IAC1B,OAAO,OAAO,CAAC,GAAG,CAAC,CAAA;AACvB,CAAC,CAAA;AAHY,QAAA,SAAS,aAGrB"}