Cleaned up interface to send/submit Transaction.

We take notice of manually-set nonce.

alethzero/OurWebThreeStubServer.cpp

@@ -130,7 +130,7 @@ void OurAccountHolder::doValidations()
 		else
 			// sign and submit.
 			if (Secret s = m_main->retrieveSecret(t.from))
-				m_main->ethereum()->submitTransaction(s, t);
+				m_main->ethereum()->submitTransaction(t, s);
 	}
 }
 

libethcore/Common.h

@@ -185,6 +185,7 @@ struct TransactionSkeleton
 	bytes data;
 	u256 gas = UndefinedU256;
 	u256 gasPrice = UndefinedU256;
+	u256 nonce = UndefinedU256;
 };
 
 void badBlock(bytesConstRef _header, std::string const& _err);

libethcore/Transaction.cpp

@@ -29,6 +29,20 @@ using namespace std;
 using namespace dev;
 using namespace dev::eth;
 
+TransactionBase::TransactionBase(TransactionSkeleton const& _ts, Secret const& _s):
+	m_type(_ts.creation ? ContractCreation : MessageCall),
+	m_nonce(_ts.nonce),
+	m_value(_ts.value),
+	m_receiveAddress(_ts.to),
+	m_gasPrice(_ts.gasPrice),
+	m_gas(_ts.gas),
+	m_data(_ts.data),
+	m_sender(_ts.from)
+{
+	if (_s)
+		sign(_s);
+}
+
 TransactionBase::TransactionBase(bytesConstRef _rlpData, CheckTransaction _checkSig)
 {
 	int field = 0;

libethcore/Transaction.h

@@ -51,6 +51,9 @@ public:
 	/// Constructs a null transaction.
 	TransactionBase() {}
 
+	/// Constructs a transaction from a transaction skeleton & optional secret.
+	TransactionBase(TransactionSkeleton const& _ts, Secret const& _s = Secret());
+
 	/// Constructs a signed message-call transaction.
 	TransactionBase(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce, Secret const& _secret): m_type(MessageCall), m_nonce(_nonce), m_value(_value), m_receiveAddress(_dest), m_gasPrice(_gasPrice), m_gas(_gas), m_data(_data) { sign(_secret); }
 
@@ -69,7 +72,6 @@ public:
 	/// Constructs a transaction from the given RLP.
 	explicit TransactionBase(bytes const& _rlp, CheckTransaction _checkSig): TransactionBase(&_rlp, _checkSig) {}
 
-
 	/// Checks equality of transactions.
 	bool operator==(TransactionBase const& _c) const { return m_type == _c.m_type && (m_type == ContractCreation || m_receiveAddress == _c.m_receiveAddress) && m_value == _c.m_value && m_data == _c.m_data; }
 	/// Checks inequality of transactions.

libethereum/Client.h

@@ -313,7 +313,7 @@ private:
 	Handler<> m_tqReady;
 	Handler<> m_bqReady;
 
-	bool m_wouldMine = false;					///< True if we /should/ be mining.
+	bool m_wouldMine = false;				///< True if we /should/ be mining.
 	bool m_turboMining = false;				///< Don't squander all of our time mining actually just sleeping.
 	bool m_forceMining = false;				///< Mine even when there are no transactions pending?
 	bool m_mineOnBadChain = false;			///< Mine even when the canary says it's a bad chain.

libethereum/ClientBase.cpp

@@ -45,48 +45,21 @@ State ClientBase::asOf(BlockNumber _h) const
 	return asOf(bc().numberHash(_h));
 }
 
