celo-org · ninabarbakadze · Jul 5, 2022 · Feb 23, 2022 · Feb 23, 2022 · Feb 24, 2022
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,7 +34,7 @@ defaults: &defaults
 contract-defaults: &contract-defaults
   <<: *defaults
   environment:
-    RELEASE_TAG: core-contracts.v6
+    RELEASE_TAG: core-contracts.v7
 
 e2e-defaults: &e2e-defaults
   <<: *defaults
@@ -151,6 +151,7 @@ jobs:
             # Verify that following commands work, they are later called in the incremental testing script
             # There output does not matter here, the fact that they finish successfully does.
             git rev-parse --abbrev-ref HEAD
+            git fetch --all --tags
 
       - attach_workspace:
           at: ~/app

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -28,7 +28,7 @@
     "generate:shrinkwrap": "npm install --production && npm shrinkwrap",
     "check:shrinkwrap": "npm install --production && npm shrinkwrap && ./scripts/check_shrinkwrap_dirty.sh",
     "prepack": "yarn run build && oclif-dev manifest && oclif-dev readme && yarn run check:shrinkwrap",
-    "test:reset": "yarn --cwd ../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../dev-utils/src/migration-override.json --upto 25 --release_gold_contracts scripts/truffle/releaseGoldExampleConfigs.json",
+    "test:reset": "yarn --cwd ../protocol devchain generate-tar .tmp/devchain.tar.gz --migration_override ../dev-utils/src/migration-override.json --upto 26 --release_gold_contracts scripts/truffle/releaseGoldExampleConfigs.json",
     "test:livechain": "yarn --cwd ../protocol devchain run-tar .tmp/devchain.tar.gz",
     "test": "TZ=UTC jest --runInBand"
   },

