Various UI fixes

Author: nick

contracts/ClaimHolder.sol

@@ -110,12 +110,7 @@ contract ClaimHolder is KeyHolder, ERC735 {
         bytes32 sa;
         uint8 va;
 
-        bytes memory prefix = "\x19Ethereum Signed Message:\n32"; // prefix used by web3
         bytes memory sig = claims[_claimId].signature;
-        uint256 claimType = claims[_claimId].claimType;
-        bytes32 claimData = claims[_claimId].data;
-        bytes32 dataHash = keccak256(address(this), claimType, claimData);
-        bytes32 prefixedHash = keccak256(prefix, dataHash);
 
         // Check the signature length
         if (sig.length != 65) {
@@ -133,6 +128,9 @@ contract ClaimHolder is KeyHolder, ERC735 {
           va += 27;
         }
 
+        bytes32 dataHash = keccak256(address(this), claims[_claimId].claimType, claims[_claimId].data);
+        bytes32 prefixedHash = keccak256("\x19Ethereum Signed Message:\n32", dataHash);
+
         return (prefixedHash, ra, sa, va);
     }
 

contracts/ClaimVerifier.sol

@@ -4,8 +4,8 @@ import './ClaimHolder.sol';
 
 contract ClaimVerifier {
 
-  event ClaimValid(ClaimHolder _identity, uint256 claimType);
-  event ClaimInvalid(ClaimHolder _identity, uint256 claimType);
+  event ClaimValid(ClaimHolder _identity, uint256 claimType, bytes32 recoveredKey);
+  event ClaimInvalid(ClaimHolder _identity, uint256 claimType, bytes32 recoveredKey);
 
   ClaimHolder public trustedClaimHolder;
 
@@ -35,10 +35,10 @@ contract ClaimVerifier {
 
     // Does the trusted identifier have they key which signed the user's claim?
     if (trustedClaimHolder.keyHasPurpose(hashedAddr, 3)) {
-      emit ClaimValid(_identity, claimType);
+      emit ClaimValid(_identity, claimType, hashedAddr);
       return true;
     } else {
-      emit ClaimInvalid(_identity, claimType);
+      emit ClaimInvalid(_identity, claimType, hashedAddr);
       return false;
     }
   }

src/actions/Identity.js

@@ -3,6 +3,11 @@ import Identity from '../contracts/Identity'
 import ClaimHolder from '../contracts/ClaimHolder'
 import ClaimVerifier from '../contracts/ClaimVerifier'
 
+window.contracts = {
+  ClaimHolder: (addr) => new web3.eth.Contract(ClaimHolder.abi, addr),
+  ClaimVerifier: (addr) => new web3.eth.Contract(ClaimVerifier.abi, addr),
+}
+
 function lookup(Types) {
   return function claimType(id) {
     var type = Types.find(t => t.id === id)
@@ -309,7 +314,9 @@ export function addClaim({
       })
 
     dispatch(sendTransaction(tx, IdentityConstants.ADD_CLAIM, txData, () => {
-      dispatch(getEvents('ClaimHolder', targetIdentity))
+      if (web3.eth.defaultAccount === targetIdentity) {
+        dispatch(getEvents('ClaimHolder', targetIdentity))
+      }
     }))
   }
 }
@@ -335,7 +342,7 @@ export function removeClaim({ identity, claim }) {
 
 function sendTransaction(transaction, type, data, callback) {
   return async function(dispatch) {
-    dispatch({ type })
+    dispatch({ type, ...data })
 
     transaction
       .on('error', error => {

src/actions/Wallet.js

@@ -67,6 +67,7 @@ export function loadWallet(external) {
 
     try {
       if (external) {
+        web3.setProvider(state.network.browserProvider)
         accounts = await web3.eth.getAccounts()
 
         balanceWei = await web3.eth.getBalance(accounts[0])
@@ -83,6 +84,8 @@ export function loadWallet(external) {
         return
       }
 
+      web3.setProvider(state.network.provider)
+
       // wallet.load is expensive, so cache private keys in sessionStorage
       if (window.sessionStorage.privateKeys) {
         JSON.parse(window.sessionStorage.privateKeys).forEach(key =>
@@ -129,10 +132,12 @@ export function selectAccount(address) {
 
     try {
       var account = web3.eth.accounts.wallet[address]
+      web3.eth.defaultAccount = address
 
       dispatch({
         type: WalletConstants.SELECT_ACCOUNT_SUCCESS,
-        account
+        account,
+        activeAddress: address
       })
     } catch (error) {
       dispatch({ type: WalletConstants.SELECT_ACCOUNT_ERROR, error })

src/contracts/ClaimHolder.js

@@ -106,6 +106,11 @@ module.exports = {
                     "indexed": false,
                     "name": "claimType",
                     "type": "uint256"
+                },
+                {
+                    "indexed": false,
+                    "name": "recoveredKey",
+                    "type": "bytes32"
                 }
             ],
             "name": "ClaimValid",
@@ -123,11 +128,16 @@ module.exports = {
                     "indexed": false,
                     "name": "claimType",
                     "type": "uint256"
+                },
+                {
+                    "indexed": false,
+                    "name": "recoveredKey",
+                    "type": "bytes32"
                 }
             ],
             "name": "ClaimInvalid",
             "type": "event"
         }
     ],
-    "data": "6060604052341561000f57600080fd5b6040516020806109bb83398101604052808051906020019091905050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506109408061007b6000396000f300606060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630382ad261461006757806336938354146100c1578063bcd68f4f14610116578063e6c1f9021461019c575b600080fd5b341561007257600080fd5b6100a7600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506101f6565b604051808215151515815260200191505060405180910390f35b34156100cc57600080fd5b6100d4610545565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561012157600080fd5b61015a600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080356000191690602001909190505061056a565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101a757600080fd5b6101dc600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106ac565b604051808215151515815260200191505060405180910390f35b60008060008060008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1688604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140182815260200192505050604051809103902092508873ffffffffffffffffffffffffffffffffffffffff1663c9100bcb846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505060c060405180830381600087803b15156102f357600080fd5b5af1151561030057600080fd5b50505060405180519060200180519060200180519060200180519060200180519060200180519050909150905050809650819750829850505050610344898461056a565b915081604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401915050604051809103902090506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d202158d8260036040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180836000191660001916815260200182815260200192505050602060405180830381600087803b151561043957600080fd5b5af1151561044657600080fd5b50505060405180519050156104c9577f5637aa6b77cde2de563765b75a65099af73d3bf22cb9d089a64a01777823208e8989604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a160019650610539565b7fc1e461cfcaa9ff5efbb053582a325fbfebec1d94ac7e9d9958ee7f74c2b6b5588989604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018281526020019250505060405180910390a1600096505b50505050505092915050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000806000806000808773ffffffffffffffffffffffffffffffffffffffff1663a0ebcf61886040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808260001916600019168152602001915050608060405180830381600087803b15156105e957600080fd5b5af115156105f657600080fd5b5050506040518051906020018051906020018051906020018051905080955081965082975083985050505050600185838686604051600081526020016040526040518085600019166000191681526020018460ff1660ff1681526020018360001916600019168152602001826000191660001916815260200194505050505060206040516020810390808403906000865af1151561069357600080fd5b5050602060405103519050809550505050505092915050565b60008060008060008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1688604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140182815260200192505050604051809103902092508873ffffffffffffffffffffffffffffffffffffffff1663c9100bcb846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505060c060405180830381600087803b15156107a957600080fd5b5af115156107b657600080fd5b505050604051805190602001805190602001805190602001805190602001805190602001805190509091509050508096508197508298505050506107fa898461056a565b915081604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401915050604051809103902090506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d202158d8260036040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180836000191660001916815260200182815260200192505050602060405180830381600087803b15156108ef57600080fd5b5af115156108fc57600080fd5b505050604051805190509650505050505050929150505600a165627a7a723058204502563097e4e5dbe13264cc0f437745343f06d5acd4af7b1b4f42f1f162bfb40029"
+    "data": "6060604052341561000f57600080fd5b6040516020806109db83398101604052808051906020019091905050806000806101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550506109608061007b6000396000f300606060405260043610610062576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680630382ad261461006757806336938354146100c1578063bcd68f4f14610116578063e6c1f9021461019c575b600080fd5b341561007257600080fd5b6100a7600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506101f6565b604051808215151515815260200191505060405180910390f35b34156100cc57600080fd5b6100d4610565565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b341561012157600080fd5b61015a600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080356000191690602001909190505061058a565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b34156101a757600080fd5b6101dc600480803573ffffffffffffffffffffffffffffffffffffffff169060200190919080359060200190919050506106cc565b604051808215151515815260200191505060405180910390f35b60008060008060008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1688604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140182815260200192505050604051809103902092508873ffffffffffffffffffffffffffffffffffffffff1663c9100bcb846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505060c060405180830381600087803b15156102f357600080fd5b5af1151561030057600080fd5b50505060405180519060200180519060200180519060200180519060200180519060200180519050909150905050809650819750829850505050610344898461058a565b915081604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401915050604051809103902090506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d202158d8260036040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180836000191660001916815260200182815260200192505050602060405180830381600087803b151561043957600080fd5b5af1151561044657600080fd5b50505060405180519050156104d9577f3d4de4d11a11373233ed38924ca212d8f7207c65836d87f9d8d4305d1792c713898983604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018260001916600019168152602001935050505060405180910390a160019650610559565b7fe40aa58a04374428c5b27d482e2afa1b57a4a05127c6606b6d3fcec4c8c7361a898983604051808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020018381526020018260001916600019168152602001935050505060405180910390a1600096505b50505050505092915050565b6000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b6000806000806000808773ffffffffffffffffffffffffffffffffffffffff1663a0ebcf61886040518263ffffffff167c0100000000000000000000000000000000000000000000000000000000028152600401808260001916600019168152602001915050608060405180830381600087803b151561060957600080fd5b5af1151561061657600080fd5b5050506040518051906020018051906020018051906020018051905080955081965082975083985050505050600185838686604051600081526020016040526040518085600019166000191681526020018460ff1660ff1681526020018360001916600019168152602001826000191660001916815260200194505050505060206040516020810390808403906000865af115156106b357600080fd5b5050602060405103519050809550505050505092915050565b60008060008060008060008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1688604051808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c0100000000000000000000000002815260140182815260200192505050604051809103902092508873ffffffffffffffffffffffffffffffffffffffff1663c9100bcb846040518263ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180826000191660001916815260200191505060c060405180830381600087803b15156107c957600080fd5b5af115156107d657600080fd5b5050506040518051906020018051906020018051906020018051906020018051906020018051905090915090505080965081975082985050505061081a898461058a565b915081604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff166c01000000000000000000000000028152601401915050604051809103902090506000809054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1663d202158d8260036040518363ffffffff167c010000000000000000000000000000000000000000000000000000000002815260040180836000191660001916815260200182815260200192505050602060405180830381600087803b151561090f57600080fd5b5af1151561091c57600080fd5b505050604051805190509650505050505050929150505600a165627a7a723058208547e1bdf47239a8e13ee10bc58d6d9edcb0c6d6a20a76ca66a697aa96c15e540029"
 }

src/contracts/ClaimVerifier.js

@@ -59,7 +59,7 @@ class Console extends Component {
 
 const mapStateToProps = state => ({
   externalProvider: state.wallet.externalProvider,
-  browserHasProvider: state.network.browserHasProvider
+  browserHasProvider: state.network.browserProvider ? true : false
 })
 
 const mapDispatchToProps = dispatch => ({

src/contracts/Identity.js

@@ -6,7 +6,7 @@ const HOST = process.env.HOST || 'localhost'
 let ipfsGateway = 'https://gateway.originprotocol.com',
   ipfsRPC = 'https://gateway.originprotocol.com',
   provider = 'https://rinkeby.infura.io',
-  browserHasProvider = false
+  browserProvider = false
 
 if (process.env.NODE_ENV !== 'production') {
   ipfsGateway = `http://${HOST}:9090`
@@ -17,11 +17,9 @@ if (process.env.NODE_ENV !== 'production') {
 if (typeof window !== 'undefined') {
   provider = window.sessionStorage.provider || provider
   if (window.web3) {
-    browserHasProvider = true
+    browserProvider = web3.currentProvider
   }
-  window.web3 = new Web3(
-    typeof web3 !== 'undefined' ? web3.currentProvider : provider
-  )
+  window.web3 = new Web3(provider)
 }
 
 const initialState = {
@@ -31,7 +29,7 @@ const initialState = {
   account: null,
   status: 'disconnected',
 
-  browserHasProvider,
+  browserProvider,
   providers: Providers,
   provider,