codyborn
diff --git a/‎.circleci/config.yml
Lines changed: 140 additions & 17 deletions b/‎.circleci/config.yml
Lines changed: 140 additions & 17 deletions
diff --git a/‎.github/CODEOWNERS
Lines changed: 3 additions & 3 deletions b/‎.github/CODEOWNERS
Lines changed: 3 additions & 3 deletions
@@ -46,7 +46,7 @@ commands:
           command: |
             mkdir -p ~/.tmp/checksumfiles
             # Concatenate package.json so we can use them as a part of the cache key
-            find . -maxdepth 3 -type f -name 'package.json' -not -path "*node_modules*" -print0 | sort -z | xargs -0 cat > ~/.tmp/checksumfiles/package.json
+            find . -maxdepth 5 -type f -name 'package.json' -not -path "*node_modules*" -print0 | sort -z | xargs -0 cat > ~/.tmp/checksumfiles/package.json
             # Concatenate patches so we can use them as a part of the cache key
             find ./patches -type f -name '*.patch' -print0 | sort -z | xargs -0 cat > ~/.tmp/checksumfiles/patches
       - restore_cache:
@@ -154,6 +154,8 @@ jobs:
             # separate build to avoid ENOMEM in CI :(
             yarn build --scope @celo/base
             yarn build --scope @celo/utils
+            yarn build --scope @celo/dev-utils
+            yarn build --scope @celo/connect
             yarn build --scope @celo/protocol
             yarn build --ignore @celo/protocol --ignore docs
 
@@ -403,7 +405,33 @@ jobs:
           name: jest tests
           command: |
             mkdir -p test-results/jest
-            yarn run lerna --ignore @celo/contractkit --ignore @celo/mobile --ignore @celo/protocol --ignore @celo/celotool --ignore @celo/celocli --ignore @celo/env-tests run test
+            yarn run lerna \
+              --ignore @celo/contractkit \
+              --ignore @celo/mobile \
+              --ignore @celo/protocol \
+              --ignore @celo/celotool \
+              --ignore @celo/celocli \
+              --ignore @celo/env-tests \
+              --ignore @celo/web \
+              --ignore @celo/identity \
+              --ignore @celo/transactions-uri \
+              --ignore '@celo/wallet-*' \
+              run test
+
+      - store_test_results:
+          path: test-results
+
+  web-test: 
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/app
+
+      - run:
+          name: jest tests
+          command: |
+            mkdir -p test-results/jest
+            yarn --cwd=packages/web run test
 
       - store_test_results:
           path: test-results
@@ -463,6 +491,45 @@ jobs:
           name: Upload to CodeCov
           command: yarn codecov -F mobile
 
+  wallets-test:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/app
+      - run:
+          name: Run Tests
+          command: yarn run lerna --scope '@celo/wallet-*' run test
+
+
+  # Split from the original script. The original script was assuming not big changes in dependencies.
+  # As that's a possibility, we require to install the old and re-install the new one, and circle
+  # crashes on the second re-install.
+  # This pre script, generates the build and devchain, and adds it to the workspace to be used for the
+  # other script
+  pre-protocol-test-release:
+    <<: *defaults
+    resource_class: large
+    steps:
+      - attach_workspace:
+          at: ~/app
+      - run:
+          name: Check if the test should run
+          command: |
+            ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol
+      - run:
+          name: Generate devchain of previous release
+          command: |
+            mkdir -p ~/.ssh
+            ssh-keyscan github.com >> ~/.ssh/known_hosts
+            echo "Comparing against first commit to contain version numbers"
+            RELEASE_TAG=celo-core-contracts-v1.rc1
+            yarn --cwd packages/protocol test:generate-old-devchain-and-build -b $RELEASE_TAG -d .tmp/released_chain -l /dev/stdout
+      - persist_to_workspace:
+          root: .
+          paths:
+            - "packages/protocol/.tmp/released_chain/*"
+
+
   protocol-test-release:
     <<: *defaults
     resource_class: large
@@ -473,14 +540,21 @@ jobs:
           name: Check if the test should run
           command: |
             ./scripts/ci_check_if_test_should_run_v2.sh @celo/protocol
+      - run:
+          name: Copy DevChain and Build generated from released tag
+          command: |
+            RELEASE_TAG=celo-core-contracts-v1.rc1
+            BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g'))
+            (cp -r packages/protocol/.tmp/released_chain packages/protocol/$BUILD_AND_DEVCHAIN_DIR)
       - run:
           name: Test release against v2
           command: |
             mkdir -p ~/.ssh
             ssh-keyscan github.com >> ~/.ssh/known_hosts
             echo "Comparing against first commit to contain version numbers"
             RELEASE_TAG=celo-core-contracts-v1.rc1
-            yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG
+            BUILD_AND_DEVCHAIN_DIR=$(echo build/$(echo $RELEASE_TAG | sed -e 's/\//_/g'))
+            yarn --cwd packages/protocol test:devchain-release -b $RELEASE_TAG -d $BUILD_AND_DEVCHAIN_DIR -l /dev/stdout
 
   protocol-test-common:
     <<: *defaults
@@ -612,19 +686,52 @@ jobs:
       - run:
           name: Generate DevChain
           command: |
