Merge branch 'dev' into pcv/l2-stake-migration

Author: pcarranzav

addresses.json

@@ -828,7 +828,7 @@
         "txHash": "0xca363c6bc841b43bd896b6d2098434679884d200a28013dedb48a2c95028ce40"
       }
     },
-    "Curation": {
+    "L2Curation": {
       "address": "0x22d78fb4bc72e191C765807f8891B5e1785C8014",
       "initArgs": [
         "0x0a8491544221dd212964fbb96487467291b2C97e",
@@ -862,7 +862,7 @@
       "runtimeCodeHash": "0x7216e736a8a8754e88688fbf5c0c7e9caf35c55ecc3a0c5a597b951c56cf7458",
       "txHash": "0x4334bd64938c1c5c604bde96467a8601875046569f738e6860851594c91681ff"
     },
-    "GNS": {
+    "L2GNS": {
       "address": "0xec9A7fb6CbC2E41926127929c2dcE6e9c5D33Bec",
       "initArgs": [
         "0x0a8491544221dd212964fbb96487467291b2C97e",
@@ -1047,7 +1047,7 @@
         "txHash": "0x2d6043d89a5f5c4f3d0df0f50264ab7efebc898be0b5d358a00715ba9f657a89"
       }
     },
-    "Curation": {
+    "L2Curation": {
       "address": "0x7080AAcC4ADF4b1E72615D6eb24CDdE40a04f6Ca",
       "initArgs": [
         "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
@@ -1081,7 +1081,7 @@
       "runtimeCodeHash": "0x7216e736a8a8754e88688fbf5c0c7e9caf35c55ecc3a0c5a597b951c56cf7458",
       "txHash": "0xc11917ffedda6867648fa2cb62cca1df3c0ed485a0a0885284e93a2c5d33455c"
     },
-    "GNS": {
+    "L2GNS": {
       "address": "0x6bf9104e054537301cC23A1023Ca30A6Df79eB21",
       "initArgs": [
         "0x7f734E995010Aa8d28b912703093d532C37b6EAb",
@@ -1093,10 +1093,10 @@
       "txHash": "0x3c2509730e06249d970818319bb507185d4fdea13d5600cef87928a718950c19",
       "proxy": true,
       "implementation": {
-        "address": "0x7eCb82A9Cf9B370d3fC2Ef66E38F38EDFAeaa125",
-        "creationCodeHash": "0xb0be24e926bb24420bb5a8d3f7bd0b70a545fdddbf8cb177a42478adf4435aae",
-        "runtimeCodeHash": "0x4cb62b9def5b691e43ed06808b18efe682fcefb7739909be0d6c87f1eda724cd",
-        "txHash": "0xf1d41fc99ed716a0c890ea62e13ee108ddcb4ecfc74efb715a4ef05605ce449b"
+        "address": "0x80A6500EFD52C66820dB0E8014088B4eBf8B8f52",
+        "creationCodeHash": "0xd2aa0d4e2d6ca8d0b2067d249d3202a340b13291a65e23c46f5c04df703bfc0e",
+        "runtimeCodeHash": "0xa88669e10cde56141250596f6f034629b1bf55086a3ed21ebb0e2bd3b3fca991",
+        "txHash": "0x3bb004adf949e9c896e85f6e3124ecea0c223470e3a091e42539613d52679c4d"
       }
     },
     "L2Staking": {

cli/env.ts

@@ -31,11 +31,32 @@ export const displayGasOverrides = (): Overrides => {
   return r
 }
 
+function isMnemonic(mnemonic) {
+  return mnemonic.split(' ').length >= 12 && mnemonic.split(' ').length <= 24
+}
+
+function isPrivateKey(privateKey) {
+  try {
+    utils.getAddress(utils.computeAddress(privateKey))
+    return true
+  } catch (error) {
+    return false
+  }
+}
+
 export const loadEnv = async (argv: CLIArgs, wallet?: Wallet): Promise<CLIEnvironment> => {
   if (!wallet) {
-    wallet = Wallet.fromMnemonic(argv.mnemonic, `m/44'/60'/0'/0/${argv.accountNumber}`).connect(
-      getProvider(argv.providerUrl),
-    )
+    if (isPrivateKey(argv.mnemonic)) {
+      wallet = new Wallet(argv.mnemonic, getProvider(argv.providerUrl))
+    } else if (isMnemonic(argv.mnemonic)) {
+      wallet = Wallet.fromMnemonic(argv.mnemonic, `m/44'/60'/0'/0/${argv.accountNumber}`).connect(
+        getProvider(argv.providerUrl),
+      )
+    } else {
+      throw new Error(
+        'A wallet was not provided, please complete the `mnemonic` argument with a valid value',
+      )
+    }
   }
 
   const balance = await wallet.getBalance()

config/graph.arbitrum-goerli.yml

@@ -68,7 +68,7 @@ contracts:
       controller: "${{Controller.address}}"
       curationTokenMaster: "${{GraphCurationToken.address}}"
       curationTaxPercentage: 10000 # in parts per million
-      minimumCurationDeposit: "1000000000000000000" # in wei
+      minimumCurationDeposit: "1" # in wei
     calls:
       - fn: "syncAllContracts"
   DisputeManager:

config/graph.arbitrum-localhost.yml

@@ -68,7 +68,7 @@ contracts:
       controller: "${{Controller.address}}"
       curationTokenMaster: "${{GraphCurationToken.address}}"
       curationTaxPercentage: 10000 # in parts per million
-      minimumCurationDeposit: "1000000000000000000" # in wei
+      minimumCurationDeposit: "1" # in wei
     calls:
       - fn: "syncAllContracts"
   DisputeManager:

config/graph.arbitrum-one.yml

@@ -68,7 +68,7 @@ contracts:
       controller: "${{Controller.address}}"
       curationTokenMaster: "${{GraphCurationToken.address}}"
       curationTaxPercentage: 10000 # in parts per million
-      minimumCurationDeposit: "1000000000000000000" # in wei
+      minimumCurationDeposit: "1" # in wei
     calls:
       - fn: "syncAllContracts"
   DisputeManager:

contracts/discovery/L1GNS.sol

@@ -20,7 +20,7 @@ import { L1GNSV1Storage } from "./L1GNSStorage.sol";
  * human-readable names. All human readable names emitted in events.
  * The contract implements a multicall behaviour to support batching multiple calls in a single
  * transaction.
- * This L1GNS variant includes some functions to allow migrating subgraphs to L2.
+ * This L1GNS variant includes some functions to allow transferring subgraphs to L2.
  */
 contract L1GNS is GNS, L1GNSV1Storage {
     using SafeMathUpgradeable for uint256;
@@ -44,6 +44,8 @@ contract L1GNS is GNS, L1GNSV1Storage {
     /**
      * @notice Send a subgraph's data and tokens to L2.
      * Use the Arbitrum SDK to estimate the L2 retryable ticket parameters.
+     * Note that any L2 gas/fee refunds will be lost, so the function only accepts
+     * the exact amount of ETH to cover _maxSubmissionCost + _maxGas * _gasPriceBid.
      * @param _subgraphID Subgraph ID
      * @param _l2Owner Address that will own the subgraph in L2 (could be the L1 owner, but could be different if the L1 owner is an L1 contract)
      * @param _maxGas Max gas to use for the L2 retryable ticket
@@ -57,13 +59,17 @@ contract L1GNS is GNS, L1GNSV1Storage {
         uint256 _gasPriceBid,
         uint256 _maxSubmissionCost
     ) external payable notPartialPaused {
-        require(!subgraphMigratedToL2[_subgraphID], "ALREADY_DONE");
+        require(!subgraphTransferredToL2[_subgraphID], "ALREADY_DONE");
+        require(
+            msg.value == _maxSubmissionCost.add(_maxGas.mul(_gasPriceBid)),
+            "INVALID_ETH_VALUE"
+        );
 
         SubgraphData storage subgraphData = _getSubgraphOrRevert(_subgraphID);
-        // This is just like onlySubgraphAuth, but we want it to run after the subgraphMigratedToL2 check
+        // This is just like onlySubgraphAuth, but we want it to run after the subgraphTransferredToL2 check
         // to revert with a nicer message in that case:
         require(ownerOf(_subgraphID) == msg.sender, "GNS: Must be authorized");
-        subgraphMigratedToL2[_subgraphID] = true;
+        subgraphTransferredToL2[_subgraphID] = true;
 
         uint256 curationTokens = curation().burn(
             subgraphData.subgraphDeploymentID,
@@ -75,7 +81,7 @@ contract L1GNS is GNS, L1GNSV1Storage {
 
         // We send only the subgraph owner's tokens and nsignal to L2,
         // and for everyone else we set the withdrawableGRT so that they can choose
-        // to withdraw or migrate their signal.
+        // to withdraw or transfer their signal.
         uint256 ownerNSignal = subgraphData.curatorNSignal[msg.sender];
         uint256 totalSignal = subgraphData.nSignal;
 
@@ -108,13 +114,15 @@ contract L1GNS is GNS, L1GNSV1Storage {
 
     /**
      * @notice Send the balance for a curator's signal in a subgraph that was
-     * migrated to L2, using the L1GraphTokenGateway.
+     * transferred to L2, using the L1GraphTokenGateway.
      * The balance will be claimed for a beneficiary address, as this method can be
      * used by curators that use a contract address in L1 that may not exist in L2.
      * This will set the curator's signal on L1 to zero, so the caller must ensure
      * that the retryable ticket is redeemed before expiration, or the signal will be lost.
-     * It is up to the caller to verify that the subgraph migration was finished in L2,
+     * It is up to the caller to verify that the subgraph transfer was finished in L2,
      * but if it wasn't, the tokens will be sent to the beneficiary in L2.
+     * Note that any L2 gas/fee refunds will be lost, so the function only accepts
+     * the exact amount of ETH to cover _maxSubmissionCost + _maxGas * _gasPriceBid.
      * @dev Use the Arbitrum SDK to estimate the L2 retryable ticket parameters.
      * @param _subgraphID Subgraph ID
      * @param _beneficiary Address that will receive the tokens in L2
@@ -129,8 +137,11 @@ contract L1GNS is GNS, L1GNSV1Storage {
         uint256 _gasPriceBid,
         uint256 _maxSubmissionCost
     ) external payable notPartialPaused {
-        require(subgraphMigratedToL2[_subgraphID], "!MIGRATED");
-
+        require(subgraphTransferredToL2[_subgraphID], "!TRANSFERRED");
+        require(
+            msg.value == _maxSubmissionCost.add(_maxGas.mul(_gasPriceBid)),
+            "INVALID_ETH_VALUE"
+        );
         // The Arbitrum bridge will check this too, we just check here for an early exit
         require(_maxSubmissionCost != 0, "NO_SUBMISSION_COST");
 

contracts/discovery/L1GNSStorage.sol

@@ -10,8 +10,8 @@ pragma abicoder v2;
  * reduce the size of the gap accordingly.
  */
 abstract contract L1GNSV1Storage {
-    /// True for subgraph IDs that have been migrated to L2
-    mapping(uint256 => bool) public subgraphMigratedToL2;
+    /// True for subgraph IDs that have been transferred to L2
+    mapping(uint256 => bool) public subgraphTransferredToL2;
     /// @dev Storage gap to keep storage slots fixed in future versions
     uint256[50] private __gap;
 }

contracts/gateway/L1GraphTokenGateway.sol

@@ -417,7 +417,7 @@ contract L1GraphTokenGateway is Initializable, GraphTokenGateway, L1ArbitrumMess
     }
 
     /**
-     * @notice Decodes calldata required for migration of tokens
+     * @notice Decodes calldata required for transfer of tokens to L2
      * @dev Data must include maxSubmissionCost, extraData can be left empty. When the router
      * sends an outbound message, data also contains the from address.
      * @param _data encoded callhook data

contracts/l2/curation/IL2Curation.sol

@@ -9,7 +9,7 @@ interface IL2Curation {
     /**
      * @notice Deposit Graph Tokens in exchange for signal of a SubgraphDeployment curation pool.
      * @dev This function charges no tax and can only be called by GNS in specific scenarios (for now
-     * only during an L1-L2 migration).
+     * only during an L1-L2 transfer).
      * @param _subgraphDeploymentID Subgraph deployment pool from where to mint signal
      * @param _tokensIn Amount of Graph Tokens to deposit
      * @return Signal minted

contracts/l2/curation/L2Curation.sol

@@ -35,7 +35,7 @@ contract L2Curation is CurationV2Storage, GraphUpgradeable, IL2Curation {
     uint32 private constant MAX_PPM = 1000000;
 
     /// @dev Amount of signal you get with your minimum token deposit
-    uint256 private constant SIGNAL_PER_MINIMUM_DEPOSIT = 1e18; // 1 signal as 18 decimal number
+    uint256 private constant SIGNAL_PER_MINIMUM_DEPOSIT = 1; // 1e-18 signal as 18 decimal number
 
     /// @dev Reserve ratio for all subgraphs set to 100% for a flat bonding curve
     uint32 private immutable fixedReserveRatio = MAX_PPM;
@@ -227,7 +227,7 @@ contract L2Curation is CurationV2Storage, GraphUpgradeable, IL2Curation {
     /**
      * @notice Deposit Graph Tokens in exchange for signal of a SubgraphDeployment curation pool.
      * @dev This function charges no tax and can only be called by GNS in specific scenarios (for now
-     * only during an L1-L2 migration).
+     * only during an L1-L2 transfer).
      * @param _subgraphDeploymentID Subgraph deployment pool from where to mint signal
      * @param _tokensIn Amount of Graph Tokens to deposit
      * @return Signal minted