-void ClientBase::submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, u256 _nonce)
-{
-	prepareForTransaction();
-
-	Transaction t(_value, _gasPrice, _gas, _dest, _data, _nonce, _secret);
-	m_tq.import(t.rlp());
-
-	StructuredLogger::transactionReceived(t.sha3().abridged(), t.sender().abridged());
-	cnote << "New transaction " << t;
-}
-
-Address ClientBase::submitTransaction(Secret _secret, u256 _value, bytes const& _data, u256 _gas, u256 _gasPrice, u256 _nonce)
-{
-	prepareForTransaction();
-
-	Transaction t(_value, _gasPrice, _gas, _data, _nonce, _secret);
-	m_tq.import(t.rlp());
-
-	StructuredLogger::transactionReceived(t.sha3().abridged(), t.sender().abridged());
-	cnote << "New transaction " << t;
-
-	return right160(sha3(rlpList(t.sender(), t.nonce())));
-}
-
-void ClientBase::submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice)
-{
-	auto a = toAddress(_secret);
-	submitTransaction(_secret, _value, _dest, _data, _gas, _gasPrice, max<u256>(postMine().transactionsFrom(a), m_tq.maxNonce(a)));
-}
-
-Address ClientBase::submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice)
+Address ClientBase::submitTransaction(TransactionSkeleton const& _t, Secret const& _secret)
 {
 	prepareForTransaction();
 	
-	u256 n = postMine().transactionsFrom(toAddress(_secret));
-	Transaction t(_endowment, _gasPrice, _gas, _init, n, _secret);
-	m_tq.import(t.rlp());
+	TransactionSkeleton ts(_t);
+	ts.from = toAddress(_secret);
+	if (_t.nonce == UndefinedU256)
+		ts.nonce = max<u256>(postMine().transactionsFrom(ts.from), m_tq.maxNonce(ts.from));
 
+	Transaction t(ts, _secret);
+	m_tq.import(t.rlp());
 	StructuredLogger::transactionReceived(t.sha3().abridged(), t.sender().abridged());
 	cnote << "New transaction " << t;
 	
-	return right160(sha3(rlpList(t.sender(), t.nonce())));
+	return _t.creation ? right160(sha3(rlpList(ts.from, ts.nonce))) : Address();
 }
 
 // TODO: remove try/catch, allow exceptions

libethereum/ClientBase.h

@@ -75,14 +75,9 @@ public:
 	ClientBase() {}
 	virtual ~ClientBase() {}
 
-	/// Submits the given message-call transaction.
-	virtual void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, u256 _nonce);
-	virtual void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo) override;
-
-	/// Submits a new contract-creation transaction.
+	/// Submits the given transaction.
 	/// @returns the new contract's address (assuming it all goes through).
-	virtual Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice, u256 _nonce);
-	virtual Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas = 10000, u256 _gasPrice = 10 * szabo) override;
+	virtual Address submitTransaction(TransactionSkeleton const& _t, Secret const& _secret) override;
 	using Interface::submitTransaction;
 
 	/// Makes the given call. Nothing is recorded into the state.

libethereum/Interface.cpp

@@ -20,6 +20,31 @@
  */
 
 #include "Interface.h"
+using namespace std;
+using namespace dev;
+using namespace eth;
 
-#pragma GCC diagnostic ignored "-Wunused-variable"
-namespace { char dummy; }
+void Interface::submitTransaction(Secret const& _secret, u256 const& _value, Address const& _dest, bytes const& _data, u256 const& _gas, u256 const& _gasPrice, u256 const& _nonce)
+{
+	TransactionSkeleton ts;
+	ts.creation = false;
+	ts.value = _value;
+	ts.to = _dest;
+	ts.data = _data;
+	ts.gas = _gas;
+	ts.gasPrice = _gasPrice;
+	ts.nonce = _nonce;
+	submitTransaction(ts, _secret);
+}
+
+Address Interface::submitTransaction(Secret const& _secret, u256 const& _endowment, bytes const& _init, u256 const& _gas, u256 const& _gasPrice, u256 const& _nonce)
+{
+	TransactionSkeleton ts;
+	ts.creation = true;
+	ts.value = _endowment;
+	ts.data = _init;
+	ts.gas = _gas;
+	ts.gasPrice = _gasPrice;
+	ts.nonce = _nonce;
+	return submitTransaction(ts, _secret);
+}

libethereum/Interface.h

@@ -65,16 +65,16 @@ public:
 
 	// [TRANSACTION API]
 
-	/// Submits the given message-call transaction.
-	virtual void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * szabo) = 0;
+	/// Submits a new transaction.
+	/// @returns the new contract's address (assuming it all goes through and it's contract creation).
+	virtual Address submitTransaction(TransactionSkeleton const& _t, Secret const& _secret) = 0;
 
