@reclaimprotocol/attestor-core 5.0.1-beta.2 → 5.0.1-beta.22

package/lib/avs/contracts/factories/index.js

@@ -1,4 +1,4 @@
-import { ReclaimServiceManager__factory } from "./ReclaimServiceManager__factory.js";
-export {
-  ReclaimServiceManager__factory
-};
+/* Autogenerated file. Do not edit manually. */
+/* tslint:disable */
+/* eslint-disable */
+export { ReclaimServiceManager__factory } from "./ReclaimServiceManager__factory.js";

package/lib/avs/contracts/index.js

@@ -1,6 +1,2 @@
-import * as factories from "./factories/index.js";
-import { ReclaimServiceManager__factory } from "./factories/ReclaimServiceManager__factory.js";
-export {
-  ReclaimServiceManager__factory,
-  factories
-};
+export * as factories from "./factories/index.js";
+export { ReclaimServiceManager__factory } from "./factories/ReclaimServiceManager__factory.js";

package/lib/avs/types/index.js

@@ -0,0 +1 @@
+export {};

package/lib/avs/utils/contracts.js

@@ -1,53 +1,33 @@
-import { Contract, JsonRpcProvider, Wallet } from "ethers";
-import { avsDirectoryABI } from "../../avs/abis/avsDirectoryABI.js";
-import { delegationABI } from "../../avs/abis/delegationABI.js";
-import { registryABI } from "../../avs/abis/registryABI.js";
-import { CHAIN_CONFIGS, PRIVATE_KEY, SELECTED_CHAIN_ID } from "../../avs/config.js";
-import { ReclaimServiceManager__factory } from "../../avs/contracts/index.js";
+import { Contract, JsonRpcProvider, Wallet } from 'ethers';
+import { avsDirectoryABI } from "../abis/avsDirectoryABI.js";
+import { delegationABI } from "../abis/delegationABI.js";
+import { registryABI } from "../abis/registryABI.js";
+import { CHAIN_CONFIGS, PRIVATE_KEY, SELECTED_CHAIN_ID } from "../config.js";
+import { ReclaimServiceManager__factory } from "../contracts/index.js";
 const configs = {};
