[beta] UI updates for 1.5.1 (#4429)

* s/Delete Contract/Forget Contract/ (#4237) * Adjust the location of the signer snippet (#4155) * Additional building-block UI components (#4239) * Currency WIP * Expand tests * Pass className * Add QrCode * Export new components in ~/ui * s/this.props.netSymbol/netSymbol/ * Fix import case * ui/SectionList component (#4292) * array chunking utility * add SectionList component * Add TODOs to indicate possible future work * Add missing overlay style (as used in dapps at present) * Add a Playground for the UI Components (#4301) * Playground // WIP * Linting * Add Examples with code * CSS Linting * Linting * Add Connected Currency Symbol * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * 2015-2017 * Added `renderSymbol` tests * PR grumbles * Add Eth and Btc QRCode examples * 2015-2017 * Add tests for playground * Fixing tests * Split Dapp icon into ui/DappIcon (#4308) * Add QrCode & Copy to ShapeShift (#4322) * Extract CopyIcon to ~/ui/Icons * Add copy & QrCode address * Default size 4 * Add bitcoin: link * use protocol links applicable to coin exchanged * Remove .only * Display QrCode for accounts, addresses & contracts (#4329) * Allow Portal to be used as top-level modal (#4338) * Portal * Allow Portal to be used in as both top-level and popover * modal/popover variable naming * export Portal in ~/ui * Properly handle optional onKeyDown * Add simple Playground Example * Add proper event listener to Portal (#4359) * Display AccountCard name via IdentityName (#4235) * Fix signing (#4363) * Dapp Account Selection & Defaults (#4355) * Add parity_defaultAccount RPC (with subscription) (#4383) * Default Account selector in Signer overlay (#4375) * Typo, fixes #4271 (#4391) * Fix ParityBar account selection overflows (#4405) * Available Dapp selection alignment with Permissions (Portal) (#4374) * registry dapp: make lookup use lower case (#4409) * Dapps use defaultAccount instead of own selectors (#4386) * Poll for defaultAccount to update dapp & overlay subscriptions (#4417) * Poll for defaultAccount (Fixes #4413) * Fix nextTimeout on catch * Store timers * Re-enable default updates on change detection * Add block & timestamp conditions to Signer (#4411) * Extension installation overlay (#4423) * Extension installation overlay * Pr gumbles * Spelling * Update Chrome URL * Fix for non-included jsonrpc * Extend Portal component (as per Modal) #4392
openethereum · Feb 4, 2017 · fb817fc · fb817fc
1 parent f76b94c
commit fb817fc
Show file tree

Hide file tree

Showing 136 changed files with 5,769 additions and 1,224 deletions.
diff --git a/js/package.json b/js/package.json
@@ -163,13 +163,16 @@
     "phoneformat.js": "1.0.3",
     "promise-worker": "1.1.1",
     "push.js": "0.0.11",
+    "qrcode-npm": "0.0.3",
     "qs": "6.3.0",
     "react": "15.4.1",
     "react-ace": "4.1.0",
     "react-addons-css-transition-group": "15.4.1",
     "react-copy-to-clipboard": "4.2.3",
     "react-dom": "15.4.1",
     "react-dropzone": "3.7.3",
+    "react-element-to-jsx-string": "6.0.0",
+    "react-event-listener": "0.4.1",
     "react-intl": "2.1.5",
     "react-portal": "3.0.0",
     "react-redux": "4.4.6",
@@ -185,6 +188,7 @@
     "scryptsy": "2.0.0",
     "solc": "ngotchac/solc-js",
     "store": "1.3.20",
+    "useragent.js": "0.5.6",
     "utf8": "2.1.2",
     "valid-url": "1.0.9",
     "validator": "6.2.0",

diff --git a/js/src/api/format/input.js b/js/src/api/format/input.js
@@ -127,6 +127,18 @@ export function inNumber16 (number) {
   return inHex(bn.toString(16));
 }
 
+export function inOptionsCondition (condition) {
+  if (condition) {
+    if (condition.block) {
+      condition.block = condition.block ? inNumber10(condition.block) : null;
+    } else if (condition.time) {
+      condition.time = inNumber10(Math.floor(condition.time.getTime() / 1000));
+    }
+  }
+
+  return condition;
+}
+
 export function inOptions (options) {
   if (options) {
     Object.keys(options).forEach((key) => {
@@ -136,6 +148,10 @@ export function inOptions (options) {
           options[key] = inAddress(options[key]);
           break;
 
+        case 'condition':
+          options[key] = inOptionsCondition(options[key]);
+          break;
+
         case 'gas':
         case 'gasPrice':
           options[key] = inNumber16((new BigNumber(options[key])).round());

diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
@@ -200,6 +200,18 @@ export function outSyncing (syncing) {
   return syncing;
 }
 
+export function outTransactionCondition (condition) {
+  if (condition) {
+    if (condition.block) {
+      condition.block = outNumber(condition.block);
+    } else if (condition.time) {
+      condition.time = outDate(condition.time);
+    }
+  }
+
+  return condition;
+}
+
 export function outTransaction (tx) {
   if (tx) {
     Object.keys(tx).forEach((key) => {
@@ -213,8 +225,14 @@ export function outTransaction (tx) {
           tx[key] = outNumber(tx[key]);
           break;
 
+        case 'condition':
+          tx[key] = outTransactionCondition(tx[key]);
+          break;
+
         case 'minBlock':
-          tx[key] = tx[key] ? outNumber(tx[key]) : null;
+          tx[key] = tx[key]
+            ? outNumber(tx[key])
+            : null;
           break;
 
         case 'creates':

diff --git a/js/src/api/rpc/parity/parity.js b/js/src/api/rpc/parity/parity.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
-import { inAddress, inAddresses, inData, inHex, inNumber16, inOptions } from '../../format/input';
+import { inAddress, inAddresses, inData, inHex, inNumber16, inOptions, inBlockNumber } from '../../format/input';
 import { outAccountInfo, outAddress, outAddresses, outChainStatus, outHistogram, outNumber, outPeers, outTransaction } from '../../format/output';
 
 export default class Parity {
@@ -76,6 +76,17 @@ export default class Parity {
       .execute('parity_dappsInterface');
   }
 
+  decryptMessage (address, data) {
+    return this._transport
+      .execute('parity_decryptMessage', inAddress(address), inHex(data));
+  }
+
+  defaultAccount () {
+    return this._transport
+      .execute('parity_defaultAccount')
+      .then(outAddress);
+  }
+
   defaultExtraData () {
     return this._transport
       .execute('parity_defaultExtraData');
@@ -101,6 +112,11 @@ export default class Parity {
       .execute('parity_enode');
   }
 
+  encryptMessage (pubkey, data) {
+    return this._transport
+      .execute('parity_encryptMessage', inHex(pubkey), inHex(data));
+  }
+
   executeUpgrade () {
     return this._transport
       .execute('parity_executeUpgrade');
@@ -111,6 +127,17 @@ export default class Parity {
       .execute('parity_extraData');
   }
 
+  futureTransactions () {
+    return this._transport
+      .execute('parity_futureTransactions');
+  }
+
+  gasCeilTarget () {
+    return this._transport
+      .execute('parity_gasCeilTarget')
+      .then(outNumber);
+  }
+
   gasFloorTarget () {
     return this._transport
       .execute('parity_gasFloorTarget')
@@ -156,11 +183,22 @@ export default class Parity {
       .execute('parity_killAccount', inAddress(account), password);
   }
 
+  listAccounts (count, offset = null, blockNumber = 'latest') {
+    return this._transport
+      .execute('parity_listAccounts', count, inAddress(offset), inBlockNumber(blockNumber))
+      .then((accounts) => (accounts || []).map(outAddress));
+  }
+
   listRecentDapps () {
     return this._transport
       .execute('parity_listRecentDapps');
   }
 
+  listStorageKeys (address, count, hash = null, blockNumber = 'latest') {
+    return this._transport
+      .execute('parity_listStorageKeys', inAddress(address), count, inHex(hash), inBlockNumber(blockNumber));
+  }
+
   removeAddress (address) {
     return this._transport
       .execute('parity_removeAddress', inAddress(address));
@@ -265,6 +303,11 @@ export default class Parity {
       .then(outAddress);
   }
 
+  postSign (address, hash) {
+    return this._transport
+      .execute('parity_postSign', inAddress(address), inHex(hash));
+  }
+
   postTransaction (options) {
     return this._transport
       .execute('parity_postTransaction', inOptions(options));
@@ -311,16 +354,31 @@ export default class Parity {
       .execute('parity_setDappsAddresses', dappId, inAddresses(addresses));
   }
 
+  setEngineSigner (address, password) {
+    return this._transport
+      .execute('parity_setEngineSigner', inAddress(address), password);
+  }
+
   setExtraData (data) {
     return this._transport
       .execute('parity_setExtraData', inData(data));
   }
 
+  setGasCeilTarget (quantity) {
+    return this._transport
+      .execute('parity_setGasCeilTarget', inNumber16(quantity));
+  }
+
   setGasFloorTarget (quantity) {
     return this._transport
       .execute('parity_setGasFloorTarget', inNumber16(quantity));
   }
 
+  setMaxTransactionGas (quantity) {
+    return this._transport
+      .execute('parity_setMaxTransactionGas', inNumber16(quantity));
+  }
+
   setMinGasPrice (quantity) {
     return this._transport
       .execute('parity_setMinGasPrice', inNumber16(quantity));

diff --git a/js/src/api/subscriptions/eth.js b/js/src/api/subscriptions/eth.js
@@ -23,6 +23,7 @@ export default class Eth {
     this._started = false;
 
     this._lastBlock = new BigNumber(-1);
+    this._pollTimerId = null;
   }
 
   get isStarted () {
@@ -37,7 +38,7 @@ export default class Eth {
 
   _blockNumber = () => {
     const nextTimeout = (timeout = 1000) => {
-      setTimeout(() => {
+      this._pollTimerId = setTimeout(() => {
         this._blockNumber();
       }, timeout);
     };
@@ -57,6 +58,6 @@ export default class Eth {
 
         nextTimeout();
       })
-      .catch(nextTimeout);
+      .catch(() => nextTimeout());
   }
 }
diff --git a/js/src/api/subscriptions/manager.js b/js/src/api/subscriptions/manager.js
@@ -25,6 +25,7 @@ const events = {
   'logging': { module: 'logging' },
   'eth_blockNumber': { module: 'eth' },
   'parity_allAccountsInfo': { module: 'personal' },
+  'parity_defaultAccount': { module: 'personal' },
   'eth_accounts': { module: 'personal' },
   'signer_requestsToConfirm': { module: 'signer' }
 };

diff --git a/js/src/api/subscriptions/personal.js b/js/src/api/subscriptions/personal.js
@@ -1,4 +1,4 @@
-// Copyright 2015, 2016 Parity Technologies (UK) Ltd.
+// Copyright 2015-2017 Parity Technologies (UK) Ltd.
 // This file is part of Parity.
 
 // Parity is free software: you can redistribute it and/or modify
@@ -20,6 +20,9 @@ export default class Personal {
     this._api = api;
     this._updateSubscriptions = updateSubscriptions;
     this._started = false;
+
+    this._lastDefaultAccount = '0x0';
+    this._pollTimerId = null;
   }
 
   get isStarted () {
@@ -30,12 +33,44 @@ export default class Personal {
     this._started = true;
 
     return Promise.all([
+      this._defaultAccount(),
       this._listAccounts(),
       this._accountsInfo(),
       this._loggingSubscribe()
     ]);
   }
 
+  // FIXME: Because of the different API instances, the "wait for valid changes" approach
+  // doesn't work. Since the defaultAccount is critical to operation, we poll in exactly
+  // same way we do in ../eth (ala same as eth_blockNumber) and update. This should be moved
+  // to pub-sub as it becomes available
+  _defaultAccount = (timerDisabled = false) => {
+    const nextTimeout = (timeout = 1000) => {
+      if (!timerDisabled) {
+        this._pollTimerId = setTimeout(() => {
+          this._defaultAccount();
+        }, timeout);
+      }
+    };
+
+    if (!this._api.transport.isConnected) {
+      nextTimeout(500);
+      return;
+    }
+
+    return this._api.parity
+      .defaultAccount()
+      .then((defaultAccount) => {
+        if (this._lastDefaultAccount !== defaultAccount) {
+          this._lastDefaultAccount = defaultAccount;
+          this._updateSubscriptions('parity_defaultAccount', null, defaultAccount);
+        }
+
+        nextTimeout();
+      })
+      .catch(() => nextTimeout());
+  }
+
   _listAccounts = () => {
     return this._api.eth
       .accounts()
@@ -46,9 +81,19 @@ export default class Personal {
 
   _accountsInfo = () => {
     return this._api.parity
-      .allAccountsInfo()
+      .accountsInfo()
       .then((info) => {
-        this._updateSubscriptions('parity_allAccountsInfo', null, info);
+        this._updateSubscriptions('parity_accountsInfo', null, info);
+
+        return this._api.parity
+          .allAccountsInfo()
+          .catch(() => {
+            // NOTE: This fails on non-secure APIs, swallow error
+            return {};
+          })
+          .then((allInfo) => {
+            this._updateSubscriptions('parity_allAccountsInfo', null, allInfo);
+          });
       });
   }
 
@@ -73,6 +118,11 @@ export default class Personal {
         case 'parity_setAccountMeta':
           this._accountsInfo();
           return;
+
+        case 'parity_setDappsAddresses':
+        case 'parity_setNewDappsWhitelist':
+          this._defaultAccount(true);
+          return;
       }
     });
   }