Cancel tx JS

ethcore/src/miner/miner.rs

@@ -1017,6 +1017,16 @@ impl MinerService for Miner {
 		}
 	}
 
+	fn remove_pending_transaction(&self, chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction> {
+		let mut queue = self.transaction_queue.lock();
+		let tx = queue.find(hash);
+		if tx.is_some() {
+			let fetch_nonce = |a: &Address| chain.latest_nonce(a);
+			queue.remove_invalid(hash, &fetch_nonce);
+		}
+		tx
+	}
+
 	fn pending_receipt(&self, best_block: BlockNumber, hash: &H256) -> Option<RichReceipt> {
 		self.from_pending_block(
 			best_block,

ethcore/src/miner/mod.rs

@@ -150,6 +150,10 @@ pub trait MinerService : Send + Sync {
 	/// Query pending transactions for hash.
 	fn transaction(&self, best_block: BlockNumber, hash: &H256) -> Option<PendingTransaction>;
 
+	/// Removes transaction from the queue.
+	/// NOTE: The transaction is not removed from pending block if mining.
+	fn remove_pending_transaction(&self, chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction>;
+
 	/// Get a list of all pending transactions in the queue.
 	fn pending_transactions(&self) -> Vec<PendingTransaction>;
 

ipc/hypervisor/Cargo.toml

@@ -9,7 +9,7 @@ build = "build.rs"
 
 [dependencies]
 ethcore-ipc = { path = "../rpc" }
-nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-ipc-nano = { path = "../nano" }
 semver = "0.5"
 log = "0.3"

ipc/nano/Cargo.toml

@@ -8,6 +8,6 @@ license = "GPL-3.0"
 
 [dependencies]
 ethcore-ipc = { path = "../rpc" }
-nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 log = "0.3"
 lazy_static = "0.2"

ipc/rpc/Cargo.toml

@@ -8,6 +8,6 @@ license = "GPL-3.0"
 
 [dependencies]
 ethcore-devtools = { path = "../../devtools" }
-nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-util = { path = "../../util" }
 semver = "0.5"

ipc/tests/Cargo.toml

@@ -11,7 +11,7 @@ path = "run.rs"
 ethcore-ipc = { path = "../rpc" }
 ethcore-devtools = { path = "../../devtools" }
 semver = "0.5"
-nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git" }
+nanomsg = { git = "https://github.com/ethcore/nanomsg.rs.git", branch = "parity-1.7" }
 ethcore-ipc-nano = { path = "../nano" }
 ethcore-util = { path = "../../util" }
 log = "0.3"

js/src/api/rpc/parity/parity.js

@@ -395,6 +395,11 @@ export default class Parity {
       .execute('parity_removeReservedPeer', encode);
   }
 
+  removeTransaction (transactionId) {
+    return this._transport
+      .execute('parity_removeTransaction', inHex(transactionId));
+  }
+
   rpcSettings () {
     return this._transport
       .execute('parity_rpcSettings');

js/src/jsonrpc/interfaces/parity.js

@@ -643,6 +643,23 @@ export default {
     }
   },
 
+  removeTransaction: {
+    section: SECTION_ACCOUNTS,
+    desc: 'Cancel a pending transaction',
+    params: [
+      {
+        type: Data,
+        desc: 'transactionId, 32-byte hex',
+        example: '0x1db2c0cf57505d0f4a3d589414f0a0025ca97421d2cd596a9486bc7e2cd2bf8b'
+      }
+    ],
+    returns: {
+      type: Boolean,
+      desc: 'returns `true` if the upgrade to the new release was successfully executed, `false` if not.',
+      example: true
+    }
+  },
+
   registryAddress: {
     section: SECTION_NET,
     desc: 'The address for the global registry.',

js/src/ui/MethodDecoding/methodDecoding.js

@@ -178,14 +178,16 @@ class MethodDecoding extends Component {
       );
 
       return (
-        <FormattedMessage
-          id='ui.methodDecoding.condition.block'
-          defaultMessage=', {historic, select, true {Submitted} false {Submission}} at block {blockNumber}'
-          values={ {
-            historic,
-            blockNumber
-          } }
-        />
+        <div>
+          <FormattedMessage
+            id='ui.methodDecoding.condition.block'
+            defaultMessage=', {historic, select, true {Submitted} false {Submission}} at block {blockNumber}'
+            values={ {
+              historic,
+              blockNumber
+            } }
+          />
+        </div>
       );
     }
 
@@ -197,14 +199,16 @@ class MethodDecoding extends Component {
       );
 
       return (
-        <FormattedMessage
-          id='ui.methodDecoding.condition.time'
-          defaultMessage=', {historic, select, true {Submitted} false {Submission}} at {timestamp}'
-          values={ {
-            historic,
-            timestamp
-          } }
-        />
+        <div>
+          <FormattedMessage
+            id='ui.methodDecoding.condition.time'
+            defaultMessage='{historic, select, true {Will be submitted} false {To be submitted}} {timestamp}'
+            values={ {
+              historic,
+              timestamp
+            } }
+          />
+        </div>
       );
     }
 
@@ -493,7 +497,7 @@ class MethodDecoding extends Component {
         <div className={ styles.description }>
           <FormattedMessage
             id='ui.methodDecoding.signature.info'
-            defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}'
+            defaultMessage='{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} transferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}'
             values={ {
               historic,
               method,

js/src/ui/TxList/TxRow/txRow.js

@@ -48,6 +48,11 @@ class TxRow extends Component {
     historic: true
   };
 
+  state = {
+    isCancelOpen: false,
+    canceled: false
+  };
+
   render () {
     const { address, className, historic, netVersion, tx } = this.props;
 
@@ -137,11 +142,46 @@ class TxRow extends Component {
     return (
       <td className={ styles.timestamp }>
         <div>{ blockNumber && block ? moment(block.timestamp).fromNow() : null }</div>
-        <div>{ blockNumber ? _blockNumber.toFormat() : 'Pending' }</div>
+        <div>{ blockNumber ? _blockNumber.toFormat() : this.renderCancelToggle() }</div>
       </td>
     );
   }
 
+  renderCancelToggle () {
+    const { isCancelOpen, canceled } = this.state;
+    const { parity } = this.context.api;
+    const { hash } = this.props.tx;
+
+    if (canceled) {
+      return (
+        <div className={ styles.pending }>CANCELED</div>
+      );
+    }
+
+    if (!isCancelOpen) {
+      return (
+        <div className={ styles.pending }>
+          <div>SCHEDULED</div>
+          <a
+            className={ styles.cancel }
+            onClick={ () => this.setState({ isCancelOpen: true }) }
+          >
+            CANCEL
+          </a>
+        </div>
+      );
+    }
+
+    return (
+      <div className={ styles.pending }>
+        <div>ARE YOU SURE?</div>
+        <a onClick={ () => this.cancelTransaction(parity, hash) }>Cancel</a>
+        <span> | </span>
+        <a onClick={ () => this.setState({ isCancelOpen: false }) }>Nevermind</a>
+      </div>
+    );
+  }
+
   getIsKnownContract (address) {
     const { contractAddresses } = this.props;
 
@@ -165,6 +205,11 @@ class TxRow extends Component {
 
     return `/addresses/${address}`;
   }
+
+  cancelTransaction (parity, hash) {
+    parity.removeTransaction(hash);
+    this.setState({ canceled: true });
+  }
 }
 
 function mapStateToProps (initState) {

js/src/ui/TxList/txList.css

@@ -42,10 +42,11 @@
     }
 
     &.timestamp {
-      padding-top: 1.5em;
-      text-align: right;
+      max-width: 5em;
+      padding-top: 2.25em;
+      text-align: center;
       line-height: 1.5em;
-      opacity: 0.5;
+      color: grey;
     }
 
     &.transaction {
@@ -83,4 +84,12 @@
   .left {
     text-align: left;
   }
+
+  .pending {
+    padding: 0em;
+  }
+
+  .pending div {
+    padding-bottom: 1.5em;
+  }
 }

js/src/views/Signer/containers/RequestsPage/requestsPage.js

@@ -100,7 +100,7 @@ class RequestsPage extends Component {
           <div className={ styles.noRequestsMsg }>
             <FormattedMessage
               id='signer.requestsPage.noPending'
-              defaultMessage='There are no requests requiring your confirmation.'
+              defaultMessage='There are no transactions or requests requiring your confirmation.'
             />
           </div>
         </Container>
@@ -114,7 +114,7 @@ class RequestsPage extends Component {
         title={
           <FormattedMessage
             id='signer.requestsPage.pendingTitle'
-            defaultMessage='Pending Requests'
+            defaultMessage='Pending Transactions'
           />
         }
       >

npm-debug.log

@@ -0,0 +1,24 @@
+0 info it worked if it ends with ok
+1 verbose cli [ '/usr/local/Cellar/node/6.1.0/bin/node',
+1 verbose cli   '/usr/local/bin/npm',
+1 verbose cli   'run',
+1 verbose cli   'precommit' ]
+2 info using npm@3.10.7
+3 info using node@v6.1.0
+4 verbose config Skipping project config: /Users/connor/.npmrc. (matches userconfig)
+5 verbose stack Error: ENOENT: no such file or directory, open '/Users/connor/package.json'
+5 verbose stack     at Error (native)
+6 verbose cwd /Users/connor/Desktop/Parity/parity
+7 error Darwin 16.4.0
+8 error argv "/usr/local/Cellar/node/6.1.0/bin/node" "/usr/local/bin/npm" "run" "precommit"
+9 error node v6.1.0
+10 error npm  v3.10.7
+11 error path /Users/connor/package.json
+12 error code ENOENT
+13 error errno -2
+14 error syscall open
+15 error enoent ENOENT: no such file or directory, open '/Users/connor/package.json'
+16 error enoent ENOENT: no such file or directory, open '/Users/connor/package.json'
+16 error enoent This is most likely not a problem with npm itself
+16 error enoent and is related to npm not being able to find a file.
+17 verbose exit [ -2, true ]

rpc/src/v1/impls/light/parity_set.rs

@@ -28,7 +28,7 @@ use util::sha3;
 use jsonrpc_core::Error;
 use v1::helpers::errors;
 use v1::traits::ParitySet;
-use v1::types::{Bytes, H160, H256, U256, ReleaseInfo};
+use v1::types::{Bytes, H160, H256, U256, ReleaseInfo, Transaction};
 
 /// Parity-specific rpc interface for operations altering the settings.
 pub struct ParitySetClient<F> {
@@ -139,4 +139,8 @@ impl<F: Fetch> ParitySet for ParitySetClient<F> {
 	fn execute_upgrade(&self) -> Result<bool, Error> {
 		Err(errors::light_unimplemented(None))
 	}
+
+	fn remove_transaction(&self, _hash: H256) -> Result<Option<Transaction>, Error> {
+		Err(errors::light_unimplemented(None))
+	}
 }

rpc/src/v1/impls/parity_set.rs

@@ -30,28 +30,18 @@ use updater::{Service as UpdateService};
 use jsonrpc_core::Error;
 use v1::helpers::errors;
 use v1::traits::ParitySet;
-use v1::types::{Bytes, H160, H256, U256, ReleaseInfo};
+use v1::types::{Bytes, H160, H256, U256, ReleaseInfo, Transaction};
 
 /// Parity-specific rpc interface for operations altering the settings.
-pub struct ParitySetClient<C, M, U, F=fetch::Client> where
-	C: MiningBlockChainClient,
-	M: MinerService,
-	U: UpdateService,
-	F: Fetch,
-{
+pub struct ParitySetClient<C, M, U, F = fetch::Client> {
 	client: Weak<C>,
 	miner: Weak<M>,
 	updater: Weak<U>,
 	net: Weak<ManageNetwork>,
 	fetch: F,
 }
 
-impl<C, M, U, F> ParitySetClient<C, M, U, F> where
-	C: MiningBlockChainClient,
-	M: MinerService,
-	U: UpdateService,
-	F: Fetch,
-{
+impl<C, M, U, F> ParitySetClient<C, M, U, F> {
 	/// Creates new `ParitySetClient` with given `Fetch`.
 	pub fn new(client: &Arc<C>, miner: &Arc<M>, updater: &Arc<U>, net: &Arc<ManageNetwork>, fetch: F) -> Self {
 		ParitySetClient {
@@ -181,4 +171,12 @@ impl<C, M, U, F> ParitySet for ParitySetClient<C, M, U, F> where
 		let updater = take_weak!(self.updater);
 		Ok(updater.execute_upgrade())
 	}
+
+	fn remove_transaction(&self, hash: H256) -> Result<Option<Transaction>, Error> {
+		let miner = take_weak!(self.miner);
+		let client = take_weak!(self.client);
+		let hash = hash.into();
+
+		Ok(miner.remove_pending_transaction(&*client, &hash).map(Into::into))
+	}
 }

rpc/src/v1/tests/helpers/miner_service.rs

@@ -221,6 +221,10 @@ impl MinerService for TestMinerService {
 		self.pending_transactions.lock().get(hash).cloned().map(Into::into)
 	}
 
+	fn remove_pending_transaction(&self, _chain: &MiningBlockChainClient, hash: &H256) -> Option<PendingTransaction> {
+		self.pending_transactions.lock().remove(hash).map(Into::into)
+	}
+
 	fn pending_transactions(&self) -> Vec<PendingTransaction> {
 		self.pending_transactions.lock().values().cloned().map(Into::into).collect()
 	}