Merge pull request #329 from levelkdev/develop

openraise-dapp v0.2.2

Author: Augusto Lemble

.nvmrc

@@ -1 +1 @@
-v10.16.3
+10.16.3

.openzeppelin/kovan.json

@@ -489,7 +489,7 @@
   },
   "solidityLibs": {},
   "proxies": {
-    "BC-DAPP/DecentralizedAutonomousTrust": [
+    "openraise-dapp/DecentralizedAutonomousTrust": [
       {
         "address": "0xDd25BaE0659fC06a8d00CD06C7f5A98D71bfB715",
         "version": "0.1.0",
@@ -498,14 +498,14 @@
         "kind": "Upgradeable"
       }
     ],
-    "BC-DAPP/Multicall": [
+    "openraise-dapp/Multicall": [
       {
         "address": "0xc58930e7d81E97D3B82B324eF59e8AfF4bD723BB",
         "kind": "NonProxy",
         "bytecodeHash": "daa7a021eecb7d6e3a847506aa7589e5a9bbdabd6fe91c538a1d9fb37b7fd577"
       }
     ],
-    "BC-DAPP/TokenVesting": [
+    "openraise-dapp/TokenVesting": [
       {
         "address": "0x26A20D2585fbFb8D33c766a0E19555A666D42128",
         "kind": "NonProxy",

.openzeppelin/mainnet.json

@@ -489,7 +489,7 @@
   },
   "solidityLibs": {},
   "proxies": {
-    "BC-DAPP/DecentralizedAutonomousTrust": [
+    "openraise-dapp/DecentralizedAutonomousTrust": [
       {
         "address": "0xa1d65E8fB6e87b60FECCBc582F7f97804B725521",
         "version": "0.1.0",
@@ -498,14 +498,14 @@
         "kind": "Upgradeable"
       }
     ],
-    "BC-DAPP/Multicall": [
+    "openraise-dapp/Multicall": [
       {
         "address": "0x742121cD0BB9784c1f17f25B8da1bF3445b93ED4",
         "kind": "NonProxy",
         "bytecodeHash": "daa7a021eecb7d6e3a847506aa7589e5a9bbdabd6fe91c538a1d9fb37b7fd577"
       }
     ],
-    "BC-DAPP/TokenVesting": [
+    "openraise-dapp/TokenVesting": [
       {
         "address": "0xBd12eBb77eF167a5FF93b7E572b33f2526aE3fd0",
         "kind": "NonProxy",

.openzeppelin/project.json

@@ -6,7 +6,7 @@
     "TokenVesting": "TokenVesting"
   },
   "dependencies": {},
-  "name": "BC-DAPP",
+  "name": "openraise-dapp",
   "version": "0.1.0",
   "compiler": {
     "compilerSettings": {

README.md

@@ -1,14 +1,11 @@
-# BC-DAPP
+# OpenRaise
 
-The **Bonding Curve Decentralized Application** will be used to raise funds to support the development of decentralized finance focused applications governed and maintained by the [DXdao](https://dxdao.daostack.io/).
+The **OpenRaise Dapp** is used to raise funds for decentralized organizations.
 
-## Project Status
-
-The project development can be followed in the milestones section https://github.com/levelkdev/BC-DAPP/milestones.
 
 ## Technical Description
 
-The Bonding Curve Dapp is designed to be completely client side, which means that it runs entirely on the browser of the user and only consumes necessary information and interacts when needed with the Ethereum blockchain.
+The OpenRaise Dapp is designed to be completely client side, which means that it runs entirely on the browser of the user and only consumes necessary information and interacts when needed with the Ethereum blockchain.
 The dapp is written in javascript and typescrypt, it uses ReactJS and Webapack.
 The contracts used in the dapp are the c-org contracts from fairmint. https://github.com/Fairmint/c-org.
 
@@ -115,7 +112,7 @@ Executable can be downloaded from https://swarm-gateways.net/bzz:/swarm.eth/down
 
 The build can be upload to swarm with the following command:
 ```
-~/swarm --bzzapi https://swarm-gateways.net/ --defaultpath PATH_TO_BC-DAPP/build/index.html --recursive up PATH_TO_BC-DAPP/BC-DAPP/build
+~/swarm --bzzapi https://swarm-gateways.net/ --defaultpath PATH_TO_OPENRAISE-DAPP/build/index.html --recursive up PATH_TO_OPENRAISE-DAPP/OPENRAISE-DAPP/build
 ```
 
 ### Smart Contracts

config/webpack.config.js

@@ -39,6 +39,11 @@ const imageInlineSizeLimit = parseInt(
     process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
 );
 
+// Get short commit hash from git
+const GitRevisionPlugin = require('git-revision-webpack-plugin')
+const gitRevisionPlugin = new GitRevisionPlugin()
+const shortCommitHash = gitRevisionPlugin.commithash().substring(0,8);
+
 // Check if TypeScript is setup
 const useTypeScript = fs.existsSync(paths.appTsConfig);
 
@@ -177,13 +182,13 @@ module.exports = function(webpackEnv) {
             // There will be one main bundle, and one file per asynchronous chunk.
             // In development, it does not produce real files.
             filename: isEnvProduction
-                ? 'static/js/[name].js'
+                ? 'static/js/[name].'+shortCommitHash+'.js'
                 : isEnvDevelopment && 'static/js/bundle.js',
             // TODO: remove this when upgrading to webpack 5
             futureEmitAssets: true,
             // There are also additional JS chunk files if you use code splitting.
             chunkFilename: isEnvProduction
-                ? 'static/js/[name].chunk.js'
+                ? 'static/js/[name].'+shortCommitHash+'.chunk.js'
                 : isEnvDevelopment && 'static/js/[name].chunk.js',
             // We inferred the "public path" (such as / or /my-project) from homepage.
             // We use "/" in development.
@@ -208,6 +213,7 @@ module.exports = function(webpackEnv) {
         },
         optimization: {
             minimize: isEnvProduction,
+            moduleIds: 'hashed',
             minimizer: [
                 // This is only used in production mode
                 new TerserPlugin({
@@ -602,7 +608,7 @@ module.exports = function(webpackEnv) {
                 new MiniCssExtractPlugin({
                     // Options similar to the same options in webpackOptions.output
                     // both options are optional
-                    filename: 'static/css/[name].css',
+                    filename: 'static/css/[name].'+shortCommitHash+'.css',
                     chunkFilename:
                         'static/css/[name].chunk.css',
                 }),

config/webpackDevServer.config.js

@@ -96,7 +96,7 @@ module.exports = function(proxy, allowedHost) {
             // We do this in development to avoid hitting the production cache if
             // it used the same host and port.
             // https://github.com/facebook/create-react-app/issues/2272#issuecomment-302832432
-            app.use(noopServiceWorkerMiddleware());
+            app.use(noopServiceWorkerMiddleware('/custom-service-worker.js'));
         },
     };
 };

dist/index.html

@@ -1 +1 @@
-<!doctype html><html><head><title>BC-DAPP</title></head><body><div id="root"></div><script src="index.js"></script></body></html>
+<!doctype html><html><head><title>OpenRaise</title></head><body><div id="root"></div><script src="index.js"></script></body></html>

package-lock.json

@@ -1,23 +1,25 @@
 {
-    "name": "BC-DAPP",
-    "version": "0.2.1",
+    "name": "openraise-dapp",
+    "version": "0.2.2",
     "description": "Decentralized app for fundraising in DXdao.",
     "scripts": {
         "start": "./scripts/start.sh",
         "dev": "./scripts/dev.sh",
         "deploy": "node scripts/deploy.js",
         "deploy-contracts": "node scripts/deployContracts.js",
-        "build": "node scripts/build.js",
+        "build": "rm -rif build && node scripts/build.js",
         "test": "node scripts/test.js",
         "loadDeployments": "node scripts/loadDeployments.js"
     },
+    "engines": {
+        "node": "10.16.3"
+    },
     "repository": {
         "type": "git",
-        "url": "git+https://github.com/levelkdev/BC-DAPP.git"
+        "url": "git+https://github.com/levelkdev/openraise-dapp.git"
     },
-    "authors": "John Kelleher <john.kelleher@levelk.io>, Thomas Pulber <corkus@pm.me>, Thomas Spofford <tspofford@pm.me>, Augusto Lemble <me@augustol.com>",
     "bugs": {
-        "url": "https://github.com/levelkdev/BC-DAPP/issues"
+        "url": "https://github.com/levelkdev/openraise-dapp/issues"
     },
     "homepage": "./",
     "eslintConfig": {
@@ -146,6 +148,7 @@
         "ethereumjs-util": "^6.1.0",
         "ethers": "^4.0.45",
         "file-loader": "3.0.1",
+        "git-revision-webpack-plugin": "^3.0.6",
         "hdkey": "^1.1.1",
         "html-webpack-plugin": "4.0.0-beta.5",
         "identity-obj-proxy": "3.0.0",