Merge pull request #93 from makoto/ethldn201710

Ethldn201710
makoto · Oct 8, 2017 · a4b1bd5 · a4b1bd5
2 parents 482467b + 1661559
commit a4b1bd5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 6 deletions.
diff --git a/app_config.js b/app_config.js
@@ -12,8 +12,8 @@ module.exports = {
   },
   ropsten: {
     contract_addresses:{
-      'Conference': null,
-      'ConfirmationRepository': null
+      'Conference': '0x9320e062d621938bf0e1761f5a005b5caa441e39',
+      'ConfirmationRepository': '0xe444b7bec7a2dbd571523a1e2e4580a1b4c1c9b1'
     },
     name: 'ROPSTEN NET',
     etherscan_url: 'https://ropsten.etherscan.io'

diff --git a/scripts/util/set_gas.js b/scripts/util/set_gas.js
@@ -6,7 +6,7 @@ module.exports = function(web3){
       if (network_id == 1) { // mainnet
         gas = 2000000000 // 2 gwei
       }else if (network_id == 3) {
-        gas = 20000000000 // 20 gwei
+        gas = 50000000000 // 50 gwei
       }else{
         gas = 1;
       }

diff --git a/src/components/ConferenceDetail.js b/src/components/ConferenceDetail.js
@@ -70,7 +70,8 @@ class ConferenceDetail extends React.Component {
 
   toEther(value){
     if(value){
-      return math.round(this.props.web3.fromWei(value, "ether").toNumber(), 3).toString();
+      // return math.round(this.props.web3.fromWei(value, "ether").toNumber(), 3).toString();
+      return this.props.web3.fromWei(value, "ether").toString();
     }
   }
 

diff --git a/src/components/Data.js b/src/components/Data.js
@@ -3,9 +3,17 @@ import React from 'react';
 // May be replaced with IPFS at some point.
 
 let Data = [
+  {
+    name: 'Ethereum London October 2017',
+    address: '0x9320e062d621938bf0e1761f5a005b5caa441e39',
+    date:'Wednesday, October 11, 2017 6:25 PM to 9:00 PM(UTC+1)',
+    map_url: 'https://www.google.com/maps/place/Imperial+College+London/@51.4987997,-0.1770659,17z/data=!3m1!4b1!4m5!3m4!1s0x48760567da220a01:0x31911b371c692e86!8m2!3d51.4987997!4d-0.1748772?hl=en',
+    location_text: 'Sir Alexander Fleming Building (SAF) LT1 G16',
+    description_text: ''
+  },
   {
     name: 'Ethereum London September 2017',
-    address: null,
+    address: '0x56812b5b1c3594af9e0b8a22d07025f5ee3debcd',
     date:'Wednesday, September 13, 2017 6:45 PM to 9:00 PM(UTC+1)',
     map_url: 'https://maps.google.com/maps?f=q&hl=en&q=Huxley+Building%2C+Imperial+College+%2C+London+SW7+2AZ%2C+gb',
     location_text: 'Clore Lecture Theatre, Huxley Building, Imperial College, London (SW7 2AZ)',

diff --git a/truffle.js b/truffle.js
@@ -26,7 +26,7 @@ module.exports = {
       gasPrice: 0x01
     },
     ropsten: {
-      gasPrice: 20000000000, // 20 gwei,
+      gasPrice: 50000000000, // 50 gwei,
       provider: provider,
       network_id: 3,
       from: address