@across-protocol/sdk 3.3.19 → 3.3.21

package/dist/types/interfaces/ConfigStore.d.ts

@@ -1,12 +1,11 @@
-import { RateModelDictionary } from "../lpFeeCalculator/rateModel";
+import { RateModel } from "../lpFeeCalculator";
 import { BigNumber } from "../utils";
 import { SortableEvent } from "./Common";
 export interface ParsedTokenConfig {
-    rateModel: RateModelDictionary;
+    rateModel: RateModel;
     routeRateModel?: {
-        [path: string]: RateModelDictionary;
+        [path: string]: RateModel;
     };
-    uba?: UBAOnChainConfigType;
     spokeTargetBalances?: {
         [chainId: number]: {
             target: string;
@@ -40,6 +39,10 @@ export interface RouteRateModelUpdate extends SortableEvent {
     };
     l1Token: string;
 }
+export interface RateModelUpdate extends SortableEvent {
+    rateModel: string;
+    l1Token: string;
+}
 export interface TokenConfig extends SortableEvent {
     key: string;
     value: string;
@@ -56,106 +59,4 @@ export interface DisabledChainsUpdate extends SortableEvent {
 export interface LiteChainsIdListUpdate<ValueStore = number[]> extends GlobalConfigUpdate<ValueStore> {
     timestamp: number;
 }
-/**
- * A generic type of a dictionary that has string keys and values of type T. This
- * record is enforced to have a default entry within the "default" key.
- * @type Value The type of the values in the dictionary.
- */
-type RecordWithDefaultEntry<Value> = Record<string, Value>;
-/**
- * A generic type for an array of tuples.
- * @type Value The type of the values in the array.
- */
-type ArrayOfTuples<Value> = [Value, Value][];
-/**
- * A type for the UBA config object stored both on and off chain.
- * @type T The type of the values in the config.
- * @note This is a dictionary of parameters that defines a fee curve for the token.
- *       These parameters can be further subindexed by a route (e.g. using the key "1-10" or "42161-1")
- *       to create a specific fee curve for a token per route. The subkeys are as followed:
- *         - alpha: The alpha parameter of the fee curve.
- *         - gamma: The gamma parameter of the fee curve.
- *         - omega: The omega parameter of the fee curve.
- *         - rebalance: The rebalance parameters of the fee curve.
- */
-type UBAAgnosticConfigType<T> = {
-    /**
-     * A DAO controlled variable to track any donations made to the incentivePool liquidity
-     */
-    incentivePoolAdjustment?: Record<string, T>;
-    /**
-     * Used to scale rewards when a fee is larger than the incentive balance
-     */
-    ubaRewardMultiplier?: Record<string, T>;
-    /**
-     * This is a scalar value that is a constant percentage of each transfer that is allocated for LPs.
-     * This value can be determined by token and route-by-route.
-     */
-    alpha: RecordWithDefaultEntry<T>;
-    /**
-     * This is a piecewise linear function (defined by a vector of cut-off points and the values at
-     * those points) that determine additional LP fees as a function of utilization. This piecewise
-     * linear function can be determined by token and chain-by-chain.
-     */
-    gamma: RecordWithDefaultEntry<ArrayOfTuples<T>>;
-    /**
-     * This is a piecewise linear function (defined by a vector of cut-off points and the values at
-     * those points) that determine the balancing fees (rewards) that are imposed on (paid to) a user
-     * who makes a transfer involving a particular chain. There is a single piecewise linear function for
-     * each token/chain combination. A transfer will incur a balancing fee on both the origin and destination
-     * chains.
-     */
-    omega: RecordWithDefaultEntry<ArrayOfTuples<T>>;
-    /**
-     * This is a set of parameters that determine when a rebalance is triggered. A rebalance is triggered
-     * when the utilization of a pool is outside of the range defined by the lower and upper thresholds.
-     */
-    rebalance: RecordWithDefaultEntry<{
-        /**
-         * For tokens/chains that have a supported bridge, these are the lower and upper threshold that trigger
-         * the reallocation of funds. i.e. If the running balance on a chain moves below (above) threshold_lower
-         * (threshold_upper) then the bridge moves funds from Ethereum to the chain (from the chain to Ethereum).
-         */
-        threshold_lower?: T;
-        /**
-         * For tokens/chains that have a supported bridge, these are the lower and upper threshold that trigger
-         * the reallocation of funds. i.e. If the running balance on a chain moves below (above) threshold_lower
-         * (threshold_upper) then the bridge moves funds from Ethereum to the chain (from the chain to Ethereum).
-         */
-        threshold_upper?: T;
-        /**
-         * For tokens/chains that have a supported bridge, these are the values that are targeted whenever funds
-         * are reallocated.
-         */
-        target_lower?: T;
-        /**
-         * For tokens/chains that have a supported bridge, these are the values that are targeted whenever funds
-         * are reallocated.
-         */
-        target_upper?: T;
-    }>;
-};
-/**
- * A type for the UBA config object stored on chain.
- */
-export type UBAOnChainConfigType = UBAAgnosticConfigType<string>;
-/**
- * A type for the UBA config object after it has been parsed.
- */
-export type UBAParsedConfigType = UBAAgnosticConfigType<BigNumber>;
-/**
- * A type for UBAConfig Update events.
- */
-export type UBAConfigUpdates = SortableEvent & {
-    config: UBAParsedConfigType;
-    l1Token: string;
-};
-/**
- * A type for stringified UBAConfig Update events.
- */
-export type UBASerializedConfigUpdates = SortableEvent & {
-    config: UBAOnChainConfigType;
-    l1Token: string;
-};
-export {};
 //# sourceMappingURL=ConfigStore.d.ts.map

package/dist/types/interfaces/ConfigStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigStore.d.ts","sourceRoot":"","sources":["../../../src/interfaces/ConfigStore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ConfigStore.d.ts","sourceRoot":"","sources":["../../../src/interfaces/ConfigStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,SAAS,CAAC;IACrB,cAAc,CAAC,EAAE;QACf,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC3B,CAAC;IACF,mBAAmB,CAAC,EAAE;QACpB,CAAC,OAAO,EAAE,MAAM,GAAG;YACjB,MAAM,EAAE,MAAM,CAAC;YACf,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;CACH;AAED,MAAM,WAAW,sBAAsB;IACrC,MAAM,EAAE,SAAS,CAAC;IAClB,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,MAAM,iCAAiC,GAAG,IAAI,CAAC,sBAAsB,EAAE,WAAW,GAAG,QAAQ,CAAC,GAAG;IACrG,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,wBAAyB,SAAQ,aAAa;IAC7D,mBAAmB,CAAC,EAAE;QACpB,CAAC,OAAO,EAAE,MAAM,GAAG,sBAAsB,CAAC;KAC3C,CAAC;IACF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,mCAAoC,SAAQ,aAAa;IACxE,mBAAmB,CAAC,EAAE;QACpB,CAAC,OAAO,EAAE,MAAM,GAAG,iCAAiC,CAAC;KACtD,CAAC;IACF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,cAAc,EAAE;QACd,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC;KACxB,CAAC;IACF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,WAAY,SAAQ,aAAa;IAChD,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,kBAAkB,CAAC,UAAU,GAAG,MAAM,CAAE,SAAQ,aAAa;IAC5E,KAAK,EAAE,UAAU,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB,CAAC,UAAU,GAAG,MAAM,CAAE,SAAQ,kBAAkB,CAAC,UAAU,CAAC;IACnG,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB,CAAC,UAAU,GAAG,MAAM,EAAE,CAAE,SAAQ,kBAAkB,CAAC,UAAU,CAAC;IACnG,SAAS,EAAE,MAAM,CAAC;CACnB"}

package/dist/types/lpFeeCalculator/rateModel.d.ts

@@ -1,46 +1,8 @@
-type RateModelEventsDictionary = {
-    [l1TokenAddress: string]: {
-        blockNumber: number;
-        rateModel: string;
-    }[];
-};
-export type RateModelEvent = {
-    blockNumber: number;
-    transactionIndex: number;
-    logIndex: number;
-    rateModel: string;
-    l1Token: string;
-};
-interface RateModel {
-    UBar: string;
-    R0: string;
-    R1: string;
-    R2: string;
-}
-export declare class RateModelDictionary {
-    rateModelDictionary: RateModelEventsDictionary;
-    private _throwIfNotInitialized;
-    updateWithEvents(rateModelEvents: RateModelEvent[]): void;
-    /**
-     * Return the rate model for L1 token set at the block height.
-     * @param l1Token L1 token address to get rate model for.
-     * @param blockNumber Block height to get rate model for.
-     * @returns Rate model object.
-     */
-    getRateModelForBlockNumber(l1Token: string, blockNumber?: number): RateModel;
-    /**
-     * @notice Return all L1 tokens that had a rate model associated with it at the block number.
-     * @param blockNumber Returns l1 tokens that were mapped to a rate model at this block height. If undefined,
-     * this function will return all L1 tokens that have a block number as of the latest block height.
-     * @returns array of L1 token addresses.
-     */
-    getL1TokensFromRateModel(blockNumber?: number | undefined): string[];
-}
+import { RateModel } from "../lpFeeCalculator";
 /**
  * Helper method that returns parsed rate model from string, or throws.
  * @param rateModelString Stringified rate model to parse.
  * @returns Rate model object. Must conform to `expectedRateModelKeys` format.
  */
 export declare const parseAndReturnRateModelFromString: (rateModelString: string) => RateModel;
-export {};
 //# sourceMappingURL=rateModel.d.ts.map

package/dist/types/lpFeeCalculator/rateModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rateModel.d.ts","sourceRoot":"","sources":["../../../src/lpFeeCalculator/rateModel.ts"],"names":[],"mappings":"AAKA,KAAK,yBAAyB,GAAG;IAC/B,CAAC,cAAc,EAAE,MAAM,GAAG;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CACxE,CAAC;AAGF,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,UAAU,SAAS;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ;AAID,qBAAa,mBAAmB;IACvB,mBAAmB,EAAE,yBAAyB,CAAM;IAE3D,OAAO,CAAC,sBAAsB;IAK9B,gBAAgB,CAAC,eAAe,EAAE,cAAc,EAAE,GAAG,IAAI;IAIzD;;;;;OAKG;IACH,0BAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS;IAkC5E;;;;;OAKG;IACH,wBAAwB,CAAC,WAAW,GAAE,MAAM,GAAG,SAAqB,GAAG,MAAM,EAAE;CAmBhF;AAED;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,oBAAqB,MAAM,KAAG,SA8B3E,CAAC"}
+{"version":3,"file":"rateModel.d.ts","sourceRoot":"","sources":["../../../src/lpFeeCalculator/rateModel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,oBAAqB,MAAM,KAAG,SA8B3E,CAAC"}

package/dist/types/utils/index.d.ts

@@ -20,6 +20,7 @@ export * from "./BlockExplorerUtils";
 export * from "./BigNumberUtils";
 export * from "./CachingUtils";
 export * from "./NetworkUtils";
+export * from "./Profiler";
 export * from "./Multicall";
 export * from "./ReviverUtils";
 export * from "./DepositUtils";

package/dist/types/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@across-protocol/sdk",
   "author": "UMA Team",
-  "version": "3.3.19",
+  "version": "3.3.21",
   "license": "AGPL-3.0",
   "homepage": "https://docs.across.to/reference/sdk",
   "files": [

package/src/clients/AcrossConfigStoreClient/AcrossConfigStoreClient.ts

@@ -1,4 +1,4 @@
-import { utils, across } from "@uma/sdk";
+import { utils } from "@uma/sdk";
 import assert from "assert";
 import { Contract } from "ethers";
 import winston from "winston";
@@ -6,7 +6,6 @@ import { isError } from "../../typeguards";
 import {
   EventSearchConfig,
   MakeOptional,
-  findLast,
   isArrayOf,
   isDefined,
   isPositiveInteger,
@@ -16,6 +15,7 @@ import {
   sortEventsDescending,
   spreadEventWithBlockNumber,
   toBN,
+  toWei,
   utf8ToHex,
 } from "../../utils";
 import { PROTOCOL_DEFAULT_CHAIN_ID_INDICES } from "../../constants";
@@ -26,16 +26,17 @@ import {
   LiteChainsIdListUpdate,
   Log,
   ParsedTokenConfig,
+  RateModelUpdate,
   RouteRateModelUpdate,
   SortableEvent,
   SpokePoolTargetBalance,
   SpokeTargetBalanceUpdate,
   TokenConfig,
-  UBAConfigUpdates,
-  UBAParsedConfigType,
 } from "../../interfaces";
 import { parseJSONWithNumericString } from "../../utils/JSONUtils";
 import { BaseAbstractClient, isUpdateFailureReason, UpdateFailureReason } from "../BaseAbstractClient";
+import { parseAndReturnRateModelFromString } from "../../lpFeeCalculator/rateModel";
+import { RateModel } from "../../lpFeeCalculator";
 
 type ConfigStoreUpdateSuccess = {
   success: true;
@@ -63,9 +64,26 @@ export enum GLOBAL_CONFIG_STORE_KEYS {
   LITE_CHAIN_ID_INDICES = "LITE_CHAIN_ID_INDICES",
 }
 
+// Conveniently store known invalid token config update hashes to avoid spamming debug logs.
+const KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES = [
+  "0x422abc617c6598e4b91859f99c392939d2034c1a839a342a963a34a2f0390195",
+  "0x36c85e388279714b2c98d46e3377dc37a1575665b2cac5e52fe97d8d77efcd2b",
+  "0x6f0a93119e538dd84e02adfce821fb4e6dd9baddcceb041977e8ba3c39185ab8",
+  "0xc28d8bb445e0b747201e6f98ee62aa03009f4c04b8d6f9fad8f214ec1166463d",
+  "0x3b0719ef1e3cae2dc1a854a1012332a288e50ad24adc52861d42bcc30fd3deaf",
+  "0xbae5c792f74d9f0b6554acf793df0d6b3610868bd6f6a377371b9dec10038003",
+  "0xd983142980ac2451e913b152413e769f7a7007fe7305c2e8a03db432e892f84c",
+  "0xf64610347950488503428fd720132f8188aa26dcc48e3fc9a89b7bc24aa7fda2",
+  "0x1970fcd1e5d5d6cf3bbb640d30d5e471ce5161d65580cedb388526a32b2f7638",
+  "0xf098c547d726be8fda419faaee1850280ded1ea75a1b10f4a1614805fa4207d3",
+  "0xbfa181663761a78c66dd2c7012604eb910c4c39bad17089e2cc4a011ccc0e981",
+  "0x89830f5e81b9e8b44ac2f8966b2fa4bf8e71d7f546e2bc0e773d8ee8df4bdb36",
+  "0xb0ad6270124c925a234d9c4f87b60396f2b52fdc250cd2fc9cac792d0d62e467",
+  "0x779bc3bf2dba1128d5dda6be8ae99b503cae23343a7265a86bca3d5572ed4268",
+].map((hash) => hash.toLowerCase());
+
 export class AcrossConfigStoreClient extends BaseAbstractClient {
-  public cumulativeRateModelUpdates: across.rateModel.RateModelEvent[] = [];
-  public ubaConfigUpdates: UBAConfigUpdates[] = [];
+  public cumulativeRateModelUpdates: RateModelUpdate[] = [];
   public cumulativeRouteRateModelUpdates: RouteRateModelUpdate[] = [];
   public cumulativeMaxRefundCountUpdates: GlobalConfigUpdate[] = [];
   public cumulativeMaxL1TokenCountUpdates: GlobalConfigUpdate[] = [];
@@ -75,8 +93,6 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
   public cumulativeConfigStoreVersionUpdates: ConfigStoreVersionUpdate[] = [];
   public cumulativeDisabledChainUpdates: DisabledChainsUpdate[] = [];
 
-  protected rateModelDictionary: across.rateModel.RateModelDictionary;
-
   public hasLatestConfigStoreVersion = false;
   public chainId: number | undefined;
 
@@ -89,37 +105,43 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
     super(eventSearchConfig);
     this.firstBlockToSearch = eventSearchConfig.fromBlock;
     this.latestBlockSearched = 0;
-    this.rateModelDictionary = new across.rateModel.RateModelDictionary();
   }
 
-  // <-- START LEGACY CONFIGURATION OBJECTS -->
-  // @dev The following configuration objects are pre-UBA fee model configurations and are deprecated as of version
-  // 2 of the ConfigStore. They are kept here for backwards compatibility.
-
   getRateModelForBlockNumber(
     l1Token: string,
     originChainId: number | string,
     destinationChainId: number | string,
     blockNumber: number | undefined = undefined
-  ): across.constants.RateModel {
+  ): RateModel {
     // Use route-rate model if available, otherwise use default rate model for l1Token.
     const route = `${originChainId}-${destinationChainId}`;
     const routeRateModel = this.getRouteRateModelForBlockNumber(l1Token, route, blockNumber);
-    return routeRateModel ?? this.rateModelDictionary.getRateModelForBlockNumber(l1Token, blockNumber);
+    if (routeRateModel) {
+      return routeRateModel;
+    }
+
+    const defaultRateModelUpdate = sortEventsDescending(this.cumulativeRateModelUpdates).find(
+      (config) =>
+        config.blockNumber <= (blockNumber ?? 0) && config.l1Token === l1Token && config.rateModel !== undefined
+    );
+    if (!defaultRateModelUpdate) {
+      throw new Error(`Could not find TokenConfig update for ${l1Token} at block ${blockNumber}`);
+    }
+    return parseAndReturnRateModelFromString(defaultRateModelUpdate.rateModel);
   }
 
   getRouteRateModelForBlockNumber(
     l1Token: string,
     route: string,
     blockNumber: number | undefined = undefined
-  ): across.constants.RateModel | undefined {
+  ): RateModel | undefined {
     const config = (sortEventsDescending(this.cumulativeRouteRateModelUpdates) as RouteRateModelUpdate[]).find(
       (config) => config.blockNumber <= (blockNumber ?? 0) && config.l1Token === l1Token
     );
     if (config?.routeRateModel[route] === undefined) {
       return undefined;
     }
-    return across.rateModel.parseAndReturnRateModelFromString(config.routeRateModel[route]);
+    return parseAndReturnRateModelFromString(config.routeRateModel[route]);
   }
 
   /**
@@ -357,72 +379,37 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
 
     // Save new TokenConfig updates.
     for (const event of updatedTokenConfigEvents) {
+      // If transaction hash is known to be invalid, skip it immediately to avoid creating extra logs.
+      if (KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES.includes(event.transactionHash.toLowerCase())) {
+        continue;
+      }
+
       const args = {
         ...(spreadEventWithBlockNumber(event) as TokenConfig),
       };
 
       try {
-        const parsedValue = parseJSONWithNumericString(args.value) as ParsedTokenConfig;
-        const l1Token = args.key;
-
-        // TODO: Temporarily reformat the shape of the event that we pass into the sdk.rateModel class to make it fit
-        // the expected shape. This is a fix for now that we should eventually replace when we change the sdk.rateModel
-        // class itself to work with the generalized ConfigStore.
-        // eslint-disable-next-line @typescript-eslint/no-unused-vars
-        const { value, key, ...passedArgs } = args;
-
-        // Known transaction hash with bad config update.
-        // TODO: turn this into a rule that detects invalid UBAR values.
-        if (
-          passedArgs.transactionHash.toLowerCase() ===
-          "0x422abc617c6598e4b91859f99c392939d2034c1a839a342a963a34a2f0390195".toLowerCase()
-        ) {
-          throw new Error("Known bad config update found");
-        }
-
-        // Drop value and key before passing args.
-        if (parsedValue?.rateModel !== undefined) {
-          const rateModelForToken = JSON.stringify(parsedValue.rateModel);
-          this.cumulativeRateModelUpdates.push({ ...passedArgs, rateModel: rateModelForToken, l1Token });
-
-          // Store spokeTargetBalances
-          if (parsedValue?.spokeTargetBalances) {
-            // Note: cast is required because fromEntries always produces string keys, despite the function returning a
-            // numerical key.
-            const targetBalances = Object.fromEntries(
-              Object.entries(parsedValue.spokeTargetBalances).map(([chainId, targetBalance]) => {
-                const target = max(toBN(targetBalance.target), toBN(0));
-                const threshold = max(toBN(targetBalance.threshold), toBN(0));
-                return [chainId, { target, threshold }];
-              })
-            ) as SpokeTargetBalanceUpdate["spokeTargetBalances"];
-            this.cumulativeSpokeTargetBalanceUpdates.push({
-              ...passedArgs,
-              spokeTargetBalances: targetBalances,
-              l1Token,
-            });
-          } else {
-            this.cumulativeSpokeTargetBalanceUpdates.push({ ...passedArgs, spokeTargetBalances: {}, l1Token });
-          }
-
-          // Store route-specific rate models
-          if (parsedValue?.routeRateModel) {
-            const routeRateModel = Object.fromEntries(
-              Object.entries(parsedValue.routeRateModel).map(([path, routeRateModel]) => {
-                return [path, JSON.stringify(routeRateModel)];
-              })
-            );
-            this.cumulativeRouteRateModelUpdates.push({ ...passedArgs, routeRateModel, l1Token });
-          } else {
-            this.cumulativeRouteRateModelUpdates.push({ ...passedArgs, routeRateModel: {}, l1Token });
-          }
+        const { rateModel, routeRateModel, spokeTargetBalances } = this.validateTokenConfigUpdate(args);
+        const { value, key: l1Token, ...eventData } = args;
+
+        if (rateModel !== undefined) {
+          this.cumulativeRateModelUpdates.push({ ...eventData, rateModel, l1Token });
+          this.cumulativeSpokeTargetBalanceUpdates.push({
+            ...eventData,
+            spokeTargetBalances,
+            l1Token,
+          });
+          this.cumulativeRouteRateModelUpdates.push({ ...eventData, routeRateModel, l1Token });
         }
       } catch (err) {
         // @dev averageBlockTimeSeconds does not actually block.
         const maxWarnAge = (24 * 60 * 60) / (await utils.averageBlockTimeSeconds());
         if (result.searchEndBlock - event.blockNumber < maxWarnAge) {
           const errMsg = isError(err) ? err.message : "unknown error";
-          this.logger.debug({
+          // This will emit warning logs for any invalid historical updates and it will be very noisy, so
+          // developer should move over known invalid hashes to KNOWN_INVALID_TOKEN_CONFIG_UPDATE_HASHES to
+          // suppress these warnings.
+          this.logger.warn({
             at: "ConfigStore::update",
             message: `Caught error during ConfigStore update: ${errMsg}`,
             update: args,
@@ -431,12 +418,12 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
           this.logger.debug({
             at: "ConfigStoreClient::update",
             message: `Skipping invalid historical update at block ${event.blockNumber}`,
+            transactionHash: event.transactionHash,
           });
         }
         continue;
       }
     }
-    sortEventsAscendingInPlace(this.ubaConfigUpdates);
 
     // Save new Global config updates.
     for (let i = 0; i < updatedGlobalConfigEvents.length; i++) {
@@ -560,8 +547,6 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
       }
     }
 
-    this.rateModelDictionary.updateWithEvents(this.cumulativeRateModelUpdates);
-
     this.hasLatestConfigStoreVersion = this.hasValidConfigStoreVersionForTimestamp();
     this.latestBlockSearched = result.searchEndBlock;
     this.firstBlockToSearch = result.searchEndBlock + 1; // Next iteration should start off from where this one ended.
@@ -572,30 +557,75 @@ export class AcrossConfigStoreClient extends BaseAbstractClient {
     this.logger.debug({ at: "ConfigStore", message: "ConfigStore client updated!" });
   }
 
+  validateTokenConfigUpdate(args: TokenConfig): {
+    spokeTargetBalances: SpokeTargetBalanceUpdate["spokeTargetBalances"];
+    rateModel: string | undefined;
+    routeRateModel: RouteRateModelUpdate["routeRateModel"];
+  } {
+    const { value, key, transactionHash } = args;
+    const parsedValue = parseJSONWithNumericString(value) as ParsedTokenConfig;
+    const l1Token = key;
+
+    // Return the following parameters if the TokenConfig update is valid, otherwise throw an error.
+    // Remove any config updates with invalid rate models by throwing an error if any part of the TokenConfig
+    // is wrong before we push any events into this client's state.
+    let rateModelForToken: string | undefined = undefined;
+    let spokeTargetBalances: SpokeTargetBalanceUpdate["spokeTargetBalances"] = {};
+    let routeRateModel: RouteRateModelUpdate["routeRateModel"] = {};
+
+    // Drop value and key before passing args.
+    if (parsedValue?.rateModel !== undefined) {
+      const rateModel = parsedValue.rateModel;
+      assert(
+        this.isValidRateModel(rateModel),
+        `Invalid rateModel UBar for ${l1Token} at transaction ${transactionHash}, ${JSON.stringify(rateModel)}`
+      );
+      rateModelForToken = JSON.stringify(rateModel);
+
+      // Store spokeTargetBalances
+      if (parsedValue?.spokeTargetBalances) {
+        // Note: cast is required because fromEntries always produces string keys, despite the function returning a
+        // numerical key.
+        spokeTargetBalances = Object.fromEntries(
+          Object.entries(parsedValue.spokeTargetBalances).map(([chainId, targetBalance]) => {
+            const target = max(toBN(targetBalance.target), toBN(0));
+            const threshold = max(toBN(targetBalance.threshold), toBN(0));
+            return [chainId, { target, threshold }];
+          })
+        ) as SpokeTargetBalanceUpdate["spokeTargetBalances"];
+      }
+
+      // Store route-specific rate models
+      if (parsedValue?.routeRateModel) {
+        routeRateModel = Object.fromEntries(
+          Object.entries(parsedValue.routeRateModel).map(([path, routeRateModel]) => {
+            assert(
+              this.isValidRateModel(routeRateModel) &&
+                `Invalid routeRateModel UBar for ${path} for ${l1Token} at transaction ${transactionHash}, ${JSON.stringify(
+                  routeRateModel
+                )}`
+            );
+            return [path, JSON.stringify(routeRateModel)];
+          })
+        );
+      }
+    }
+
+    return {
+      spokeTargetBalances,
+      rateModel: rateModelForToken,
+      routeRateModel,
+    };
+  }
+
+  isValidRateModel(rateModel: RateModel): boolean {
+    // UBar should be between 0% and 100%.
+    return toBN(rateModel.UBar).gt(0) && toBN(rateModel.UBar).lt(toWei("1"));
+  }
+
   filterDisabledChains(disabledChains: number[]): number[] {
     // If any chain ID's are not integers then ignore. UMIP-157 requires that this key cannot include
     // the chain ID 1.
     return disabledChains.filter((chainId: number) => !isNaN(chainId) && Number.isInteger(chainId) && chainId !== 1);
   }
-
-  /**
-   * Retrieves the most recently set UBA config for a given L1 token address before a block number.
-   * @param l1TokenAddress The L1 token address to retrieve the config for
-   * @param blockNumber The block number to retrieve the config for. If not specified, sets block to max integer
-   * meaning that this function will return the latest config.
-   * @returns The UBA config for the given L1 token address and block number, or undefined if no config exists
-   * before blockNumber.
-   */
-  public getUBAConfig(l1TokenAddress: string, blockNumber = Number.MAX_SAFE_INTEGER): UBAParsedConfigType | undefined {
-    // We only care about searching on the block number and not any events that occurred in the same block
-    // but with a lower transaction index. In other words, if the UBA config was updated as the absolute
-    // last transaction in a block, the update still applies to all preceding UBA events in the same block.
-    // This is a simplifying assumption that we can make because the ConfigStore admin role is whitelisted and assumed
-    // to be acting in the best interest of the protocol.
-    const config = findLast(
-      this.ubaConfigUpdates,
-      (config) => config.l1Token === l1TokenAddress && config.blockNumber <= blockNumber
-    );
-    return config?.config;
-  }
 }

package/src/contracts/acrossConfigStore.ts

@@ -14,21 +14,21 @@ const L1TokenConfigSs = object({
   rateModel: RateModelSs,
   routeRateModel: optional(record(string(), RateModelSs)),
 });
-export type RateModel = Infer<typeof RateModelSs>;
-export type L1TokenConfig = Infer<typeof L1TokenConfigSs>;
+type RateModelSS = Infer<typeof RateModelSs>;
+type L1TokenConfigSS = Infer<typeof L1TokenConfigSs>;
 
 export class Client {
   public readonly contract: AcrossConfigStore;
   constructor(address: string, provider: Provider) {
     this.contract = AcrossConfigStore__factory.connect(address, provider);
   }
-  static parseL1TokenConfig(data: string): L1TokenConfig {
+  static parseL1TokenConfig(data: string): L1TokenConfigSS {
     const l1TokenConfig = JSON.parse(data);
     const l1TokenConfigMask = filterFalsyKeys(mask(l1TokenConfig, L1TokenConfigSs));
     assert(l1TokenConfigMask, L1TokenConfigSs);
     return l1TokenConfigMask;
   }
-  async getL1TokenConfig(l1TokenAddress: string, overrides: CallOverrides = {}): Promise<L1TokenConfig> {
+  async getL1TokenConfig(l1TokenAddress: string, overrides: CallOverrides = {}): Promise<L1TokenConfigSS> {
     const data = await this.contract.l1TokenConfig(l1TokenAddress, overrides);
     return Client.parseL1TokenConfig(data);
   }
@@ -37,7 +37,7 @@ export class Client {
     overrides: CallOverrides = {},
     originChainId?: number,
     destinationChainId?: number
-  ): Promise<RateModel> {
+  ): Promise<RateModelSS> {
     const l1TokenConfig = await this.getL1TokenConfig(l1TokenAddress, overrides);
     if (originChainId === undefined || destinationChainId === undefined) return l1TokenConfig.rateModel;
     const routeRateModelKey = `${originChainId}-${destinationChainId}`;