Skip to content

Commit

Permalink
Merge branch 'master' into bz/atomicWethAdapters
Browse files Browse the repository at this point in the history
  • Loading branch information
bmzig authored Dec 20, 2024
2 parents 8dc6384 + e9ad355 commit 9c6949a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

# These owners will be the default owners for everything in
# the repo unless a later match takes precedence.
* @mrice32 @nicholaspai @pxrl @james-a-morris
* @mrice32 @nicholaspai @pxrl @james-a-morris @dohaki
5 changes: 1 addition & 4 deletions src/clients/ProfitClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -660,8 +660,6 @@ export class ProfitClient {
// Fallback to Coingecko's free API for now.
// TODO: Add support for Coingecko Pro.
const coingeckoProApiKey = undefined;
// TODO: Set this once we figure out gas markup on the API side.
const gasMarkup = 0;
// Call the factory to create a new QueryBase instance.
return relayFeeCalculator.QueryBase__factory.create(
chainId,
Expand All @@ -670,8 +668,7 @@ export class ProfitClient {
undefined, // spokePoolAddress
undefined, // simulatedRelayerAddress
coingeckoProApiKey,
this.logger,
gasMarkup
this.logger
);
}
}
2 changes: 1 addition & 1 deletion src/common/Constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ export const SCROLL_CUSTOM_GATEWAY: { [chainId: number]: { l1: string; l2: strin
},
};

// Expected worst-case time for message from L1 to propogate to L2 in seconds
// Expected worst-case time for message from L1 to propagate to L2 in seconds
export const EXPECTED_L1_TO_L2_MESSAGE_TIME = {
[CHAIN_IDs.ALEPH_ZERO]: 20 * 60,
[CHAIN_IDs.ARBITRUM]: 20 * 60,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/CCTPUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export async function retrieveOutstandingCCTPBridgeUSDCTransfers(
return undefined;
}
// Call into the destinationMessageTransmitter contract to determine if the message has been processed
// on the destionation chain. We want to make sure the message **hasn't** been processed.
// on the destination chain. We want to make sure the message **hasn't** been processed.
const isMessageProcessed = await hasCCTPMessageBeenProcessed(sourceDomain, nonce, destinationMessageTransmitter);
if (isMessageProcessed) {
return undefined;
Expand Down
2 changes: 1 addition & 1 deletion src/utils/ProviderUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ export async function getProvider(
const rpcRateLimited =
({ nodeMaxConcurrency, logger }) =>
async (attempt: number, url: string): Promise<boolean> => {
// Implement a slightly aggressive expontential backoff to account for fierce paralellism.
// Implement a slightly aggressive expontential backoff to account for fierce parallelism.
// @todo: Start w/ maxConcurrency low and increase until 429 responses start arriving.
const baseDelay = 1000 * Math.pow(2, attempt); // ms; attempt = [0, 1, 2, ...]
const delayMs = baseDelay + baseDelay * Math.random();
Expand Down
2 changes: 1 addition & 1 deletion tasks/integration-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ task("integration-tests", "Run integration tests against key Dataworker function

// Override environment variables that we want to control for, for example we want to prevent the runner of this
// script from sending any on-chain transactions.
process.env.POLLING_DELAY = "0"; // Set to severless mode so that bot terminates after successful run.
process.env.POLLING_DELAY = "0"; // Set to serverless mode so that bot terminates after successful run.
process.env.DISPUTER_ENABLED = "true";
process.env.PROPOSER_ENABLED = "true";
process.env.EXECUTOR_ENABLED = "true";
Expand Down

0 comments on commit 9c6949a

Please sign in to comment.