-	/// Submits a new contract-creation transaction.
-	/// @returns the new contract's address (assuming it all goes through).
-	virtual Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas = 10000, u256 _gasPrice = 10 * szabo) = 0;
+	/// Submits the given message-call transaction.
+	void submitTransaction(Secret const& _secret, u256 const& _value, Address const& _dest, bytes const& _data = bytes(), u256 const& _gas = 10000, u256 const& _gasPrice = 10 * szabo, u256 const& _nonce = UndefinedU256);
 
 	/// Submits a new contract-creation transaction.
 	/// @returns the new contract's address (assuming it all goes through).
-	Address submitTransaction(Secret const& _secret, TransactionSkeleton const& _t) { if (_t.creation) return submitTransaction(_secret, _t.value, _t.data, _t.gas, _t.gasPrice); submitTransaction(_secret, _t.value, _t.to, _t.data, _t.gas, _t.gasPrice); return Address(); }
+	Address submitTransaction(Secret const& _secret, u256 const& _endowment, bytes const& _init, u256 const& _gas = 10000, u256 const& _gasPrice = 10 * szabo, u256 const& _nonce = UndefinedU256);
 
 	/// Blocks until all pending transactions have been processed.
 	virtual void flushTransactions() = 0;

libethereum/Transaction.h

@@ -85,6 +85,9 @@ public:
 	/// Constructs a null transaction.
 	Transaction() {}
 
+	/// Constructs from a transaction skeleton & optional secret.
+	Transaction(TransactionSkeleton const& _ts, Secret const& _s = Secret()): TransactionBase(_ts, _s) {}
+
 	/// Constructs a signed message-call transaction.
 	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce, Secret const& _secret):
 		TransactionBase(_value, _gasPrice, _gas, _dest, _data, _nonce, _secret)
@@ -96,12 +99,12 @@ public:
 	{}
 
 	/// Constructs an unsigned message-call transaction.
-	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce = 0):
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, Address const& _dest, bytes const& _data, u256 const& _nonce = UndefinedU256):
 		TransactionBase(_value, _gasPrice, _gas, _dest, _data, _nonce)
 	{}
 
 	/// Constructs an unsigned contract-creation transaction.
-	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, bytes const& _data, u256 const& _nonce = 0):
+	Transaction(u256 const& _value, u256 const& _gasPrice, u256 const& _gas, bytes const& _data, u256 const& _nonce = UndefinedU256):
 		TransactionBase(_value, _gasPrice, _gas, _data, _nonce)
 	{}
 

libweb3jsonrpc/AccountHolder.cpp

@@ -109,7 +109,7 @@ AddressHash SimpleAccountHolder::realAccounts() const
 void SimpleAccountHolder::authenticate(dev::eth::TransactionSkeleton const& _t)
 {
 	if (isRealAccount(_t.from))
-		m_client()->submitTransaction(m_keyManager.secret(_t.from, [&](){ return m_getPassword(_t.from); }), _t);
+		m_client()->submitTransaction(_t, m_keyManager.secret(_t.from, [&](){ return m_getPassword(_t.from); }));
 	else if (isProxyAccount(_t.from))
 		queueTransaction(_t);
 }
@@ -117,7 +117,7 @@ void SimpleAccountHolder::authenticate(dev::eth::TransactionSkeleton const& _t)
 void FixedAccountHolder::authenticate(dev::eth::TransactionSkeleton const& _t)
 {
 	if (isRealAccount(_t.from))
-		m_client()->submitTransaction(m_accounts[_t.from], _t);
+		m_client()->submitTransaction(_t, m_accounts[_t.from]);
 	else if (isProxyAccount(_t.from))
 		queueTransaction(_t);
 }

libweb3jsonrpc/JsonHelper.cpp

@@ -269,6 +269,9 @@ TransactionSkeleton toTransactionSkeleton(Json::Value const& _json)
 
 	if (!_json["code"].empty())
 		ret.data = jsToBytes(_json["code"].asString());
+
+	if (!_json["nonce"].empty())
+		ret.nonce = jsToU256(_json["nonce"].asString());
 	return ret;
 }
 

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -248,7 +248,7 @@ string WebThreeStubServerBase::eth_sendTransaction(Json::Value const& _json)
 		if (!t.from)
 			t.from = m_ethAccounts->defaultTransactAccount();
 		if (t.creation)
