Contracts management

.eslintrc.js

@@ -1,17 +1,21 @@
 module.exports = {
-  parser: 'babel-eslint',
-  extends: 'standard',
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
+    sourceType: 'module' // Allows for the use of imports
+  },
+  extends: [
+    'standard',
+    'plugin:@typescript-eslint/recommended'
+  ],
   env: {
     node: true,
     es6: true,
     mocha: true
   },
   rules: {
-    'space-before-function-paren': ['error', 'never']
-  },
-  globals: {
-    contract: true,
-    web3: true,
-    assert: true
+    'space-before-function-paren': ['error', 'never'],
+    quotes: ['error', 'single'],
+    semi: ['error', 'never']
   }
 }

.github/workflows/ci.yml

@@ -5,7 +5,8 @@ on:
     branches: 
       - main
   pull_request:
-
+    branches: 
+      - main
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -14,18 +15,25 @@ jobs:
     - name: Setup Node.js environment
       uses: actions/setup-node@v2-beta
       with:
-        node-version: '10.x'
+        node-version: '14.x'
         registry-url: 'https://registry.npmjs.org'
-    - name: Cache npm dependencies
+    - name: Install yarn
+      run: npm install -g yarn
+    - name: Get yarn cache directory path
+      id: yarn-cache-dir-path
+      run: echo "::set-output name=dir::$(yarn cache dir)"
+    - name: Cache dependencies
       uses: actions/cache@v1
       with:
-        path: ~/.npm
-        key: ${{ runner.OS }}-npm-cache-${{ hashFiles('**/package-lock.json') }}
+        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+        key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
-          ${{ runner.OS }}-npm-cache-
-    - name: Install npm dependencies
-      run: npm install
+          ${{ runner.os }}-yarn-
+    - name: Install dependencies
+      run: yarn --prefer-offline
     - name: Process templates
-      run: npm run template:process
+      run: yarn template:process
+    - name: Verify contracts storage
+      run: yarn verify:ci
     - name: Run tests
-      run: npm run test:ci
+      run: yarn test:ci

.gitignore

@@ -1,10 +1,9 @@
 node_modules
 build
 contractAddresses.json
+artifacts
 
 # ignore generated files
-contracts/root/predicates/TransferWithSigUtils.sol
-contracts/common/mixin/ChainIdMixin.sol
 test-blockchain/genesis.json
 test-blockchain/start.sh
 test/helpers/marketplaceUtils.js
@@ -22,3 +21,13 @@ test-blockchain/data
 coverage/
 
 coverage.json
+
+*.dbg.json
+
+cache/
+
+debug.json
+
+typechain/
+
+contracts-out/

.nvmrc

@@ -1 +1 @@
-11.1.0
+14.17.4

README.md

