lukechilds
/
ethminer
mirror of https://github.com/lukechilds/ethminer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Basics of new string-based JS-API data passing.

cl-refactor
Gav Wood 11 years ago
parent
68fc84de91
commit
250ed6ab89
3 changed files with 95 additions and 21 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libethcore/FixedHash.h
  2. 42
      libqethereum/QEthereum.cpp
  3. 72
      libqethereum/QEthereum.h

2
libethcore/FixedHash.h
View File

@ -36,10 +36,10 @@ namespace eth
template <unsigned N> template <unsigned N>
class FixedHash class FixedHash
{ {
public:
/// The corresponding arithmetic type. /// The corresponding arithmetic type.
using Arith = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>; using Arith = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
public:
/// The size of the container. /// The size of the container.
enum { size = N }; enum { size = N };

42
libqethereum/QEthereum.cpp
View File

@ -183,6 +183,33 @@ void QmlEthereum::transact(Secret _secret, Address _dest, u256 _amount, u256 _ga
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
eth::bytes toBytes(QString const& _s)
{
if (_s.startsWith("0x"))
// Hex
return eth::fromHex(_s.mid(2).toStdString());
else if (!_s.contains(QRegExp("[^0-9]")))
{
// Decimal
eth::bytes ret;
eth::toBigEndian(eth::bigint(_s.toStdString()), ret);
return ret;
}
else
// Binary
return eth::asBytes(_s.toStdString());
}
QString padded(QString const& _s, unsigned _l, unsigned _r)
{
eth::bytes b = toBytes(_s);
while (b.size() < _l)
b.insert(b.begin(), 0);
while (b.size() < _r)
b.push_back(0);
b.resize(_r);
return QString::fromStdString(eth::asString(b));
}
QEthereum::QEthereum(QObject* _p, Client* _c, QList<eth::KeyPair> _accounts): QObject(_p), m_client(_c), m_accounts(_accounts) QEthereum::QEthereum(QObject* _p, Client* _c, QList<eth::KeyPair> _accounts): QObject(_p), m_client(_c), m_accounts(_accounts)
{ {
@ -201,11 +228,16 @@ void QEthereum::setup(QWebFrame* _e)
_e->addToJavaScriptWindowObject("u256", new U256Helper, QWebFrame::ScriptOwnership); _e->addToJavaScriptWindowObject("u256", new U256Helper, QWebFrame::ScriptOwnership);
_e->addToJavaScriptWindowObject("key", new KeyHelper, QWebFrame::ScriptOwnership); _e->addToJavaScriptWindowObject("key", new KeyHelper, QWebFrame::ScriptOwnership);
_e->addToJavaScriptWindowObject("bytes", new BytesHelper, QWebFrame::ScriptOwnership); _e->addToJavaScriptWindowObject("bytes", new BytesHelper, QWebFrame::ScriptOwnership);
// _e->evaluateJavaScript("xeth = new Object({\"callback\": function(f) { eth.testcallback.connect(f) }})"); _e->evaluateJavaScript("eth.newBlock = function(f) { eth.changed.connect(f) }");
_e->evaluateJavaScript("eth.onChanged = function(f) { eth.changed.connect(f) }"); _e->evaluateJavaScript("eth.watch = function(a, s, f) { eth.changed.connect(f ? f : s) }");
_e->evaluateJavaScript("eth.create = function(s, v, c, g, p, f) { eth.doCreate(s, v, c, g, p); if (f) f() }");
_e->evaluateJavaScript("eth.transact = function(s, v, t, d, g, p, f) { eth.doTransact(s, v, t, d, g, p); if (f) f() }");
_e->evaluateJavaScript("String.prototype.pad = function(l, r) { return eth.pad(this, l, r) }");
_e->evaluateJavaScript("String.prototype.bin = function(l) { return eth.toBinary(this) }");
_e->evaluateJavaScript("String.prototype.unbin = function(l) { return eth.fromBinary(this) }");
} }
void QEthereum::teardown(QWebFrame* _e) void QEthereum::teardown(QWebFrame*)
{ {
} }
@ -324,12 +356,12 @@ unsigned QEthereum::peerCount() const
return (unsigned)client()->peerCount(); return (unsigned)client()->peerCount();
} }
QVariant QEthereum::create(QVariant _secret, QVariant _amount, QByteArray _init, QVariant _gas, QVariant _gasPrice) QVariant QEthereum::doCreate(QVariant _secret, QVariant _amount, QByteArray _init, QVariant _gas, QVariant _gasPrice)
{ {
return toQJS(client()->transact(to<Secret>(_secret), to<u256>(_amount), bytes(_init.data(), _init.data() + _init.size()), to<u256>(_gas), to<u256>(_gasPrice))); return toQJS(client()->transact(to<Secret>(_secret), to<u256>(_amount), bytes(_init.data(), _init.data() + _init.size()), to<u256>(_gas), to<u256>(_gasPrice)));
} }
void QEthereum::transact(QVariant _secret, QVariant _amount, QVariant _dest, QByteArray _data, QVariant _gas, QVariant _gasPrice) void QEthereum::doTransact(QVariant _secret, QVariant _amount, QVariant _dest, QByteArray _data, QVariant _gas, QVariant _gasPrice)
{ {
client()->transact(to<Secret>(_secret), to<u256>(_amount), to<Address>(_dest), bytes(_data.data(), _data.data() + _data.size()), to<u256>(_gas), to<u256>(_gasPrice)); client()->transact(to<Secret>(_secret), to<u256>(_amount), to<Address>(_dest), bytes(_data.data(), _data.data() + _data.size()), to<u256>(_gas), to<u256>(_gasPrice));
} }

72
libqethereum/QEthereum.h
View File

@ -283,6 +283,42 @@ public:
} }
}; };
eth::bytes toBytes(QString const& _s);
QString padded(QString const& _s, unsigned _l, unsigned _r);
template <class H> H toFixed(QString const& _s)
{
if (_s.startsWith("0x"))
// Hex
return H(_s.mid(2));
else if (!_s.contains(QRegExp("[^0-9]")))
// Decimal
return (typename H::Arith)(_s);
else
// Binary
return H(toBytes(_s));
}
template <class I> I toInt(QString const& _s)
{
if (_s.startsWith("0x") || !_s.contains(QRegExp("[^0-9]")))
// Hex or Decimal
return (I)eth::bigint(_s);
else
// Binary
return eth::fromBigEndian<I>(toBytes(_s));
}
inline QString toBinary(QString const& _s)
{
return QString::fromStdString(eth::asString(toBytes(_s)));
}
inline QString fromBinary(QString const& _s)
{
return QString::fromStdString("0x" + eth::toHex(eth::asBytes(_s.toStdString())));
}
class QEthereum: public QObject class QEthereum: public QObject
{ {
Q_OBJECT Q_OBJECT
@ -296,32 +332,35 @@ public:
void setup(QWebFrame* _e); void setup(QWebFrame* _e);
void teardown(QWebFrame* _e); void teardown(QWebFrame* _e);
Q_INVOKABLE QString pad(QString _s, unsigned _l, unsigned _r) const { return padded(_s, _l, _r); }
Q_INVOKABLE QString toBinary(QString _s) const { return ::toBinary(_s); }
Q_INVOKABLE QString fromBinary(QString _s) const { return ::fromBinary(_s); }
Q_INVOKABLE QVariant/*eth::Address*/ coinbase() const; Q_INVOKABLE QVariant/*eth::Address*/ coinbase() const;
Q_INVOKABLE bool isListening() const; bool isListening() const;
Q_INVOKABLE bool isMining() const; bool isMining() const;
Q_INVOKABLE QVariant/*eth::u256*/ balanceAt(QVariant/*eth::Address*/ _a) const; Q_INVOKABLE QVariant/*eth::u256*/ balanceAt(QVariant/*eth::Address*/ _a) const;
Q_INVOKABLE QVariant/*eth::u256*/ storageAt(QVariant/*eth::Address*/ _a, QVariant/*eth::u256*/ _p) const; Q_INVOKABLE QVariant/*eth::u256*/ storageAt(QVariant/*eth::Address*/ _a, QVariant/*eth::u256*/ _p) const;
Q_INVOKABLE double txCountAt(QVariant/*eth::Address*/ _a) const; Q_INVOKABLE double txCountAt(QVariant/*eth::Address*/ _a) const;
Q_INVOKABLE bool isContractAt(QVariant/*eth::Address*/ _a) const; Q_INVOKABLE bool isContractAt(QVariant/*eth::Address*/ _a) const;
Q_INVOKABLE QVariant gasPrice() const { return toQJS(10 * eth::szabo); } QVariant gasPrice() const { return toQJS(10 * eth::szabo); }
Q_INVOKABLE QString ethTest() const { return "Hello world!"; } Q_INVOKABLE QString ethTest() const { return "Hello world!"; }
Q_INVOKABLE void ethTest2() { changed(); }
Q_INVOKABLE QVariant/*eth::KeyPair*/ key() const; QVariant/*eth::KeyPair*/ key() const;
Q_INVOKABLE QList<QVariant/*eth::KeyPair*/> keys() const; QList<QVariant/*eth::KeyPair*/> keys() const;
Q_INVOKABLE QVariant/*eth::Address*/ account() const; QVariant/*eth::Address*/ account() const;
Q_INVOKABLE QList<QVariant/*eth::Address*/> accounts() const; QList<QVariant/*eth::Address*/> accounts() const;
Q_INVOKABLE unsigned peerCount() const; unsigned peerCount() const;
Q_INVOKABLE QEthereum* self() { return this; } Q_INVOKABLE QEthereum* self() { return this; }
Q_INVOKABLE QVariant create(QVariant _secret, QVariant _amount, QByteArray _init, QVariant _gas, QVariant _gasPrice); Q_INVOKABLE QVariant doCreate(QVariant _secret, QVariant _amount, QByteArray _init, QVariant _gas, QVariant _gasPrice);
Q_INVOKABLE void transact(QVariant _secret, QVariant _amount, QVariant _dest, QByteArray _data, QVariant _gas, QVariant _gasPrice); Q_INVOKABLE void doTransact(QVariant _secret, QVariant _amount, QVariant _dest, QByteArray _data, QVariant _gas, QVariant _gasPrice);
eth::u256 balanceAt(eth::Address _a) const; eth::u256 balanceAt(eth::Address _a) const;
double txCountAt(eth::Address _a) const; double txCountAt(eth::Address _a) const;
@ -335,14 +374,17 @@ public slots:
signals: signals:
void changed(); void changed();
void testcallback();
// void netChanged(); // void netChanged();
// void miningChanged(); // void miningChanged();
private: private:
// Q_PROPERTY(QVariant coinbase READ coinbase WRITE setCoinbase NOTIFY changed) Q_PROPERTY(QVariant coinbase READ coinbase WRITE setCoinbase NOTIFY changed)
// Q_PROPERTY(bool listening READ isListening WRITE setListening) Q_PROPERTY(bool listening READ isListening WRITE setListening)
// Q_PROPERTY(bool mining READ isMining WRITE setMining) Q_PROPERTY(bool mining READ isMining WRITE setMining)
Q_PROPERTY(QVariant gasPrice READ gasPrice NOTIFY changed)
Q_PROPERTY(QVariant key READ key NOTIFY changed)
Q_PROPERTY(QVariant keys READ keys NOTIFY changed)
Q_PROPERTY(unsigned peerCount READ peerCount)
eth::Client* m_client; eth::Client* m_client;
QList<eth::KeyPair> m_accounts; QList<eth::KeyPair> m_accounts;

Write Preview
Loading…
Cancel
Save