-            (cd packages/contractkit && yarn test:reset)
+            (cd packages/sdk/contractkit && yarn test:reset)
       - run:
           name: Run Tests
-          command: yarn --cwd=packages/contractkit test
+          command: yarn --cwd=packages/sdk/contractkit test
+      # TODO: remove comment after new docs generation
+      # - run:
+      #     name: Fail if someone forgot to commit contractkit docs
+      #     command: |
+      #       yarn --cwd=packages/sdk/contractkit docs
+      #       if [[ $(git status packages/docs/developer-resources/contractkit --porcelain) ]]; then
+      #         git --no-pager diff packages/docs/developer-resources/contractkit
+      #         echo "There are git differences after generating contractkit docs"
+      #         exit 1
+      #       fi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - "packages/sdk/contractkit/.tmp/devchain.tar.gz"
+  
+  # extrated to reuse the devchain generated by contractkit
+  identity-tests:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/app
       - run:
-          name: Fail if someone forgot to commit contractkit docs
+          name: Copy DevChain generated by Contractkit
           command: |
-            yarn --cwd=packages/contractkit docs
-            if [[ $(git status packages/docs/developer-resources/contractkit --porcelain) ]]; then
-              git --no-pager diff packages/docs/developer-resources/contractkit
-              echo "There are git differences after generating contractkit docs"
-              exit 1
-            fi
+            (cp -r packages/sdk/contractkit/.tmp packages/sdk/identity/.tmp)
+      - run:
+          name: Run Tests
+          command: yarn --cwd=packages/sdk/identity test
+
+  # extrated to reuse the devchain generated by contractkit
+  transactions-uri-tests:
+    <<: *defaults
+    steps:
+      - attach_workspace:
+          at: ~/app
+      - run:
+          name: Copy DevChain generated by Contractkit
+          command: |
+            (cp -r packages/sdk/contractkit/.tmp packages/sdk/transactions-uri/.tmp)
+      - run:
+          name: Run Tests
+          command: yarn --cwd=packages/sdk/transactions-uri test
 
   cli-test:
     <<: *defaults
@@ -698,10 +805,10 @@ jobs:
           name: Install and test the npm package
           command: |
             set -euo pipefail
-            cd packages/base
+            cd packages/sdk/base
             yarn pack
             cd /tmp
-            npm install ~/app/packages/base/*.tgz
+            npm install ~/app/packages/sdk/base/*.tgz
 
   utils-test:
     <<: *defaults
@@ -716,13 +823,13 @@ jobs:
           name: Install and test the npm package
           command: |
             set -euo pipefail
-            cd packages/base
+            cd packages/sdk/base
             yarn pack
             cd ../utils
             yarn pack
             cd /tmp
-            npm install ~/app/packages/base/*.tgz
-            npm install ~/app/packages/utils/*.tgz
+            npm install ~/app/packages/sdk/base/*.tgz
+            npm install ~/app/packages/sdk/utils/*.tgz
 
   end-to-end-geth-transfer-test:
     <<: *e2e-defaults
@@ -999,17 +1106,33 @@ workflows:
       - cli-test:
           requires:
             - install_dependencies
+      - web-test:
+          requires:
+            - install_dependencies
       - contractkit-test:
           requires:
             - install_dependencies
+      - wallets-test:
+          requires:
+            - install_dependencies
+      - identity-tests:
+          requires:
+            - contractkit-test
+      - transactions-uri-tests:
+          requires:
+            - contractkit-test
       - mobile-test:
           requires:
             - lint-checks
       - end-to-end-mobile-test-android
       - end-to-end-mobile-test-ios
+      - pre-protocol-test-release:
+          requires:
+            - lint-checks
       - protocol-test-release:
           requires:
             - lint-checks
+            - pre-protocol-test-release
       - protocol-test-common:
           requires:
             - lint-checks
 
@@ -12,7 +12,7 @@
 /packages/blockchain-api/ @jmrossy @cmcewen @i1skn @jeanregisser
 /packages/celotool/ @asaj
 /packages/cli/ @mcortesi @gastonponti @medhak1 @celo-org/devx
-/packages/contractkit/ @mcortesi @gastonponti @medhak1 @barbaraliau @celo-org/devx
+/packages/sdk/ @mcortesi @gastonponti @medhak1 @barbaraliau @celo-org/devx
 /packages/dappkit/ @cmcewen @barbaraliau @celo-org/devx
 /packages/dev-utils/ @mcortesi
 /packages/docs/ @timmoreton @barbaraliau @critesjosh 
@@ -29,8 +29,8 @@
 /packages/terraform-modules-public/ @tkporter
 /packages/terraform-modules/ @tkporter
 /packages/typescript/ @cmcewen
-/packages/utils/ @barbaraliau @medhak1 @celo-org/devx
-/packages/base/ @barbaraliau @medhak1 @celo-org/devx
+/packages/sdk/utils/ @barbaraliau @medhak1 @celo-org/devx
+/packages/sdk/base/ @barbaraliau @medhak1 @celo-org/devx
 /packages/web/validator-badges @cla-bel @bohan-zhang @pranaymohan
 /packages/web/openpgpkey @nategraf
 /packages/web/ @aaronmgdr