@@ -1,43 +1,48 @@
-# Matic contracts
+# Polygon contracts
 
 ![Build Status](https://github.com/maticnetwork/contracts/workflows/CI/badge.svg)
 
-Ethereum smart contracts that power the [Matic Network](https://matic.network).
+Ethereum smart contracts that power [Polygon sidechain](https://polygon.technology).
+
+### Prerequesties
+
+Yarn and Node 14
 
 ### Install dependencies with
 
 ```
-npm install
+yarn
 ```
 
-### Compile
+### Preprocess templates for local BOR
 
 bor-chain-id for Mainnet = 137
-bor-chain-id for TestnetV4 (Mumbai) = 80001
+bor-chain-id for Testnet (Mumbai) = 15001
+
+For local development you should go with 15001 chain id
 
 ```
 npm run template:process -- --bor-chain-id <bor-chain-id>
-npm run truffle:compile
 ```
 
-### Start main chain and side chain
+### Start root chain and child chain
 
-- Start Main chain
+- Start Root chain
 
 ```
-npm run testrpc
+yarn testrpc
 ```
 
 - Start Matic side chain. Requires docker.
 
 ```
-npm run bor:simulate
+yarn bor:simulate
 ```
 
 - If you ran a bor instance before, a dead docker container might still be lying around, clean it with
 
 ```
-npm run bor:clean
+yarn bor:clean
 ```
 
 - Run a bor (our matic chain node) instance.
@@ -47,13 +52,14 @@ npm run bor:clean
 - For local development
 
 ```
-npm run truffle:migrate
+yarn deploy:all --network root --child-url CHILD_URL
 ```
 
-- For a properly initialized set of contracts, follow the instructions [here](./deploy-migrations/README.md).
+By default child url is http://localhost:8545
+
 
 ### Run tests
 
 ```
-npm test
+yarn test
 ```

contracts/common/mixin/ChainIdMixin.sol

@@ -0,0 +1,13 @@
+pragma solidity ^0.5.2;
+
+contract ChainIdMixin {
+  #if mainnet root
+  bytes constant public networkId = hex"89";
+  uint256 constant public CHAINID = 137;
+  #endif
+
+  #if goerli child
+  bytes constant public networkId = hex"3A99";
+  uint256 constant public CHAINID = 15001;
+  #endif
+}

contracts/root/RootChainProxy.sol

@@ -1,6 +1,6 @@
 pragma solidity ^0.5.2;
 
-import {RootChainStorage} from "./RootChainStorage.sol";
+import {RootChainStorage} from "./RootChainStorage.sol"; 
 import {Proxy} from "../common/misc/Proxy.sol";
 import {Registry} from "../common/Registry.sol";
 

contracts/root/predicates/TransferWithSigUtils.sol.template → contracts/root/predicates/TransferWithSigUtils.sol

@@ -40,7 +40,12 @@ library TransferWithSigUtils {
     bytes32 EIP712_DOMAIN_SCHEMA_HASH = keccak256(abi.encodePacked(EIP712_DOMAIN_SCHEMA));
     string memory EIP712_DOMAIN_NAME = "Matic Network";
     string memory EIP712_DOMAIN_VERSION = "1";
-    uint256 EIP712_DOMAIN_CHAINID = {{ borChainId }};
+    #if mainnet root
+    uint256 EIP712_DOMAIN_CHAINID = 137;
+    #endif
+    #if goerli child
+    uint256 EIP712_DOMAIN_CHAINID = 15001;
+    #endif
     bytes32 EIP712_DOMAIN_HASH = keccak256(abi.encode(
       EIP712_DOMAIN_SCHEMA_HASH,
       keccak256(bytes(EIP712_DOMAIN_NAME)),

contracts/staking/stakeManager/StakeManager.sol

@@ -535,7 +535,14 @@ contract StakeManager is
             require(delegationEnabled, "Delegation is disabled");
         }
 
-        updateTimeline(amount, 0, 0);
+        uint256 deactivationEpoch = validators[validatorId].deactivationEpoch;
+
+        if (deactivationEpoch == 0) { // modify timeline only if validator didn't unstake
+            updateTimeline(amount, 0, 0);
+        } else if (deactivationEpoch > currentEpoch) { // validator just unstaked, need to wait till next checkpoint
+            revert("unstaking");
+        }
+
 
         if (amount >= 0) {
             increaseValidatorDelegatedAmount(validatorId, uint256(amount));
@@ -560,11 +567,16 @@ contract StakeManager is
         address currentSigner = validators[validatorId].signer;
         // update signer event
         logger.logSignerChange(validatorId, currentSigner, signer, signerPubkey);
+
+        if (validators[validatorId].deactivationEpoch == 0) { 
+            // didn't unstake, swap signer in the list
+            _removeSigner(currentSigner);
+            _insertSigner(signer);
+        }
 
         signerToValidator[currentSigner] = INCORRECT_VALIDATOR_ID;
         signerToValidator[signer] = validatorId;
         validators[validatorId].signer = signer;
-        _updateSigner(currentSigner, signer);
 
         // reset update time to current time
         latestSignerUpdateEpoch[validatorId] = _currentEpoch;
@@ -1195,11 +1207,6 @@ contract StakeManager is
         }
     }
 
-    function _updateSigner(address prevSigner, address newSigner) internal {
-        _removeSigner(prevSigner);
-        _insertSigner(newSigner);
-    }
-
     function _removeSigner(address signerToDelete) internal {
         uint256 totalSigners = signers.length;
         address swapSigner = signers[totalSigners - 1];

contracts/staking/validatorShare/ValidatorShare.sol

@@ -312,9 +312,17 @@ contract ValidatorShare is IValidatorShare, ERC20NonTradable, OwnableLockable, I
 
     function _getRatePrecision() private view returns (uint256) {
         // if foundation validator, use old precision
+        #if mainnet root
         if (validatorId < 8) {
             return EXCHANGE_RATE_PRECISION;
         }
+        #endif
+
+        #if goerli
+        if (validatorId < 9) {
+            return EXCHANGE_RATE_PRECISION;
+        }
+        #endif
 
         return EXCHANGE_RATE_HIGH_PRECISION;
     }

contracts/test/StakeManagerTestable.sol

@@ -5,7 +5,9 @@ import { IValidatorShare } from "../staking/validatorShare/IValidatorShare.sol";
 
 contract StakeManagerTestable is StakeManager {
     function advanceEpoch(uint256 delta) public {
-        currentEpoch = currentEpoch.add(delta);
+        for (uint256 i = 0; i < delta; ++i) {
+            _finalizeCommit();
+        }
     }
 
     function testLockShareContract(uint256 validatorId, bool lock) public {