Merge pull request #10 from vbaranov/master

New footer/header images for POA Network; keysManager ABI update

public/index.html

@@ -53,7 +53,7 @@
         <a href="https://twitter.com/oraclesorg" class="socials-i socials-i_twitter"></a>
         <a href="#" class="socials-i socials-i_bitcoin"></a>
       </div>
-      <p class="footer-rights">2017 Oracles Network. All rights reserved.</p>
+      <p class="footer-rights">2017 POA Network. All rights reserved.</p>
     </div>
   </footer>
 </body>

src/contracts/keysManager.abi.json

@@ -50,7 +50,7 @@
     "constant": true,
     "inputs": [
       {
-        "name": "",
+        "name": "_miningKey",
         "type": "address"
       }
     ],
@@ -347,6 +347,25 @@
     "stateMutability": "view",
     "type": "function"
   },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "_miningKey",
+        "type": "address"
+      }
+    ],
+    "name": "getMiningKeyHistory",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
   {
     "constant": true,
     "inputs": [],
@@ -363,12 +382,25 @@
   },
   {
     "constant": true,
-    "inputs": [],
+    "inputs": [
-    "name": "votingContract",
+      {
+        "name": "_initialKey",
+        "type": "address"
+      },
+      {
+        "name": "_votingKey",
+        "type": "address"
+      },
+      {
+        "name": "_payoutKey",
+        "type": "address"
+      }
+    ],
+    "name": "getInitialKey",
     "outputs": [
       {
         "name": "",
-        "type": "address"
+        "type": "uint8"
       }
     ],
     "payable": false,
@@ -392,14 +424,28 @@
       }
     ],
     "name": "createKeys",
-    "outputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
     "payable": false,
     "stateMutability": "nonpayable",
     "type": "function"
   },
   {
     "constant": true,
-    "inputs": [],
+    "inputs": [
+      {
+        "name": "_key",
+        "type": "address"
+      },
+      {
+        "name": "_miningKey",
+        "type": "address"
+      }
+    ],
     "name": "initialKeysCount",
     "outputs": [
       {
@@ -442,7 +488,12 @@
       }
     ],
     "name": "swapMiningKey",
-    "outputs": [],
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
     "payable": false,
     "stateMutability": "nonpayable",
     "type": "function"
@@ -461,33 +512,19 @@
     "stateMutability": "view",
     "type": "function"
   },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "masterOfCeremony",
-    "outputs": [
-      {
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
   {
     "constant": true,
     "inputs": [
       {
-        "name": "_miningKey",
+        "name": "",
         "type": "address"
       }
     ],
-    "name": "isPayoutActive",
+    "name": "miningKeyByVoting",
     "outputs": [
       {
         "name": "",
-        "type": "bool"
+        "type": "address"
       }
     ],
     "payable": false,
@@ -510,8 +547,71 @@
       }
     ],
     "payable": false,
-    "stateMutability": "nonpayable",
+    "stateMutability": "view",
-    "type": "constructor"
+    "type": "function",
+    "constant": true,
+    "name": "masterOfCeremony",
+    "outputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ]
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "_miningKey",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "miningKey",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "action",
+        "type": "string"
+      }
+    ],
+    "name": "isPayoutActive",
+    "type": "function",
+    "constant": true,
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "name": "_proxyStorage",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "_poaConsensus",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "_masterOfCeremony",
+        "type": "address"
+      }
+    ],
+    "name": "VotingKeyChanged",
+    "type": "constructor",
+    "payable": false,
+    "stateMutability": "nonpayable"
   },
   {
     "anonymous": false,
@@ -569,6 +669,11 @@
         "indexed": false,
         "name": "action",
         "type": "string"
+      },
+      {
+        "indexed": false,
+        "name": "initialKeysCount",
+        "type": "uint256"
       }
     ],
     "name": "MiningKeyChanged",

src/getWeb3.js