-function getContracts(chainId = SELECTED_CHAIN_ID) {
-  const config = CHAIN_CONFIGS[chainId];
-  if (!config) {
-    throw new Error(`No config found for chain ID: ${chainId}`);
-  }
-  configs[chainId] ||= initialiseContracts(config);
-  return configs[chainId];
+/**
+ * get the contracts for the given chain ID
+ */
+export function getContracts(chainId = SELECTED_CHAIN_ID) {
+    const config = CHAIN_CONFIGS[chainId];
+    if (!config) {
+        throw new Error(`No config found for chain ID: ${chainId}`);
+    }
+    configs[chainId] ||= initialiseContracts(config);
+    return configs[chainId];
 }
-function initialiseContracts({
-  rpcUrl,
-  stakeRegistryAddress,
-  avsDirectoryAddress,
-  contractAddress,
-  delegationManagerAddress
-}, privateKey = PRIVATE_KEY) {
-  const provider = new JsonRpcProvider(rpcUrl);
-  const wallet = privateKey ? new Wallet(privateKey, provider) : void 0;
-  return {
-    provider,
-    wallet,
-    delegationManager: new Contract(
-      delegationManagerAddress,
-      delegationABI,
-      wallet || provider
-    ),
-    // eslint-disable-next-line camelcase
-    contract: ReclaimServiceManager__factory.connect(
-      contractAddress,
-      wallet || provider
-    ),
-    registryContract: new Contract(
-      stakeRegistryAddress,
-      registryABI,
-      wallet || provider
-    ),
-    avsDirectory: new Contract(
-      avsDirectoryAddress,
-      avsDirectoryABI,
-      wallet || provider
-    )
-  };
+export function initialiseContracts({ rpcUrl, stakeRegistryAddress, avsDirectoryAddress, contractAddress, delegationManagerAddress, }, privateKey = PRIVATE_KEY) {
+    const provider = new JsonRpcProvider(rpcUrl);
+    const wallet = privateKey
+        ? new Wallet(privateKey, provider)
+        : undefined;
+    return {
+        provider,
+        wallet,
+        delegationManager: new Contract(delegationManagerAddress, delegationABI, wallet || provider),
+        // eslint-disable-next-line camelcase
+        contract: ReclaimServiceManager__factory.connect(contractAddress, wallet || provider),
+        registryContract: new Contract(stakeRegistryAddress, registryABI, wallet || provider),
+        avsDirectory: new Contract(avsDirectoryAddress, avsDirectoryABI, wallet || provider),
+    };
 }
-export {
-  getContracts,
-  initialiseContracts
-};

package/lib/avs/utils/register.js

@@ -1,74 +1,79 @@
-import { hexlify, randomBytes, SigningKey } from "ethers";
-import { RECLAIM_PUBLIC_URL, SELECTED_CHAIN_ID } from "../../avs/config.js";
-import { getContracts } from "../../avs/utils/contracts.js";
+import { hexlify, randomBytes, SigningKey } from 'ethers';
+import { RECLAIM_PUBLIC_URL, SELECTED_CHAIN_ID } from "../config.js";
+import { getContracts } from "./contracts.js";
 import { logger as LOGGER } from "../../utils/index.js";
-async function registerOperator({
-  logger = LOGGER,
-  chainId = SELECTED_CHAIN_ID,
-  wallet = getContracts(chainId).wallet,
-  reclaimRpcUrl = RECLAIM_PUBLIC_URL
-} = {}) {
-  const contracts = getContracts(chainId);
-  const delegationManager = contracts.delegationManager.connect(wallet);
-  const avsDirectory = contracts.avsDirectory.connect(wallet);
-  const contract = contracts.contract.connect(wallet);
-  const registryContract = contracts.registryContract.connect(wallet);
-  const addr = wallet.address;
-  try {
-    const tx1 = await delegationManager.registerAsOperator({
-      earningsReceiver: addr,
-      delegationApprover: "0x0000000000000000000000000000000000000000",
-      stakerOptOutWindowBlocks: 0
-    }, "");
-    await tx1.wait();
-    logger.info("operator registered on DM successfully");
-  } catch (err) {
-    if (!err.message.includes("operator has already registered")) {
-      throw err;
+/**
+ * Registers the operator on the chain, if required.
+ * If already registered -- will just pass through
+ */
+export async function registerOperator({ logger = LOGGER, chainId = SELECTED_CHAIN_ID, wallet = getContracts(chainId).wallet, reclaimRpcUrl = RECLAIM_PUBLIC_URL } = {}) {
+    const contracts = getContracts(chainId);
+    const delegationManager = contracts.delegationManager
+        .connect(wallet);
+    const avsDirectory = contracts.avsDirectory
+        .connect(wallet);
+    const contract = contracts.contract
+        .connect(wallet);
+    const registryContract = contracts.registryContract
+        .connect(wallet);
+    const addr = wallet.address;
+    try {
+        const tx1 = await delegationManager
+            .registerAsOperator({
+            earningsReceiver: addr,
+            delegationApprover: '0x0000000000000000000000000000000000000000',
+            stakerOptOutWindowBlocks: 0
+        }, '');
+        await tx1.wait();
+        logger.info('operator registered on DM successfully');
     }
-    logger.info("Operator already registered on EL");
-  }
-  const salt = hexlify(randomBytes(32));
-  const expiry = Math.floor(Date.now() / 1e3) + 3600;
-  const operatorSignature = {
-    expiry,
-    salt,
-    signature: ""
-  };
-  const contractAddress = await contract.getAddress();
-  const digestHash = await avsDirectory.calculateOperatorAVSRegistrationDigestHash(
-    addr,
-    contractAddress,
-    salt,
-    expiry
-  );
-  const signingKey = new SigningKey(
-    wallet.privateKey
-  );
-  const signature = signingKey.sign(digestHash);
-  operatorSignature.signature = signature.serialized;
-  logger.info("operator signature generated successfully");
-  if (!await registryContract.operatorRegistered(addr)) {
-    const tx2 = await registryContract.registerOperatorWithSignature(addr, operatorSignature);
-    await tx2.wait();
-    logger.info("operator registered on AVS successfully");
-  } else {
-    logger.info("Operator already registered on AVS");
-  }
-  const existingMetadata = await contract.getMetadataForOperator(addr).catch((err) => {
-    if (err.message.includes("Operator not found")) {
-      return void 0;
+    catch (err) {
+        if (!err.message.includes('operator has already registered')) {
+            throw err;
+        }
+        logger.info('Operator already registered on EL');
     }
-    throw err;
-  });
-  const metadata = { addr, url: reclaimRpcUrl };
-  if (existingMetadata?.addr === metadata.addr && existingMetadata?.url === metadata.url) {
-    logger.info("operator metadata already up to date");
-    return;
-  }
-  await contract.updateOperatorMetadata(metadata);
-  logger.info({ metadata }, "operator metadata updated successfully");
+    const salt = hexlify(randomBytes(32));
+    // Example expiry, 1 hour from now
+    const expiry = Math.floor(Date.now() / 1000) + 3600;
+    // Define the output structure
+    const operatorSignature = {
+        expiry: expiry,
+        salt: salt,
+        signature: ''
+    };
+    // Calculate the digest hash using the avsDirectory's method
+    const contractAddress = await contract.getAddress();
+    const digestHash = await avsDirectory
+        .calculateOperatorAVSRegistrationDigestHash(addr, contractAddress, salt, expiry);
+    // Sign the digest hash with the operator's private key
+    const signingKey = new SigningKey(wallet.privateKey);
+    const signature = signingKey.sign(digestHash);
+    // Encode the signature in the required format
+    operatorSignature.signature = signature.serialized;
+    logger.info('operator signature generated successfully');
+    if (!(await registryContract.operatorRegistered(addr))) {
+        const tx2 = await registryContract
+            .registerOperatorWithSignature(addr, operatorSignature);
+        await tx2.wait();
+        logger.info('operator registered on AVS successfully');
+    }
+    else {
+        logger.info('Operator already registered on AVS');
+    }
+    const existingMetadata = await contract.getMetadataForOperator(addr)
+        .catch(err => {
+        if (err.message.includes('Operator not found')) {
+            return undefined;
+        }
+        throw err;
+    });
+    const metadata = { addr, url: reclaimRpcUrl };
+    if (existingMetadata?.addr === metadata.addr
+        && existingMetadata?.url === metadata.url) {
+        logger.info('operator metadata already up to date');
+        return;
+    }
+    await contract.updateOperatorMetadata(metadata);
+    logger.info({ metadata }, 'operator metadata updated successfully');
 }
-export {
-  registerOperator
-};

package/lib/avs/utils/tasks.js

@@ -1,48 +1,41 @@
-import { EventLog, getBytes } from "ethers";
-import { getContracts } from "../../avs/utils/contracts.js";
-async function createNewClaimRequestOnChain({
-  request,
-  payer,
-  chainId,
-  ...rest
-}) {
-  const contracts = getContracts(chainId);
-  const contract = contracts.contract.connect(payer);
-  const ownerAddress = typeof rest.owner === "string" ? rest.owner : rest.owner.address;
-  const fullRequest = {
-    ...request,
-    owner: ownerAddress
-  };
-  const signature = await getSignature();
-  const task = await contract.createNewTask(fullRequest, signature || "0x00");
-  const rslt = await task.wait();
-  const logs = rslt?.logs ?? [];
-  const eventLogs = logs.filter((log) => log instanceof EventLog);
-  const ev = eventLogs[0];
-  const arg = ev?.args;
-  return { task: arg, tx: rslt };
-  function getSignature() {
-    if (ownerAddress.toLowerCase() === payer.address.toLowerCase()) {
-      return;
+import { EventLog, getBytes } from 'ethers';
+import { getContracts } from "./contracts.js";
+export async function createNewClaimRequestOnChain({ request, payer, chainId, ...rest }) {
+    const contracts = getContracts(chainId);
+    const contract = contracts.contract.connect(payer);
+    const ownerAddress = typeof rest.owner === 'string'
+        ? rest.owner
+        : rest.owner.address;
+    const fullRequest = {
+        ...request,
+        owner: ownerAddress
+    };
+    const signature = await getSignature();
+    const task = await contract.createNewTask(fullRequest, signature || '0x00');
+    const rslt = await task.wait();
+    const logs = rslt?.logs ?? [];
+    const eventLogs = logs.filter((log) => log instanceof EventLog);
+    // check task created event was emitted
+    const ev = eventLogs[0];
+    const arg = ev?.args;
+    return { task: arg, tx: rslt };
+    function getSignature() {
+        if (ownerAddress.toLowerCase() === payer.address.toLowerCase()) {
+            return;
+        }
+        if ('requestSignature' in rest) {
+            return rest.requestSignature;
+        }
+        if (typeof rest.owner !== 'object') {
+            throw new Error('Owner wallet must be provided or'
+                + ' requestSignature must be provided');
+        }
+        return signClaimRequest(fullRequest, rest.owner, chainId);
     }
-    if ("requestSignature" in rest) {
-      return rest.requestSignature;
-    }
-    if (typeof rest.owner !== "object") {
-      throw new Error(
-        "Owner wallet must be provided or requestSignature must be provided"
-      );
-    }
-    return signClaimRequest(fullRequest, rest.owner, chainId);
-  }
 }
-async function signClaimRequest(request, owner, chainId) {
-  const contract = getContracts(chainId).contract;
-  const encoded = await contract.encodeClaimRequest(request);
-  const strSig = await owner.signMessage(getBytes(encoded));
-  return getBytes(strSig);
+export async function signClaimRequest(request, owner, chainId) {
+    const contract = getContracts(chainId).contract;
+    const encoded = await contract.encodeClaimRequest(request);
+    const strSig = await owner.signMessage(getBytes(encoded));
+    return getBytes(strSig);
 }
-export {
-  createNewClaimRequestOnChain,
-  signClaimRequest
-};