Browse Source

bug fix

cl-refactor
yann300 10 years ago
parent
commit
40de803f66
  1. 2
      mix/ClientModel.cpp
  2. 2
      mix/ClientModel.h
  3. 4
      mix/qml/TransactionDialog.qml

2
mix/ClientModel.cpp

@ -312,7 +312,7 @@ void ClientModel::executeSequence(vector<TransactionSettings> const& _sequence,
{ {
std::pair<QString, int> ctrInstance = resolvePair(transaction.contractId); std::pair<QString, int> ctrInstance = resolvePair(transaction.contractId);
QString address = resolveToken(ctrInstance, deployedContracts); QString address = resolveToken(ctrInstance, deployedContracts);
if (transaction.isFunctionCall) if (!transaction.isFunctionCall)
{ {
callAddress(Address(address.toStdString()), bytes(), transaction); callAddress(Address(address.toStdString()), bytes(), transaction);
onNewTransaction(); onNewTransaction();

2
mix/ClientModel.h

@ -56,7 +56,7 @@ struct TransactionSettings
TransactionSettings(QString const& _contractId, QString const& _functionId, u256 _value, u256 _gas, bool _gasAuto, u256 _gasPrice, Secret _sender, bool _isContractCreation, bool _isFunctionCall): 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), isFunctionCall(_isFunctionCall) {} 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), isFunctionCall(false) {} contractId(_stdContractName), gasAuto(true), stdContractUrl(_stdContractUrl), isContractCreation(true), isFunctionCall(true) {}
/// Contract name /// Contract name
QString contractId; QString contractId;

4
mix/qml/TransactionDialog.qml

@ -210,9 +210,7 @@ Dialog {
} }
item.isContractCreation = trType.checked; item.isContractCreation = trType.checked;
item.isFunctionCall = item.functionId !== "(transfert)";
if (item.functionId === "(transfert)")
item.isFunctionCall = false;
if (!item.isContractCreation) if (!item.isContractCreation)
{ {

Loading…
Cancel
Save