[REBASE MERGE] CR11 <> master

.github/workflows/containers.yaml

@@ -118,7 +118,7 @@ jobs:
       github.ref == 'refs/heads/master' &&
       contains(needs.changed-files.outputs.all_modified_files, ',dockerfiles/metadata-crawler')
     with:
-      workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo/providers/github-by-repos
+      workload-id-provider: projects/1094498259535/locations/global/workloadIdentityPools/gh-celo-monorepo-master/providers/github-by-repos
       service-account: '[email protected]'
       artifact-registry: us-west1-docker.pkg.dev/devopsre/celo-monorepo/blockscout-metadata-crawler
       tags: latest

dockerfiles/celotool/Dockerfile

@@ -24,8 +24,6 @@ COPY packages/celotool/package.json packages/celotool/
 COPY packages/dev-utils/package.json packages/dev-utils/
 COPY packages/env-tests/package.json packages/env-tests/package.json
 COPY packages/protocol/package.json packages/protocol/
-COPY packages/typescript/package.json packages/typescript/
-COPY patches/ patches/
 COPY scripts/ scripts/
 # Makes build fail if it doesn't copy git, will be removed after build
 COPY .git .git
@@ -38,7 +36,6 @@ COPY packages/dev-utils packages/dev-utils/
 COPY packages/env-tests packages/env-tests
 COPY packages/helm-charts packages/helm-charts
 COPY packages/protocol packages/protocol/
-COPY packages/typescript packages/typescript/
 
 RUN yarn build
 

dockerfiles/metadata-crawler/Dockerfile

@@ -15,8 +15,6 @@ RUN npm install -g typescript npm
 
 COPY lerna.json package.json yarn.lock ./
 COPY scripts scripts/
-COPY packages/typescript packages/typescript/
-COPY packages/sdk packages/sdk/
 COPY packages/dev-utils packages/dev-utils/
 COPY packages/metadata-crawler packages/metadata-crawler/
 

package.json

@@ -64,7 +64,7 @@
     "typescript": "^5.3.3"
   },
   "resolutions": {
-    "ganache": "npm:@soloseng/[email protected]beta.1",
+    "ganache": "npm:@celo/[email protected]unofficial.0",
     "bip39": "https://github.com/bitcoinjs/bip39#d8ea080a18b40f301d4e2219a2991cd2417e83c2",
     "blind-threshold-bls": "npm:@celo/[email protected]",
     "@types/bn.js": "4.11.6",

packages/celotool/src/lib/generate_utils.ts

@@ -8,7 +8,7 @@ import fs from 'fs'
 import { merge, range, repeat } from 'lodash'
 import { tmpdir } from 'os'
 import path from 'path'
-import * as rlp from 'rlp' // TODO(soloseng): update?
+import * as rlp from 'rlp'
 import { MyceloGenesisConfig } from 'src/lib/interfaces/mycelo-genesis-config'
 import { CurrencyPair } from 'src/lib/k8s-oracle/base'
 import * as ecc from 'tiny-secp256k1'

packages/protocol/contracts-0.8/common/GasPriceMinimum.sol

@@ -9,6 +9,7 @@ import "../../contracts/common/interfaces/ICeloVersionedContract.sol";
 import "../../contracts/common/FixidityLib.sol";
 import "./UsingRegistry.sol";
 import "../../contracts/stability/interfaces/ISortedOracles.sol";
+import "@openzeppelin/contracts8/utils/math/Math.sol";
 
 /**
  * @title Stores and provides gas price minimum for various currencies.
@@ -38,6 +39,7 @@ contract GasPriceMinimum is
   FixidityLib.Fraction public adjustmentSpeed;
 
   uint256 public baseFeeOpCodeActivationBlock;
+  uint256 public constant ABSOLUTE_MINIMAL_GAS_PRICE = 1;
 
   /**
    * @notice Sets initialized == true on implementation contracts
@@ -53,7 +55,7 @@ contract GasPriceMinimum is
    * @return Patch version of the contract.
    */
   function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
-    return (1, 2, 0, 0);
+    return (1, 2, 0, 1);
   }
 
   /**
@@ -150,12 +152,7 @@ contract GasPriceMinimum is
     }
   }
 
-  /**
-   * @notice Retrieve the current gas price minimum for a currency.
-   * @param tokenAddress The currency the gas price should be in (defaults to gold).
-   * @return current gas price minimum in the requested currency
-   */
-  function getGasPriceMinimum(address tokenAddress) external view returns (uint256) {
+  function _getGasPriceMinimum(address tokenAddress) private view returns (uint256) {
     if (
       tokenAddress == address(0) ||
       tokenAddress == registry.getAddressForOrDie(GOLD_TOKEN_REGISTRY_ID)
@@ -172,6 +169,21 @@ contract GasPriceMinimum is
     }
   }
 
+  /**
+   * @notice Retrieve the current gas price minimum for a currency.
+   * When caled for 0x0 or Celo address, it returns gasPriceMinimum().
+   * For other addresses it returns gasPriceMinimum() mutiplied by 
+   * the SortedOracles median of the token. It does not check tokenAddress is a valid fee currency.
+   * this function will never returns values less than ABSOLUTE_MINIMAL_GAS_PRICE.
+   * If Oracle rate doesn't exist, it returns ABSOLUTE_MINIMAL_GAS_PRICE.
+   * @dev This functions assumes one unit of token has 18 digits.
+   * @param tokenAddress The currency the gas price should be in (defaults to Celo).
+   * @return current gas price minimum in the requested currency
+   */
+  function getGasPriceMinimum(address tokenAddress) external view returns (uint256) {
+    return Math.max(_getGasPriceMinimum(tokenAddress), ABSOLUTE_MINIMAL_GAS_PRICE);
+  }
+
   /**
    * @notice Adjust the gas price minimum based on governable parameters
    * and block congestion.

packages/protocol/contracts-0.8/stability/CeloFeeCurrencyAdapterOwnable.sol

@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: LGPL-3.0-only
+pragma solidity >=0.8.7 <0.8.20;
+
+import "./FeeCurrencyAdapterOwnable.sol";
+
+contract CeloFeeCurrencyAdapterOwnable is FeeCurrencyAdapterOwnable {
+  /**
+   * @notice Sets initialized == true on implementation contracts
+   * @param test Set to true to skip implementation initialization
+   */
+  constructor(bool test) FeeCurrencyAdapterOwnable(test) {}
+
+  /**
+   * @notice Returns the storage, major, minor, and patch version of the contract.
+   * @return Storage version of the contract.
+   * @return Major version of the contract.
+   * @return Minor version of the contract.
+   * @return Patch version of the contract.
+   */
+  function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
+    return (1, 1, 0, 0);
+  }
+}