Merge pull request #322 from levelkdev/develop

BCDapp v0.2.1

Author: Augusto Lemble

.openzeppelin/mainnet.json

@@ -488,7 +488,34 @@
     }
   },
   "solidityLibs": {},
-  "proxies": {},
+  "proxies": {
+    "BC-DAPP/DecentralizedAutonomousTrust": [
+      {
+        "address": "0xa1d65E8fB6e87b60FECCBc582F7f97804B725521",
+        "version": "0.1.0",
+        "implementation": "0x845856776D110a200Cf41f35C9428C938e72E604",
+        "admin": "0xFBD9B2773127Ea0A05509f16FD4AACC84F3b9829",
+        "kind": "Upgradeable"
+      }
+    ],
+    "BC-DAPP/Multicall": [
+      {
+        "address": "0x742121cD0BB9784c1f17f25B8da1bF3445b93ED4",
+        "kind": "NonProxy",
+        "bytecodeHash": "daa7a021eecb7d6e3a847506aa7589e5a9bbdabd6fe91c538a1d9fb37b7fd577"
+      }
+    ],
+    "BC-DAPP/TokenVesting": [
+      {
+        "address": "0xBd12eBb77eF167a5FF93b7E572b33f2526aE3fd0",
+        "kind": "NonProxy",
+        "bytecodeHash": "e4bee0a315de0cc8106ca7ec0db7b5f62da96a7d01a624818a748557f73764ff"
+      }
+    ]
+  },
   "manifestVersion": "2.2",
-  "version": "0.1.0"
+  "version": "0.1.0",
+  "proxyAdmin": {
+    "address": "0x07eD323e96b5b37f49432CE86277A56015e7FB5e"
+  }
 }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "BC-DAPP",
