Merge 1f38aa4 into b82570b

1Hive · Nov 7, 2020 · 9ec6443 · 9ec6443
2 parents b82570b + 1f38aa4
commit 9ec6443
Show file tree

Hide file tree

Showing 190 changed files with 962 additions and 1,005,525 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
diff --git a/.github/images/architecture.svg b/.github/images/architecture.svg
diff --git a/.github/images/icon.svg b/.github/images/icon.svg
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
diff --git a/.gitignore b/.gitignore
@@ -10,20 +10,25 @@ yarn.lock
 package-lock.json
 **/**/yarn.lock
 **/**/package-lock.json
+yarn-error.log
 
 # coverage
 */**/coverage
 */**/coverageEnv
 */**/coverage.json
 */**/allFiredEvents
 */**/scTopics
+*/**/.coverage_*
 
 # truffle and aragon build artifacts
 */**/abi
 */**/abis.json
 */**/arapp_local.json
 */**/flattened_contracts
 */**/build
+*/**/cache
+*/**/artifacts
+*/**/dist
 
 # keep abis used in the frontend
 !apps/marketplace-controller/app/src/abi

diff --git a/.travis.yml b/.travis.yml
@@ -3,18 +3,16 @@ cache:
   timeout: 600
   directories:
     - node_modules
-    - fundraising/apps/marketplace-controller/node_modules
-    - fundraising/apps/bancor-formula/node_modules
-    - fundraising/apps/batched-bancor-market-maker/node_modules
-    - fundraising/apps/presale/node_modules
-    - fundraising/apps/tap/node_modules
-    - fundraising/shared/interfaces/node_modules
-    - fundraising/shared/test-helpers/node_modules
-    - fundraising/templates/multisig/node_modules
+    - apps/marketplace-controller/node_modules
+    - apps/bancor-formula/node_modules
+    - apps/bancor-market-maker/node_modules
+    - apps/presale/node_modules
+    - shared/interfaces/node_modules
+    - shared/test-helpers/node_modules
 notifications:
   email: false
 node_js:
-  - '8'
+  - '10'
 install:
   - travis_wait 60 npm install
 jobs:
@@ -23,24 +21,18 @@ jobs:
       script: npm run lint
       name: 'All'
     - stage: tests
-      script: npm run test:marketplace-controller
-      name: 'Aragon Fundraising'
-    - script: npm run test:batched-bancor-market-maker
-      name: 'Batched Bancor Market Maker'
+      script: npm run test:controller
+      name: 'Marketplace Controller'
+    - script: npm run test:bancor-market-maker
+      name: 'Bancor Market Maker'
     - script: npm run test:presale
       name: 'Presale'
-    - script: npm run test:tap
-      name: 'Tap'
-    - script: npm run test:multisig-template
-      name: 'Multisig Template'
     - stage: coverage
-      script: npm run coverage:marketplace-controller
-      name: 'Aragon Fundraising'
-    - script: npm run coverage:batched-bancor-market-maker
-      name: 'Batched Bancor Market Maker'
-    # - script: npm run coverage:presale
-    #   name: 'Presale'
-    - script: npm run coverage:tap
-      name: 'Tap'
+      script: npm run coverage:controller
+      name: 'Marketplace Controller'
+    - script: npm run coverage:bancor-market-maker
+      name: 'Bancor Market Maker'
+    - script: npm run coverage:presale
+      name: 'Presale'
 after_success:
   - ./node_modules/.bin/lcov-result-merger 'apps/*/coverage/lcov.info' | ./node_modules/.bin/coveralls
diff --git a/README.md b/README.md
@@ -1,84 +1,21 @@
-<h1 align="center">
-<br>
-
- <img src="./.github/images/icon.svg" alt="Aragon Fundraising" width="200">
-  <br>
-  Aragon Fundraising
-  <br>
-  <br>
-</h1>
-
-<br>
-<h4 align="center">
-  Fundraising Apps Suite for <a href="https://www.aragon.org" target="_blank">Aragon</a> Organizations
-</h4>
-
-<p align="center">
-  <a href="https://badge.fury.io/js/electron-markdownify">
-    <img
-      src="https://travis-ci.org/AragonBlack/fundraising.svg?branch=next"
-      alt="Build"
-    >
-  </a>
-  <a href="https://coveralls.io/github/AragonBlack/fundraising?branch=next">
-    <img
-      src="https://coveralls.io/repos/github/AragonBlack/fundraising/badge.svg?branch=next"
-      alt="Coverage"
-    >
-  </a>
-  <a href="https://www.gnu.org/licenses/agpl-3.0">
-    <img
-      src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg"
-      alt="License"
-    >
-  </a>
-  <a href="https://en.cryptobadges.io/donate/0x233373130f7d859c1d743d01b7dfa09b9667a69a">
-    <img
-      src="https://en.cryptobadges.io/badge/micro/0x233373130f7d859c1d743d01b7dfa09b9667a69a"
-      alt="Donate"
-    >
-  </a>
-  <a href="https://aragon.chat">
-    <img
-      src="https://img.shields.io/badge/chat-Rocket.Chat-GREEN"
-      alt="Chat"
-    >
-  </a>
-  <a href="https://twitter.com/AragonBlackTeam">
-    <img 
-      src="https://img.shields.io/twitter/follow/AragonBlackTeam?label=Follow"
-      alt="Follow"
-    >
-  </a>
-</p>
-
-<br>
+# Marketplace [![Build Status](https://travis-ci.org/1Hive/marketplace-app.svg?branch=master)](https://travis-ci.org/1Hive/marketplace-app) [![Coverage](https://coveralls.io/repos/github/1Hive/marketplace-app/badge.svg?branch=master)](https://coveralls.io/github/1Hive/marketplace-app?branch=master) [![License](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 
 
 ## Disclaimer
 