-			ret = toJS(right160(sha3(rlpList(t.from, client()->countAt(t.from)))));;
+			ret = toJS(right160(sha3(rlpList(t.from, client()->countAt(t.from)))));
 		if (t.gasPrice == UndefinedU256)
 			t.gasPrice = 10 * dev::eth::szabo;		// TODO: should be determined by user somehow.
 		if (t.gas == UndefinedU256)

mix/MixClient.cpp

@@ -303,22 +303,14 @@ State MixClient::asOf(h256 const& _block) const
 	return ret;
 }
 
-void MixClient::submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, bool _gasAuto)
+Address MixClient::submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret, bool _gasAuto)
 {
 	WriteGuard l(x_state);
-	u256 n = m_state.transactionsFrom(toAddress(_secret));
-	Transaction t(_value, _gasPrice, _gas, _dest, _data, n, _secret);
+	TransactionSkeleton ts = _ts;
+	ts.nonce = m_state.transactionsFrom(toAddress(_secret));
+	eth::Transaction t(ts, _secret);
 	executeTransaction(t, m_state, false, _gasAuto, _secret);
-}
-
-Address MixClient::submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice, bool _gasAuto)
-{
-	WriteGuard l(x_state);
-	u256 n = m_state.transactionsFrom(toAddress(_secret));
-	eth::Transaction t(_endowment, _gasPrice, _gas, _init, n, _secret);
-	executeTransaction(t, m_state, false, _gasAuto, _secret);
-	Address address = right160(sha3(rlpList(t.sender(), t.nonce())));
-	return address;
+	return _ts.creation ? right160(sha3(rlpList(ts.to, ts.nonce))) : Address();
 }
 
 dev::eth::ExecutionResult MixClient::call(Address const& _from, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, BlockNumber _blockNumber, bool _gasAuto, FudgeFactor _ff)
@@ -335,16 +327,6 @@ dev::eth::ExecutionResult MixClient::call(Address const& _from, u256 _value, Add
 	return lastExecution().result;
 }
 
-void MixClient::submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice)
-{
-	submitTransaction(_secret, _value, _dest, _data, _gas, _gasPrice, false);
-}
-
-Address MixClient::submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice)
-{
-	return submitTransaction(_secret, _endowment, _init, _gas, _gasPrice, false);
-}
-
 dev::eth::ExecutionResult MixClient::call(Address const& _from, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, BlockNumber _blockNumber, eth::FudgeFactor _ff)
 {
 	return call(_from, _value, _dest, _data, _gas, _gasPrice, _blockNumber, false, _ff);

mix/MixClient.h

@@ -54,14 +54,12 @@ public:
 	ExecutionResult lastExecution() const;
 	ExecutionResult execution(unsigned _index) const;
 
-	void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice) override;
-	Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice) override;
 	dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber = eth::PendingBlock, eth::FudgeFactor _ff = eth::FudgeFactor::Strict) override;
 	dev::eth::ExecutionResult create(Address const& _secret, u256 _value, bytes const& _data = bytes(), u256 _gas = 10000, u256 _gasPrice = 10 * eth::szabo, eth::BlockNumber _blockNumber = eth::PendingBlock, eth::FudgeFactor _ff = eth::FudgeFactor::Strict) override;
 
 	using ClientBase::submitTransaction;
-	void submitTransaction(Secret _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, bool _gasAuto);
-	Address submitTransaction(Secret _secret, u256 _endowment, bytes const& _init, u256 _gas, u256 _gasPrice, bool _gasAuto);
+	virtual Address submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret) override { return submitTransaction(_ts, _secret, false); }
+	Address submitTransaction(eth::TransactionSkeleton const& _ts, Secret const& _secret, bool _gasAuto);
 	dev::eth::ExecutionResult call(Address const& _secret, u256 _value, Address _dest, bytes const& _data, u256 _gas, u256 _gasPrice, eth::BlockNumber _blockNumber, bool _gasAuto, eth::FudgeFactor _ff = eth::FudgeFactor::Strict);
 
 	void setAddress(Address _us) override;