-    "version": "0.2.0",
+    "version": "0.2.1",
     "description": "Decentralized app for fundraising in DXdao.",
     "scripts": {
         "start": "./scripts/start.sh",

public/dangerous.svg

@@ -34,11 +34,11 @@ ZWeb3.initialize(web3.currentProvider);
 let contractsDeployed = {'contracts': {}};
 if (fs.existsSync('src/config/contracts.json'))
   contractsDeployed = JSON.parse(fs.readFileSync('src/config/contracts.json', 'utf-8'));
-const toDeploy = JSON.parse(fs.readFileSync('src/config/toDeploy.json', 'utf-8'));
+let toDeploy = JSON.parse(fs.readFileSync('src/config/toDeploy.json', 'utf-8'));
 
 async function main() {
   const contracts = await deployDAT(web3, toDeploy.DATinfo);
-  
+  toDeploy.DATinfo.fromBlock = (await web3.eth.getBlock('latest')).number;
   contractsDeployed.contracts[network] = {
     multicall: contracts.multicall.address,
     DAT: contracts.dat.address,

scripts/deploy.js

@@ -81,23 +81,16 @@ async function main() {
 
   console.log(`Using account: ${deployer}`, ' \n');
   console.log(`Deploy DAT with config: ${JSON.stringify(deployOptions, null, 2)}`, ' \n');
-    
+  
   contracts.proxyAdmin = await ProxyAdmin.new({
     from: deployer
   });
   console.log(`ProxyAdmin deployed ${contracts.proxyAdmin.address}`);
 
-  contracts.tokenVesting = await TokenVesting.new({
-    from: deployer
-  });
-
-  contracts.datImplementation = await DATContract.new({
-    from: deployer
-  });
-  console.log(`DAT implementation deployed ${contracts.datImplementation.address}`);
+  console.log(`Using DAT implementation 0x845856776D110a200Cf41f35C9428C938e72E604`);
 
   contracts.datProxy = await AdminUpgradeabilityProxy.new(
-    contracts.datImplementation.address, // logic
+    "0x845856776D110a200Cf41f35C9428C938e72E604", // logic
     contracts.proxyAdmin.address, // admin
     [], // data
     {
@@ -120,6 +113,9 @@ async function main() {
   ).send({ from: deployer });
 
   // Deploy token vesting
+  contracts.tokenVesting = await TokenVesting.new({
+    from: deployer
+  });
   await contracts.tokenVesting.methods.initialize(
     deployOptions.control, new moment().unix(), deployOptions.vestingCliff, 
     deployOptions.vestingDuration, false, deployOptions.control

scripts/deployContracts.js

@@ -47,6 +47,8 @@ npx truffle compile && rm -rf contracts/build && mv build/contracts contracts/bu
 rm .openzeppelin/dev-*.json ||:
 npx oz push --network develop
 node scripts/copyContracts.js
-node scripts/deploy.js -- --network develop &
+rm src/config/contracts.json ||:
+node scripts/deploy.js -- --network develop
+node scripts/loadDeployments.js
 sleep 3
 FORCE_COLOR=true REACT_APP_ETH_NETWORKS="develop,mainnet,kovan" node scripts/start.js | cat

scripts/dev.sh

@@ -23,15 +23,15 @@ async function loadDeployment(network) {
   let contractsDeployed = {'contracts': {}};
   if (fs.existsSync('src/config/contracts.json'))
     contractsDeployed = JSON.parse(fs.readFileSync('src/config/contracts.json', 'utf-8'));
-
   const datContract = DATContract.at(proxies['BC-DAPP/DecentralizedAutonomousTrust'][0].address);
-
+  const fromBlock = (network == 'mainnet') ? 10012634 : (network == 'kovan') ? 18000000 : 0;
   contractsDeployed.contracts[network] = {
     multicall: proxies['BC-DAPP/Multicall'][0].address,
     DAT: proxies['BC-DAPP/DecentralizedAutonomousTrust'][0].address,
     implementationAddress: proxies['BC-DAPP/DecentralizedAutonomousTrust'][0].implementation,
     collateral: zeroAddress,
     DATinfo: {
+      fromBlock: fromBlock,
       "collateralType": "ETH",
       "name": await datContract.methods.name().call(),
       "symbol": await datContract.methods.symbol().call(),
@@ -46,7 +46,7 @@ async function loadDeployment(network) {
     },
   };
 
-  fs.writeFileSync('src/config/contracts.json', JSON.stringify(contractsDeployed, null, 2), {encoding:'utf8',flag:'w'})
+  await fs.writeFileSync('src/config/contracts.json', JSON.stringify(contractsDeployed, null, 2), {encoding:'utf8',flag:'w'})
   console.log('Deployment configuration loaded for network '+network);
 } 
 

scripts/loadDeployments.js

@@ -7,6 +7,7 @@
     --red-text: #FF4081;
     --blue-onHover: #4864FE;
     --blue-onHover-border: #2545FE;
+    --dangerous-alert: #D32F2F;
     --wrong-network-border: #D81B60;
     --wrong-network-border-hover: #C2185B;
     --wrong-network-hover: #E91E63;

src/App.css

@@ -75,16 +75,16 @@ const Footer = () => {
                         }
                         target="#"
                     >
-                        Version 0.2.0
+                        Version 0.2.1
                     </a>
                 </FooterItem>
                 <FooterDivider></FooterDivider>
                 <FooterItem>
-                    {etherscanAddress(chainId,"Proxy",proxyContract)}
+                    {etherscanToken(chainId,"Token Contract",proxyContract, false)}
                 </FooterItem>
                 <FooterDivider></FooterDivider>
                 <FooterItem>
-                    {etherscanAddress(chainId,"Contract",contract)}
+                    {etherscanAddress(chainId,"Logic Contract",contract)}
                 </FooterItem>
                 <FooterDivider></FooterDivider>
                 <FooterItem>

src/components/Footer.js

@@ -57,11 +57,11 @@ const Footer = () => {
                 <FooterItem>
                     <a
                         href={
-                            'https://github.com/levelkdev/BC-DAPP/tree/v0.2.0'
+                            'https://github.com/levelkdev/BC-DAPP/tree/v0.2.1'
                         }
                         target="#"
                     >
-                        Version 0.2.0
+                        Version 0.2.1
                     </a>
                 </FooterItem>
                 <FooterDivider></FooterDivider>