-Aragon Fundraising is an open source suite of apps. None of the people or institutions involved in its development may be held accountable for how it is used. If you do use it please make sure you comply to the jurisdictions you may be jubjected to.
+Marketplace is an open source suite of apps. None of the people or institutions involved in its development may be held accountable for how it is used. If you do use it please make sure you comply to the jurisdictions you may be jubjected to.
 
 ## Overview
 
-Aragon Fundraising is a suite of Aragon apps providing Aragon organizations continuous fundraising capabilities. It implements the following features.
+Marketplace is a suite of Aragon apps providing Aragon organizations continuous fundraising capabilities. It implements the following features.
 
 ### Presale
 
 This module allows organizations to set a presale target that must be reached during a given period of time for the continous fundraising campaign to actually start.
 
-### Automatic Batched Market Making
+### Automatic Market Making
 
-This module provides market liquidity to the fundraising campaign by automatically matching all the buy and sell orders according to a bonding curve tied to the Bancor formula. To mitigate front-running attacks and authorizing slow-trading this module also batches all the buy and sell orders received during a parametrable period of time to be matched given a common price.
-
-### Tap
-
-This module enforce a tap-based control of the funds allowed to be withdrawn from the market-maker reserve pool to a discretionnary pool whose funds can be spent to sustain the organization. To provide more guarantees to the investors this tap module also allows this flow of funds to be floored [thus ensuring that the market maker reserve pool can't be emptied even slowly during a long period of time].
-
-
-## Architecture
-
-![Architecture](.github/images/architecture.svg)
+This module provides market liquidity to the marketplacee by automatically matching all the buy and sell orders according to a bonding curve tied to the Bancor formula.
 
 
 ## Packages
@@ -88,14 +25,12 @@ This module enforce a tap-based control of the funds allowed to be withdrawn fro
 
 | Package                                                                                | Version | Description                                                                                                   |
 | -------------------------------------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------- |
-| [`@ablack/fundraising-bancor-formula`](/apps/bancor-formula)                           |         | `BancorFormula` computation contract                                                                          |
-| [`@ablack/fundraising-batched-bancor-market-maker`](/apps/bancor-market-maker) |         | Automated market-maker batching orders filled through the `BancorFormula`                                     |
-| [`@ablack/fundraising-tap`](/apps/tap)                                                 |         | Tap controlling the flow of funds from a reserve to a beneficiary                                             |
-| [`@ablack/fundraising-aragon-fundraising`](/apps/marketplace-controller)                   |         | `API` contract providing a single entry-point to interact consistently with all fundraising-related contracts |
+| [`@1hive/apps-marketplace-bancor-formula`](/apps/bancor-formula)                           |         | `BancorFormula` computation contract                                                                          |
+| [`@1hive/apps-marketplace-bancor-market-maker`](/apps/bancor-market-maker) |         | Automated market-maker batching orders filled through the `BancorFormula`                                     |
+| [`@1hive/apps-marketplace-presale`](/apps/presale)                                                 |         | Initial fundraising to hatch the bonding curve                                             |
+| [`@1hive/apps-marketplace-controller`](/apps/marketplace-controller)                   |         | `API` contract providing a single entry-point to interact consistently with all marketplace-related contracts |
 
 
 ## Contributing
 
-We are highly open to the community helping use improve and shape the future of `Aragon Fundraising`.
-
-To learn more about our development and deployment workflows you can look into the [`Workflow.md`](/Workflow.md) file.     
+We are highly open to the community helping use improve and shape the future of `Marketplace`.
diff --git a/Workflow.md b/Workflow.md
diff --git a/apps/bancor-formula/arapp.json b/apps/bancor-formula/arapp.json
@@ -1,24 +1,24 @@
 {
   "environments": {
-    "default": {
+    "localhost": {
       "registry": "0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1",
-      "appName": "bancor-formula.aragonpm.eth",
+      "appName": "marketplace-bancor-formula.aragonpm.eth",
       "network": "rpc"
     },
     "mainnet": {
-      "registry": "0x314159265dd8dbb310642f98f50c066173c1259b",
-      "appName": "bancor-formula.aragonpm.eth",
+      "registry": "0x00000000000C2E074eC69A0dFb2997BA6C7d2e1e",
+      "appName": "marketplace-bancor-formula.open.aragonpm.eth",
       "network": "mainnet"
     },
     "rinkeby": {
       "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
-      "appName": "bancor-formula.aragonpm.eth",
+      "appName": "marketplace-bancor-formula.open.aragonpm.eth",
       "network": "rinkeby"
     },
-    "hatch": {
-      "registry": "0x98Df287B6C145399Aaa709692c8D308357bC085D",
-      "appName": "bancor-formula.hatch.aragonpm.eth",
-      "network": "rinkeby"
+    "xdai": {
+      "registry": "0xaafca6b0c89521752e559650206d7c925fd0e530",
+      "appName": "marketplace-bancor-formula.open.aragonpm.eth",
+      "network": "xdai"
     }
   },
   "path": "contracts/BancorFormula.sol"