@@ -1,6 +1,6 @@
 let errorMsgNoMetamaskAccount = `You haven't chosen any account in MetaMask.
 Please, choose your initial key in MetaMask and reload the page.
-Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.`;
+Check POA Network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.`;
 
 let getWeb3 = () => {
   return new Promise(function (resolve, reject) {
@@ -23,9 +23,9 @@ let getWeb3 = () => {
               break;
             default:
               netIdName = 'ERROR'
-              errorMsg = `You aren't connected to Oracles Network. 
+              errorMsg = `You aren't connected to POA Network. 
-                  Please, switch on Oracles plugin and refresh the page. 
+                  Please, switch on POA plugin and refresh the page. 
-                  Check Oracles network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.`
+                  Check POA Network <a href='https://github.com/oraclesorg/oracles-wiki' target='blank'>wiki</a> for more info.`
               console.log('This is an unknown network.')
           }
           var defaultAccount = web3.eth.defaultAccount || null;

src/index/footer.scss

@@ -17,14 +17,14 @@
   }
 
   &-logo {
-    @include image-2x('../images/CEREMONY_footer@2x.png', 100px, 24px);
+    @include image-2x('../images/logo_validators_dapp_footer@2x.png', 123px, 24px);
     position: relative;
     z-index: 2;
     display: inline-block;
     vertical-align: middle;
-    width: 100px;
+    width: 123px;
   	height: 24px;
-    background-image: url('../images/CEREMONY_footer.png');
+    background-image: url('../images/logo_validators_dapp_footer.png');
     background-position: 0 0;
   }
 

src/index/header.scss

@@ -20,11 +20,11 @@
   }
 
   &-logo {
-    @include image-2x('../images/CEREMONY@2x.png', 149px, 35px);
+    @include image-2x('../images/logo_validators_dapp@2x.png', 182px, 35px);
     float: left;
-    width: 149px;
+    width: 182px;
   	height: 35px;
-    background-image: url('../images/CEREMONY.png');
+    background-image: url('../images/logo_validators_dapp.png');
     background-position: 0 0;
   }
 

src/index/index.css

@@ -125,6 +125,8 @@ button:focus {
     margin-bottom: 20px; }
   .create-keys h2 {
     margin-bottom: 20px; }
+  .create-keys .set {
+    margin-top: 20px; }
   .create-keys-button {
     display: inline-block;
     background-color: #08b3f2;
@@ -196,14 +198,14 @@ button:focus {
     z-index: 2;
     display: inline-block;
     vertical-align: middle;
-    width: 100px;
+    width: 123px;
     height: 24px;
-    background-image: url("../images/CEREMONY_footer.png");
+    background-image: url("../images/logo_validators_dapp_footer.png");
     background-position: 0 0; }
     @media (min--moz-device-pixel-ratio: 1.3), (-o-min-device-pixel-ratio: 2.6 / 2), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx) {
       .footer-logo {
-        background-image: url("../images/CEREMONY_footer@2x.png");
+        background-image: url("../images/logo_validators_dapp_footer@2x.png");
-        background-size: 100px 24px; } }
+        background-size: 123px 24px; } }
   .footer-rights {
     position: absolute;
     z-index: 1;
@@ -229,14 +231,14 @@ button:focus {
     font-weight: bold; }
   .header-logo {
     float: left;
-    width: 149px;
+    width: 182px;
     height: 35px;
-    background-image: url("../images/CEREMONY.png");
+    background-image: url("../images/logo_validators_dapp.png");
     background-position: 0 0; }
     @media (min--moz-device-pixel-ratio: 1.3), (-o-min-device-pixel-ratio: 2.6 / 2), (-webkit-min-device-pixel-ratio: 1.3), (min-device-pixel-ratio: 1.3), (min-resolution: 1.3dppx) {
       .header-logo {
-        background-image: url("../images/CEREMONY@2x.png");
+        background-image: url("../images/logo_validators_dapp@2x.png");
-        background-size: 149px 35px; } }
+        background-size: 182px 35px; } }
   .header-new-ballot {
     float: right;
     margin-top: 3px; }