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

std::pair instead of QString manipulation

cl-refactor
yann300 10 years ago
parent
30ca78aa0b
commit
9ea0bf5ab1
5 changed files with 67 additions and 50 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. 78
      mix/ClientModel.cpp
  2. 16
      mix/ClientModel.h
  3. 9
      mix/qml/StateListModel.qml
  4. 11
      mix/qml/TransactionDialog.qml
  5. 3
      mix/qml/js/TransactionHelper.js

78
mix/ClientModel.cpp
View File

@ -193,7 +193,7 @@ QVariantMap ClientModel::contractAddresses() const
{ {
QVariantMap res; QVariantMap res;
for (auto const& c: m_contractAddresses) for (auto const& c: m_contractAddresses)
res.insert(c.first, QString::fromStdString(toJS(c.second))); res.insert(c.first.first, QString::fromStdString(toJS(c.second)));
return res; return res;
} }
@ -257,6 +257,7 @@ void ClientModel::setupState(QVariantMap _state)
QString sender = transaction.value("sender").toString(); QString sender = transaction.value("sender").toString();
bool isStdContract = transaction.value("stdContract").toBool(); bool isStdContract = transaction.value("stdContract").toBool();
bool isContractCreation = transaction.value("isContractCreation").toBool(); bool isContractCreation = transaction.value("isContractCreation").toBool();
bool isFunctionCall = transaction.value("isFunctionCall").toBool();
if (isStdContract) if (isStdContract)
{ {
if (contractId.isEmpty()) //TODO: This is to support old project files, remove later if (contractId.isEmpty()) //TODO: This is to support old project files, remove later
@ -272,7 +273,7 @@ void ClientModel::setupState(QVariantMap _state)
{ {
if (contractId.isEmpty() && m_codeModel->hasContract()) //TODO: This is to support old project files, remove later if (contractId.isEmpty() && m_codeModel->hasContract()) //TODO: This is to support old project files, remove later
contractId = m_codeModel->contracts().keys()[0]; contractId = m_codeModel->contracts().keys()[0];
TransactionSettings transactionSettings(contractId, functionId, value, gas, gasAuto, gasPrice, Secret(sender.toStdString()), isContractCreation); TransactionSettings transactionSettings(contractId, functionId, value, gas, gasAuto, gasPrice, Secret(sender.toStdString()), isContractCreation, isFunctionCall);
transactionSettings.parameterValues = transaction.value("parameters").toMap(); transactionSettings.parameterValues = transaction.value("parameters").toMap();
if (contractId == functionId || functionId == "Constructor") if (contractId == functionId || functionId == "Constructor")
@ -308,9 +309,9 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
m_gasCosts.clear(); m_gasCosts.clear();
for (TransactionSettings const& transaction: _sequence) for (TransactionSettings const& transaction: _sequence)
{ {
QString contractName = resolveContractName(transaction.contractId); std::pair<QString, int> ctrInstance = resolvePair(transaction.contractId);
QString address = resolveToken(transaction.contractId, deployedContracts); QString address = resolveToken(ctrInstance, deployedContracts);
if (transaction.functionId == "(transfert)") if (transaction.isFunctionCall)
{ {
callAddress(Address(address.toStdString()), bytes(), transaction); callAddress(Address(address.toStdString()), bytes(), transaction);
onNewTransaction(); onNewTransaction();
@ -331,7 +332,7 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
else else
{ {
//encode data //encode data
CompiledContract const& compilerRes = m_codeModel->contract(contractName); CompiledContract const& compilerRes = m_codeModel->contract(ctrInstance.first);
QFunctionDefinition const* f = nullptr; QFunctionDefinition const* f = nullptr;
bytes contractCode = compilerRes.bytes(); bytes contractCode = compilerRes.bytes();
shared_ptr<QContractDefinition> contractDef = compilerRes.sharedContract(); shared_ptr<QContractDefinition> contractDef = compilerRes.sharedContract();
@ -358,29 +359,28 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
QSolidityType const* type = p->type(); QSolidityType const* type = p->type();
QVariant value = transaction.parameterValues.value(p->name()); QVariant value = transaction.parameterValues.value(p->name());
if (type->type().type == SolidityType::Type::Address) if (type->type().type == SolidityType::Type::Address)
value = QVariant(resolveToken(value.toString(), deployedContracts)); {
std::pair<QString, int> ctrParamInstance = resolvePair(value.toString());
value = QVariant(resolveToken(ctrParamInstance, deployedContracts));
}
encoder.encode(value, type->type()); encoder.encode(value, type->type());
} }
if (transaction.functionId.isEmpty() || transaction.functionId == contractName) if (transaction.functionId.isEmpty() || transaction.functionId == ctrInstance.first)
{ {
bytes param = encoder.encodedData(); bytes param = encoder.encodedData();
contractCode.insert(contractCode.end(), param.begin(), param.end()); contractCode.insert(contractCode.end(), param.begin(), param.end());
Address newAddress = deployContract(contractCode, transaction); Address newAddress = deployContract(contractCode, transaction);
deployedContracts.push_back(newAddress); deployedContracts.push_back(newAddress);
auto contractAddressIter = m_contractAddresses.find(transaction.contractId); std::pair<QString, int> contractToken = retrieveToken(transaction.contractId, deployedContracts);
if (contractAddressIter == m_contractAddresses.end() || newAddress != contractAddressIter->second) m_contractAddresses[contractToken] = newAddress;
{ m_contractNames[newAddress] = contractToken.first;
QString contractToken = retrieveToken(transaction.contractId, deployedContracts); contractAddressesChanged();
m_contractAddresses[contractToken] = newAddress;
m_contractNames[newAddress] = contractToken;
contractAddressesChanged();
}
gasCostsChanged(); gasCostsChanged();
} }
else else
{ {
auto contractAddressIter = m_contractAddresses.find(retrieveToken(transaction.contractId, deployedContracts)); auto contractAddressIter = m_contractAddresses.find(ctrInstance);
if (contractAddressIter == m_contractAddresses.end()) if (contractAddressIter == m_contractAddresses.end())
{ {
emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId); emit runFailed("Contract '" + transaction.contractId + tr(" not deployed.") + "' " + tr(" Cannot call ") + transaction.functionId);
@ -412,31 +412,35 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
}); });
} }
QString ClientModel::resolveToken(QString const& _value, vector<Address> const& _contracts)
std::pair<QString, int> ClientModel::resolvePair(QString const& _contractId)
{ {
QString ret = _value; std::pair<QString, int> ret;
if (_value.startsWith("<") && _value.endsWith(">")) ret.first = _contractId;
{ ret.second = -1;
QStringList nb = ret.remove("<").remove(">").split(" - "); if (_contractId.startsWith("<") && _contractId.endsWith(">"))
ret = QString::fromStdString("0x" + dev::toHex(_contracts.at(nb.back().toInt()).ref())); {
} QStringList values = ret.first.remove("<").remove(">").split(" - ");
return ret; ret.first = values[0];
ret.second = values[1].toUInt();
}
return ret;
} }
QString ClientModel::retrieveToken(QString const& _value, vector<Address> const& _contracts) QString ClientModel::resolveToken(std::pair<QString, int> const& _value, vector<Address> const& _contracts)
{ {
QString ret = _value; if (_value.second != -1)
if (!_value.startsWith("<") && !_value.endsWith(">")) return QString::fromStdString("0x" + dev::toHex(_contracts.at(_value.second).ref()));
return "<" + _value + " - " + QString::number(_contracts.size() - 1) + ">"; else
return ret; return _value.first;
} }
QString ClientModel::resolveContractName(QString const& _value) std::pair<QString, int> ClientModel::retrieveToken(QString const& _value, vector<Address> const& _contracts)
{ {
QString ret = _value; std::pair<QString, int> ret;
if (_value.startsWith("<") && _value.endsWith(">")) ret.first = _value;
ret = ret.remove("<").remove(">").split(" - ").first(); ret.second = _contracts.size() - 1;
return ret; return ret;
} }
void ClientModel::showDebugger() void ClientModel::showDebugger()
@ -462,7 +466,7 @@ void ClientModel::showDebuggerForTransaction(ExecutionResult const& _t)
//try to resolve contract for source level debugging //try to resolve contract for source level debugging
auto nameIter = m_contractNames.find(code.address); auto nameIter = m_contractNames.find(code.address);
CompiledContract const* compilerRes = nullptr; CompiledContract const* compilerRes = nullptr;
if (nameIter != m_contractNames.end() && (compilerRes = m_codeModel->tryGetContract(resolveContractName(nameIter->second)))) //returned object is guaranteed to live till the end of event handler in main thread if (nameIter != m_contractNames.end() && (compilerRes = m_codeModel->tryGetContract(nameIter->second))) //returned object is guaranteed to live till the end of event handler in main thread
{ {
eth::AssemblyItems assemblyItems = !_t.isConstructor() ? compilerRes->assemblyItems() : compilerRes->constructorAssemblyItems(); eth::AssemblyItems assemblyItems = !_t.isConstructor() ? compilerRes->assemblyItems() : compilerRes->constructorAssemblyItems();
codes.back()->setDocument(compilerRes->documentId()); codes.back()->setDocument(compilerRes->documentId());
@ -723,7 +727,7 @@ void ClientModel::onNewTransaction()
auto contractAddressIter = m_contractNames.find(contractAddress); auto contractAddressIter = m_contractNames.find(contractAddress);
if (contractAddressIter != m_contractNames.end()) if (contractAddressIter != m_contractNames.end())
{ {
CompiledContract const& compilerRes = m_codeModel->contract(resolveContractName(contractAddressIter->second)); CompiledContract const& compilerRes = m_codeModel->contract(contractAddressIter->second);
const QContractDefinition* def = compilerRes.contract(); const QContractDefinition* def = compilerRes.contract();
contract = def->name(); contract = def->name();
if (abi) if (abi)

16
mix/ClientModel.h
View File

@ -53,10 +53,10 @@ struct SolidityType;
struct TransactionSettings struct TransactionSettings
{ {
TransactionSettings() {} TransactionSettings() {}
TransactionSettings(QString const& _contractId, QString const& _functionId, u256 _value, u256 _gas, bool _gasAuto, u256 _gasPrice, Secret _sender, int _isContractCreation): TransactionSettings(QString const& _contractId, QString const& _functionId, u256 _value, u256 _gas, bool _gasAuto, u256 _gasPrice, Secret _sender, bool _isContractCreation, bool _isFunctionCall):
contractId(_contractId), functionId(_functionId), value(_value), gas(_gas), gasAuto(_gasAuto), gasPrice(_gasPrice), sender(_sender), isContractCreation(_isContractCreation) {} contractId(_contractId), functionId(_functionId), value(_value), gas(_gas), gasAuto(_gasAuto), gasPrice(_gasPrice), sender(_sender), isContractCreation(_isContractCreation), isFunctionCall(_isFunctionCall) {}
TransactionSettings(QString const& _stdContractName, QString const& _stdContractUrl): TransactionSettings(QString const& _stdContractName, QString const& _stdContractUrl):
contractId(_stdContractName), gasAuto(true), stdContractUrl(_stdContractUrl), isContractCreation(true) {} contractId(_stdContractName), gasAuto(true), stdContractUrl(_stdContractUrl), isContractCreation(true), isFunctionCall(false) {}
/// Contract name /// Contract name
QString contractId; QString contractId;
@ -78,6 +78,8 @@ struct TransactionSettings
Secret sender; Secret sender;
/// Tr deploys a contract /// Tr deploys a contract
bool isContractCreation; bool isContractCreation;
/// Tr call a ctr function
bool isFunctionCall;
}; };
@ -229,9 +231,9 @@ private:
void onStateReset(); void onStateReset();
void showDebuggerForTransaction(ExecutionResult const& _t); void showDebuggerForTransaction(ExecutionResult const& _t);
QVariant formatValue(SolidityType const& _type, dev::u256 const& _value); QVariant formatValue(SolidityType const& _type, dev::u256 const& _value);
QString resolveToken(QString const& _value, std::vector<Address> const& _contracts); QString resolveToken(std::pair<QString, int> const& _value, std::vector<Address> const& _contracts);
QString resolveContractName(QString const& _value); std::pair<QString, int> retrieveToken(QString const& _value, std::vector<Address> const& _contracts);
QString retrieveToken(QString const& _value, std::vector<Address> const& _contracts); std::pair<QString, int> resolvePair(QString const& _contractId);
QVariant formatStorageValue(SolidityType const& _type, std::unordered_map<dev::u256, dev::u256> const& _storage, unsigned _offset, dev::u256 const& _slot); QVariant formatStorageValue(SolidityType const& _type, std::unordered_map<dev::u256, dev::u256> const& _storage, unsigned _offset, dev::u256 const& _slot);
std::atomic<bool> m_running; std::atomic<bool> m_running;
@ -241,7 +243,7 @@ private:
std::unique_ptr<RpcConnector> m_rpcConnector; std::unique_ptr<RpcConnector> m_rpcConnector;
std::unique_ptr<Web3Server> m_web3Server; std::unique_ptr<Web3Server> m_web3Server;
QList<u256> m_gasCosts; QList<u256> m_gasCosts;
std::map<QString, Address> m_contractAddresses; std::map<std::pair<QString, int>, Address> m_contractAddresses;
std::map<Address, QString> m_contractNames; std::map<Address, QString> m_contractNames;
std::map<QString, Address> m_stdContractAddresses; std::map<QString, Address> m_stdContractAddresses;
std::map<Address, QString> m_stdContractNames; std::map<Address, QString> m_stdContractNames;

9
mix/qml/StateListModel.qml
View File

@ -58,9 +58,13 @@ Item {
parameters: {}, parameters: {},
sender: t.sender, sender: t.sender,
isContractCreation: t.isContractCreation, isContractCreation: t.isContractCreation,
label: t.label label: t.label,
isFunctionCall: t.isFunctionCall
}; };
if (r.isFunctionCall === undefined)
r.isFunctionCall = true;
if (!r.label) if (!r.label)
r.label = r.contractId + " - " + r.functionId; r.label = r.contractId + " - " + r.functionId;
@ -122,7 +126,8 @@ Item {
sender: t.sender, sender: t.sender,
parameters: {}, parameters: {},
isContractCreation: t.isContractCreation, isContractCreation: t.isContractCreation,
label: t.label label: t.label,
isFunctionCall: t.isFunctionCall
}; };
for (var key in t.parameters) for (var key in t.parameters)
r.parameters[key] = t.parameters[key]; r.parameters[key] = t.parameters[key];

11
mix/qml/TransactionDialog.qml
View File

@ -87,8 +87,6 @@ Dialog {
else else
loadParameters(); loadParameters();
visible = true; visible = true;
valueField.focus = true; valueField.focus = true;
} }
@ -212,12 +210,19 @@ Dialog {
} }
item.isContractCreation = trType.checked; item.isContractCreation = trType.checked;
if (item.functionId === "(transfert)")
item.isFunctionCall = false;
if (!item.isContractCreation) if (!item.isContractCreation)
{ {
item.contractId = recipients.currentText; item.contractId = recipients.currentText;
item.label = item.contractId + " " + item.functionId; item.label = item.contractId + " " + item.functionId;
if (recipients.current().type === "address") if (recipients.current().type === "address")
item.functionId = "(transfert)"; {
item.functionId = "";
item.isFunctionCall = false;
}
} }
else else
{ {

3
mix/qml/js/TransactionHelper.js
View File

@ -11,7 +11,8 @@ function defaultTransaction()
parameters: {}, parameters: {},
stdContract: false, stdContract: false,
isContractCreation: true, isContractCreation: true,
label: "" label: "",
isFunctionCall: true
}; };
} }

Write Preview
Loading…
Cancel
Save