Skip to content

Commit

Permalink
Merge pull request #5189 from connext/hotfix-disable-cooldown-propagate
Browse files Browse the repository at this point in the history
fix: disable checking propagate cooldown
  • Loading branch information
preethamr authored Nov 16, 2023
2 parents 79d70b5 + 0483743 commit 852cc80
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 40 deletions.
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
import {
createLoggingContext,
getNtpTimeSeconds,
NxtpError,
RequestContext,
RootManagerMeta,
} from "@connext/nxtp-utils";
import { createLoggingContext, NxtpError, RequestContext, RootManagerMeta } from "@connext/nxtp-utils";
import { BigNumber, constants } from "ethers";

import { getBestProvider, getContract, getJsonRpcProvider, sendWithRelayerWithBackup } from "../../../mockable";
import { NoChainIdForHubDomain, NoProviderForDomain } from "../errors";
import { sendWithRelayerWithBackup } from "../../../mockable";
import { NoChainIdForHubDomain } from "../errors";
import {
getPropagateParamsArbitrum,
getPropagateParamsBnb,
Expand Down Expand Up @@ -44,7 +38,7 @@ export const getParamsForDomainFn: Record<
"2053862260": getPropagateParamsZkSync,
};

const LH_PROPAGATE_WINDOW = 10 * 60; // 10mins
//const LH_PROPAGATE_WINDOW = 10 * 60; // 10mins

export const propagate = async () => {
const {
Expand All @@ -65,28 +59,28 @@ export const propagate = async () => {
const relayerProxyHubAddress = config.chains[config.hubDomain].deployments.relayerProxy;

// Check if LH should propagate as backup of keep3r
logger.info("Checking if LH propagate workable", requestContext, methodContext);
// logger.info("Checking if LH propagate workable", requestContext, methodContext);

const l1RpcUrl = await getBestProvider(config.chains[config.hubDomain]?.providers ?? []);
if (!l1RpcUrl) {
throw new NoProviderForDomain(config.hubDomain, requestContext, methodContext);
}
const l1Provider = getJsonRpcProvider(l1RpcUrl);
const relayerProxyContract = getContract(relayerProxyHubAddress, contracts.relayerProxyHub, l1Provider);
// const l1RpcUrl = await getBestProvider(config.chains[config.hubDomain]?.providers ?? []);
// if (!l1RpcUrl) {
// throw new NoProviderForDomain(config.hubDomain, requestContext, methodContext);
// }
// const l1Provider = getJsonRpcProvider(l1RpcUrl);
// const relayerProxyContract = getContract(relayerProxyHubAddress, contracts.relayerProxyHub, l1Provider);

const [lastPropagateAt, propagateCooldown] = await Promise.all([
relayerProxyContract.lastPropagateAt(),
relayerProxyContract.propagateCooldown(),
]);
const curTimeInSeconds = getNtpTimeSeconds();
if ((lastPropagateAt.add(propagateCooldown).toNumber() as number) + LH_PROPAGATE_WINDOW >= curTimeInSeconds) {
logger.info("LH Propagate skipping", requestContext, methodContext, {
propagateWorkableAt: lastPropagateAt.add(propagateCooldown).toNumber(),
LH_PROPAGATE_WINDOW,
curTimeInSeconds,
});
return;
}
// const [lastPropagateAt, propagateCooldown] = await Promise.all([
// relayerProxyContract.lastPropagateAt(),
// relayerProxyContract.propagateCooldown(),
// ]);
// const curTimeInSeconds = getNtpTimeSeconds();
// if ((lastPropagateAt.add(propagateCooldown).toNumber() as number) + LH_PROPAGATE_WINDOW >= curTimeInSeconds) {
// logger.info("LH Propagate skipping", requestContext, methodContext, {
// propagateWorkableAt: lastPropagateAt.add(propagateCooldown).toNumber(),
// LH_PROPAGATE_WINDOW,
// curTimeInSeconds,
// });
// return;
// }

const _connectors: string[] = [];
const _encodedData: string[] = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ describe("Operations: Propagate", () => {
await expect(propagate()).to.eventually.be.rejectedWith(NoChainIdForHubDomain);
});

it("should skip if propagate is not workable", async () => {
const curTimestamp = getNtpTimeSeconds();
stub(Mockable, "getContract").returns({
lastPropagateAt: stub().resolves(BigNumber.from(curTimestamp)),
propagateCooldown: stub().resolves(BigNumber.from(1800)),
} as any);

await propagate();
expect(sendWithRelayerWithBackupStub).callCount(0);
});
// it("should skip if propagate is not workable", async () => {
// const curTimestamp = getNtpTimeSeconds();
// stub(Mockable, "getContract").returns({
// lastPropagateAt: stub().resolves(BigNumber.from(curTimestamp)),
// propagateCooldown: stub().resolves(BigNumber.from(1800)),
// } as any);

// await propagate();
// expect(sendWithRelayerWithBackupStub).callCount(0);
// });

it("should send encoded data to relayer succesfully", async () => {
stub(PropagateFns, "getParamsForDomainFn").value({
Expand Down

0 comments on commit 852cc80

Please sign in to comment.