@@ -0,0 +1,125 @@
+pragma solidity ^0.5.13;
+
+import "openzeppelin-solidity/contracts/math/SafeMath.sol";
+import "../common/Initializable.sol";
+import "openzeppelin-solidity/contracts/ownership/Ownable.sol";
+import "../common/interfaces/IRegistry.sol";
+
+/**
+ * @title contract that lists what stable coins are deployed as part of Celo's Stability protocol.
+ */
+contract StableTokenRegistry is Initializable, Ownable {
+  using SafeMath for uint256;
+  mapping(bytes => bytes) public stableTokens;
+  bytes[] public fiatTickers;
+
+  /**
+   * @notice Returns the storage, major, minor, and patch version of the contract.
+   * @return The storage, major, minor, and patch version of the contract.
+   */
+  function getVersionNumber() external pure returns (uint256, uint256, uint256, uint256) {
+    return (1, 1, 0, 0);
+  }
+
+  /**
+   * @notice Sets initialized == true on implementation contracts
+   * @param test Set to true to skip implementation initialization
+   */
+  constructor(bool test) public Initializable(test) {}
+
+  /**
+   * @notice Used in place of the constructor to allow the contract to be upgradable via proxy.
+   * @param fiatTicker fiat currency issued.
+   * @param stableTokenContractName stable token smart contract name.
+   */
+  function initialize(bytes calldata fiatTicker, bytes calldata stableTokenContractName)
+    external
+    initializer
+  {
+    _transferOwnership(msg.sender);
+    addNewStableToken(bytes("USD"), bytes("StableToken"));
+    addNewStableToken(bytes("EUR"), bytes("StableTokenEUR"));
+    addNewStableToken(bytes("BRL"), bytes("StableTokenBRL"));
+    if (fiatTicker.length != 0 && stableTokenContractName.length != 0) {
+      addNewStableToken(fiatTicker, stableTokenContractName);
+    }
+  }
+
+  /**
+   * @notice Returns all the contract instances created.
+   * @return collection of stable token contracts.
+   */
+  function getContractInstances() external view returns (bytes memory, uint256[] memory) {
+    uint256 totalLength = 0;
+    for (uint256 i = 0; i < fiatTickers.length; i++) {
+      totalLength += stableTokens[fiatTickers[i]].length;
+    }
+    uint256 numOfContracts = fiatTickers.length;
+    bytes memory concatenated = new bytes(totalLength);
+    uint256 lastIndex = 0;
+    uint256[] memory lengths = new uint256[](numOfContracts);
+    for (uint256 i = 0; i < numOfContracts; i++) {
+      bytes storage contractName = stableTokens[fiatTickers[i]];
+      lengths[i] = contractName.length;
+      for (uint256 j = 0; j < lengths[i]; j++) {
+        concatenated[lastIndex] = contractName[j];
+        lastIndex++;
+      }
+    }
+    return (concatenated, lengths);
+  }
+
+  /**
+   * @notice Removes unwamted token instances.
+   * @param fiatTicker The currency that is no longer supported.
+   * @param index The index in fiatTickers of fiatTicker.
+   */
+  function removeStableToken(bytes calldata fiatTicker, uint256 index) external onlyOwner {
+    delete stableTokens[fiatTicker];
+    uint256 numFiats = fiatTickers.length;
+    require(index < numFiats, "Index is invalid");
+    for (uint256 i = 0; i < fiatTicker.length; i++) {
+      if (fiatTicker[i] != 0) {
+        require(
+          fiatTicker[i] == fiatTickers[index][i],
+          "source doesn't match the existing fiatTicker"
+        );
+      }
+    }
+    uint256 newNumFiats = numFiats.sub(1);
+
+    if (index != newNumFiats) {
+      fiatTickers[index] = fiatTickers[newNumFiats];
+    }
+    delete fiatTickers[newNumFiats];
+    fiatTickers.length = newNumFiats;
+  }
+
+  /**
+   * @notice Adds new Fiat Ticker and Stable Token contract to the registry.
+   * @param fiatTicker The currency we are trying to add in the registry.
+   * @param stableTokenContractName The contract we are trying to add in the registry.
+   */
+  function addNewStableToken(bytes memory fiatTicker, bytes memory stableTokenContractName)
+    public
+    onlyOwner
+  {
+    require(fiatTicker.length != 0, "fiatTicker cant be an empty string");
+    require(stableTokenContractName.length != 0, "stableTokenContractName cant be an empty string");
+    require(stableTokens[fiatTicker].length == 0, "This registry already exists");
+    stableTokens[fiatTicker] = stableTokenContractName;
+    fiatTickers.push(fiatTicker);
+  }
+
+  /**
+   * @notice Queries a corresponding StableToken contract name based on fiat ticker.
+   * @param fiatTicker Type of currency to query corresponding contract.
+   */
+  function queryStableTokenContractNames(bytes memory fiatTicker)
+    public
+    view
+    returns (bytes memory)
+  {
+    return stableTokens[fiatTicker];
+  }
+}
@@ -0,0 +1,6 @@
+pragma solidity ^0.5.13;
+
+import "../../common/Proxy.sol";
+
+/* solhint-disable no-empty-blocks */
+contract StableTokenRegistryProxy is Proxy {}
@@ -38,6 +38,7 @@ export enum CeloContractName {
   StableTokenBRL = 'StableTokenBRL',
   TransferWhitelist = 'TransferWhitelist',
   Validators = 'Validators',
+  StableTokenRegistry = 'StableTokenRegistry',
 }
 
 export const usesRegistry = [

@@ -0,0 +1,14 @@
+import { CeloContractName } from '@celo/protocol/lib/registry-utils'
+import { deploymentForCoreContract } from '@celo/protocol/lib/web3-utils'
+import { StableTokenRegistryInstance } from 'types'
+
+const initializeArgs = async (): Promise<any[]> => {
+  return [[], []]
+}
+
+module.exports = deploymentForCoreContract<StableTokenRegistryInstance>(
+  web3,
+  artifacts,
+  CeloContractName.StableTokenRegistry,
+  initializeArgs
+)
@@ -98,6 +98,7 @@ module.exports = deploymentForCoreContract<GovernanceInstance>(
       'StableToken',
       'StableTokenEUR',
       'Validators',
+      'StableTokenRegistry',
     ]
 
     if (!config.governance.skipTransferOwnership) {

@@ -238,6 +238,10 @@ const DefaultConfig = {
     commission: 0.1,
     votesRatioOfLastVsFirstGroup: 2.0,
   },
+  stableTokenRegistry: {
+    fiatTicker: [], // empty array resambles empty bytes
+    stableTokenContractName: [], // empty array resambles empty bytes
+  },
 }
 
 const NetworkConfigs = {

@@ -0,0 +1,3 @@
+{
+  "StableTokenRegistry": [[], []]
+}
@@ -1,6 +1,6 @@
 {
-  "oldArtifactsFolder": "/Users/martinvol/celo/celo-monorepo/packages/protocol/build/core-contracts.v6/contracts",
-  "newArtifactsFolder": "/Users/martinvol/celo/celo-monorepo/packages/protocol/build/celo-core-contracts-v7/contracts",
+  "oldArtifactsFolder": "/home/circleci/app/packages/protocol/build/core-contracts.v6/contracts",
+  "newArtifactsFolder": "/home/circleci/app/packages/protocol/build/core-contracts.v7/contracts",
   "exclude": "/.*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles/",
   "report": {
     "contracts": {
@@ -147,6 +147,69 @@
           "patch": "0"
         }
       },
+      "LockedGold": {
+        "changes": {
+          "storage": [],
+          "major": [],
+          "minor": [
+            {
+              "contract": "LockedGold",
+              "signature": "getPendingWithdrawal(address,uint256)",
+              "type": "MethodAdded"
+            }
+          ],
+          "patch": [
+            {
+              "contract": "LockedGold",
+              "type": "DeployedBytecode"
+            }
+          ]
+        },
+        "versionDelta": {
+          "storage": "=",
+          "major": "=",
+          "minor": "+1",
+          "patch": "0"
+        }
+      },
+      "GrandaMento": {
+        "changes": {
+          "storage": [],
+          "major": [],
+          "minor": [],
+          "patch": [
+            {
+              "contract": "GrandaMento",
+              "type": "DeployedBytecode"
+            }
+          ]
+        },
+        "versionDelta": {
+          "storage": "=",
+          "major": "=",
+          "minor": "=",
+          "patch": "+1"
+        }
+      },
+      "Reserve": {
+        "changes": {
+          "storage": [],
+          "major": [],
+          "minor": [],
+          "patch": [
+            {
+              "contract": "Reserve",
+              "type": "DeployedBytecode"
+            }
+          ]
+        },
+        "versionDelta": {
+          "storage": "=",
+          "major": "=",
+          "minor": "=",
+          "patch": "+1"
+        }
+      },
       "Validators": {
         "changes": {
           "storage": [],

@@ -47,9 +47,14 @@ yarn run truffle exec ./scripts/truffle/verify-bytecode.js --network development
 
 echo "- Check versions of current branch"
 # From check-versions.sh
+echo " - Checkout migrationsConfig.js at $BRANCH"
+git checkout $BRANCH -- migrationsConfig.js
+
 CONTRACT_EXCLUSION_REGEX=".*Test|Mock.*|I[A-Z].*|.*Proxy|MultiSig.*|ReleaseGold|SlasherUtil|UsingPrecompiles"
 yarn ts-node scripts/check-backward.ts sem_check --old_contracts $BUILD_DIR/contracts --new_contracts build/contracts --exclude $CONTRACT_EXCLUSION_REGEX --output_file report.json
 
+git checkout - -- migrationsConfig.js
+
 # From make-release.sh
 echo "- Deploy release of current branch"
 INITIALIZATION_FILE=`ls -1 releaseData/initializationData/* | tail -n 1 | xargs realpath`

@@ -36,6 +36,7 @@ export const ProxyContracts = [
   'StableTokenEURProxy',
   'StableTokenProxy',
   'SortedOraclesProxy',
+  'StableTokenRegistryProxy',
 ]
 export const CoreContracts = [
   // common
@@ -78,6 +79,7 @@ export const CoreContracts = [
   'StableTokenEUR',
   'StableTokenBRL',
   'SortedOracles',
+  'StableTokenRegistry',
 
   // liquidity
   'GrandaMento',

@@ -13,6 +13,7 @@ import { parseSolidityStringArray } from '@celo/utils/lib/parsing'
 import { authorizeSigner as buildAuthorizeSignerTypedData } from '@celo/utils/lib/typed-data-constructors'
 import { generateTypedDataHash } from '@celo/utils/src/sign-typed-data-utils'
 import { parseSignatureWithoutPrefix } from '@celo/utils/src/signatureUtils'
+import BigNumber from 'bignumber.js'
 import {
   AccountsContract,
   AccountsInstance,
@@ -22,8 +23,6 @@ import {
 } from 'types'
 import { keccak256 } from 'web3-utils'
 
-import BigNumber from 'bignumber.js'
-
 const Accounts: AccountsContract = artifacts.require('Accounts')
 const Registry: RegistryContract = artifacts.require('Registry')
 const MockValidators: MockValidatorsContract = artifacts.require('MockValidators')