|
|
@ -23,6 +23,7 @@ |
|
|
.import org.ethereum.qml.QSolidityType 1.0 as QSolidityType |
|
|
.import org.ethereum.qml.QSolidityType 1.0 as QSolidityType |
|
|
|
|
|
|
|
|
Qt.include("TransactionHelper.js") |
|
|
Qt.include("TransactionHelper.js") |
|
|
|
|
|
Qt.include("QEtherHelper.js") |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var jsonRpcRequestId = 1; |
|
|
var jsonRpcRequestId = 1; |
|
|
@ -47,6 +48,7 @@ function startDeployProject(erasePrevious) |
|
|
|
|
|
|
|
|
var ctrAddresses = {}; |
|
|
var ctrAddresses = {}; |
|
|
var state = retrieveState(projectModel.deployedState); |
|
|
var state = retrieveState(projectModel.deployedState); |
|
|
|
|
|
console.log(JSON.stringify(state)); |
|
|
if (!state) |
|
|
if (!state) |
|
|
{ |
|
|
{ |
|
|
var txt = qsTr("Unable to find state " + projectModel.deployedState); |
|
|
var txt = qsTr("Unable to find state " + projectModel.deployedState); |
|
|
@ -59,6 +61,47 @@ function startDeployProject(erasePrevious) |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function checkPathCreationCost(callBack) |
|
|
|
|
|
{ |
|
|
|
|
|
var dappUrl = formatAppUrl(deploymentDialog.applicationUrlEth); |
|
|
|
|
|
checkEthPath(dappUrl, true, function(success, cause) { |
|
|
|
|
|
if (!success) |
|
|
|
|
|
{ |
|
|
|
|
|
switch (cause) |
|
|
|
|
|
{ |
|
|
|
|
|
case "rootownedregistrar_notexist": |
|
|
|
|
|
deploymentError(qsTr("Owned registrar does not exist under the global registrar. Please create one using DApp registration.")); |
|
|
|
|
|
break; |
|
|
|
|
|
case "ownedregistrar_creationfailed": |
|
|
|
|
|
deploymentError(qsTr("The creation of your new owned registrar fails. Please use DApp registration to create one.")); |
|
|
|
|
|
break; |
|
|
|
|
|
case "ownedregistrar_notowner": |
|
|
|
|
|
deploymentError(qsTr("You are not the owner of this registrar. You cannot register your Dapp here.")); |
|
|
|
|
|
break; |
|
|
|
|
|
default: |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
deploymentStepChanged(qsTr("Your Dapp can be registered here.")); |
|
|
|
|
|
callBack((dappUrl.length - 1) * (deploymentDialog.ownedRegistrarDeployGas + deploymentDialog.ownedRegistrarSetSubRegistrarGas) + deploymentDialog.ownedRegistrarSetContentHashGas); |
|
|
|
|
|
} |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function gasUsed() |
|
|
|
|
|
{ |
|
|
|
|
|
var gas = 0; |
|
|
|
|
|
var gasCosts = clientModel.gasCosts; |
|
|
|
|
|
for (var g in gasCosts) |
|
|
|
|
|
{ |
|
|
|
|
|
gas += gasCosts[g]; |
|
|
|
|
|
console.log(" gasCost " + gasCosts[g]); |
|
|
|
|
|
} |
|
|
|
|
|
return gas; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
function retrieveState(state) |
|
|
function retrieveState(state) |
|
|
{ |
|
|
{ |
|
|
for (var k = 0; k < projectModel.stateListModel.count; k++) |
|
|
for (var k = 0; k < projectModel.stateListModel.count; k++) |
|
|
@ -113,7 +156,8 @@ function executeTr(trIndex, state, ctrAddresses, callBack) |
|
|
executeTrNextStep(trIndex, state, ctrAddresses, callBack); |
|
|
executeTrNextStep(trIndex, state, ctrAddresses, callBack); |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var rpcParams = { "from": deploymentDialog.currentAccount, "gas": deploymentDialog.gasToUse }; |
|
|
var gasCost = clientModel.toHex(clientModel.gasCosts[trIndex]); |
|
|
|
|
|
var rpcParams = { "from": deploymentDialog.currentAccount, "gas": "0x" + gasCost }; |
|
|
var params = replaceParamToken(func.parameters, tr.parameters, ctrAddresses); |
|
|
var params = replaceParamToken(func.parameters, tr.parameters, ctrAddresses); |
|
|
var encodedParams = clientModel.encodeParams(params, tr.contractId, tr.functionId); |
|
|
var encodedParams = clientModel.encodeParams(params, tr.contractId, tr.functionId); |
|
|
|
|
|
|
|
|
@ -157,6 +201,19 @@ function executeTrNextStep(trIndex, state, ctrAddresses, callBack) |
|
|
callBack(); |
|
|
callBack(); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function gasPrice(callBack) |
|
|
|
|
|
{ |
|
|
|
|
|
var requests = [{ |
|
|
|
|
|
jsonrpc: "2.0", |
|
|
|
|
|
method: "eth_gasPrice", |
|
|
|
|
|
params: [], |
|
|
|
|
|
id: jsonRpcRequestId |
|
|
|
|
|
}]; |
|
|
|
|
|
rpcCall(requests, function (httpCall, response){ |
|
|
|
|
|
callBack(JSON.parse(response)[0].result); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
function finalizeDeployment(deploymentId, addresses) { |
|
|
function finalizeDeployment(deploymentId, addresses) { |
|
|
deploymentStepChanged(qsTr("Packaging application ...")); |
|
|
deploymentStepChanged(qsTr("Packaging application ...")); |
|
|
var deploymentDir = projectPath + deploymentId + "/"; |
|
|
var deploymentDir = projectPath + deploymentId + "/"; |
|
|
@ -185,8 +242,8 @@ function finalizeDeployment(deploymentId, addresses) { |
|
|
} |
|
|
} |
|
|
//write deployment js
|
|
|
//write deployment js
|
|
|
var deploymentJs = |
|
|
var deploymentJs = |
|
|
"// Autogenerated by Mix\n" + |
|
|
"// Autogenerated by Mix\n" + |
|
|
"contracts = {};\n"; |
|
|
"contracts = {};\n"; |
|
|
for (var c in codeModel.contracts) { |
|
|
for (var c in codeModel.contracts) { |
|
|
var contractAccessor = "contracts[\"" + codeModel.contracts[c].contract.name + "\"]"; |
|
|
var contractAccessor = "contracts[\"" + codeModel.contracts[c].contract.name + "\"]"; |
|
|
deploymentJs += contractAccessor + " = {\n" + |
|
|
deploymentJs += contractAccessor + " = {\n" + |
|
|
@ -209,19 +266,27 @@ function finalizeDeployment(deploymentId, addresses) { |
|
|
|
|
|
|
|
|
applicationUrlEth = formatAppUrl(applicationUrlEth); |
|
|
applicationUrlEth = formatAppUrl(applicationUrlEth); |
|
|
deploymentStepChanged(qsTr("Registering application on the Ethereum network ...")); |
|
|
deploymentStepChanged(qsTr("Registering application on the Ethereum network ...")); |
|
|
checkEthPath(applicationUrlEth, function () { |
|
|
checkEthPath(applicationUrlEth, false, function (success) { |
|
|
|
|
|
if (!success) |
|
|
|
|
|
return; |
|
|
deploymentComplete(); |
|
|
deploymentComplete(); |
|
|
deployResourcesDialog.text = qsTr("Register Web Application to finalize deployment."); |
|
|
deployResourcesDialog.text = qsTr("Register Web Application to finalize deployment."); |
|
|
deployResourcesDialog.open(); |
|
|
deployResourcesDialog.open(); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
function checkEthPath(dappUrl, callBack) |
|
|
function checkEthPath(dappUrl, checkOnly, callBack) |
|
|
{ |
|
|
{ |
|
|
if (dappUrl.length === 1) |
|
|
if (dappUrl.length === 1) |
|
|
reserve(deploymentDialog.eth, function() { |
|
|
{ |
|
|
registerContentHash(deploymentDialog.eth, callBack); // we directly create a dapp under the root registrar.
|
|
|
// convenient for dev purpose, should not be possible in normal env.
|
|
|
}); |
|
|
if (!checkOnly) |
|
|
|
|
|
reserve(deploymentDialog.eth, function() { |
|
|
|
|
|
registerContentHash(deploymentDialog.eth, callBack); // we directly create a dapp under the root registrar.
|
|
|
|
|
|
}); |
|
|
|
|
|
else |
|
|
|
|
|
callBack(true); |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
// the first owned registrar must have been created to follow the path.
|
|
|
// the first owned registrar must have been created to follow the path.
|
|
|
@ -231,7 +296,7 @@ function checkEthPath(dappUrl, callBack) |
|
|
//subRegistrar()
|
|
|
//subRegistrar()
|
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_call", |
|
|
method: "eth_call", |
|
|
params: [ { "gas": "0xffff", "from": deploymentDialog.currentAccount, "to": '0x' + deploymentDialog.eth, "data": "0x5a3a05bd" + str }, "pending" ], |
|
|
params: [ { "gas": "0xffff", "from": deploymentDialog.currentAccount, "to": '0x' + deploymentDialog.eth, "data": "0xe1fa8e84" + str }, "pending" ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
@ -242,35 +307,66 @@ function checkEthPath(dappUrl, callBack) |
|
|
var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + ". Please register using Registration Dapp. Aborting."); |
|
|
var errorTxt = qsTr("Path does not exists " + JSON.stringify(dappUrl) + ". Please register using Registration Dapp. Aborting."); |
|
|
deploymentError(errorTxt); |
|
|
deploymentError(errorTxt); |
|
|
console.log(errorTxt); |
|
|
console.log(errorTxt); |
|
|
|
|
|
callBack(false, "rootownedregistrar_notexist"); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
dappUrl.splice(0, 1); |
|
|
dappUrl.splice(0, 1); |
|
|
checkRegistration(dappUrl, addr, callBack); |
|
|
checkRegistration(dappUrl, addr, callBack, checkOnly); |
|
|
} |
|
|
} |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
function checkRegistration(dappUrl, addr, callBack) |
|
|
function isOwner(addr, callBack) |
|
|
|
|
|
{ |
|
|
|
|
|
var requests = []; |
|
|
|
|
|
requests.push({ |
|
|
|
|
|
//getOwner()
|
|
|
|
|
|
jsonrpc: "2.0", |
|
|
|
|
|
method: "eth_call", |
|
|
|
|
|
params: [ { "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0xb387ef92" }, "pending" ], |
|
|
|
|
|
id: jsonRpcRequestId++ |
|
|
|
|
|
}); |
|
|
|
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
|
|
|
var res = JSON.parse(response); |
|
|
|
|
|
callBack(normalizeAddress(deploymentDialog.currentAccount) === normalizeAddress(res[0].result)); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function checkRegistration(dappUrl, addr, callBack, checkOnly) |
|
|
|
|
|
{ |
|
|
|
|
|
isOwner(addr, function(ret){ |
|
|
|
|
|
if (!ret) |
|
|
|
|
|
{ |
|
|
|
|
|
var errorTxt = qsTr("You are not the owner of " + dappUrl[0] + ". Aborting"); |
|
|
|
|
|
deploymentError(errorTxt); |
|
|
|
|
|
console.log(errorTxt); |
|
|
|
|
|
callBack(false, "ownedregistrar_notowner"); |
|
|
|
|
|
} |
|
|
|
|
|
else |
|
|
|
|
|
continueRegistration(dappUrl, addr, callBack, checkOnly); |
|
|
|
|
|
}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
function continueRegistration(dappUrl, addr, callBack, checkOnly) |
|
|
{ |
|
|
{ |
|
|
if (dappUrl.length === 1) |
|
|
if (dappUrl.length === 1) |
|
|
registerContentHash(addr, callBack); // We do not create the register for the last part, just registering the content hash.
|
|
|
{ |
|
|
|
|
|
if (!checkOnly) |
|
|
|
|
|
registerContentHash(addr, callBack); // We do not create the register for the last part, just registering the content hash.
|
|
|
|
|
|
else |
|
|
|
|
|
callBack(true); |
|
|
|
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
var txt = qsTr("Checking " + JSON.stringify(dappUrl) + " ... in registrar " + addr); |
|
|
var txt = qsTr("Checking " + JSON.stringify(dappUrl)); |
|
|
deploymentStepChanged(txt); |
|
|
deploymentStepChanged(txt); |
|
|
console.log(txt); |
|
|
console.log(txt); |
|
|
var requests = []; |
|
|
var requests = []; |
|
|
var registrar = {} |
|
|
var registrar = {} |
|
|
var str = clientModel.encodeStringParam(dappUrl[0]); |
|
|
var str = clientModel.encodeStringParam(dappUrl[0]); |
|
|
requests.push({ |
|
|
|
|
|
//getOwner()
|
|
|
|
|
|
jsonrpc: "2.0", |
|
|
|
|
|
method: "eth_call", |
|
|
|
|
|
params: [ { "gas" : 2000, "from": deploymentDialog.currentAccount, "to": '0x' + addr, "data": "0x02571be3" }, "pending" ], |
|
|
|
|
|
id: jsonRpcRequestId++ |
|
|
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
requests.push({ |
|
|
requests.push({ |
|
|
//register()
|
|
|
//register()
|
|
|
@ -282,37 +378,37 @@ function checkRegistration(dappUrl, addr, callBack) |
|
|
|
|
|
|
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
var res = JSON.parse(response); |
|
|
var res = JSON.parse(response); |
|
|
var nextAddr = normalizeAddress(res[1].result); |
|
|
var nextAddr = normalizeAddress(res[0].result); |
|
|
var errorTxt; |
|
|
var errorTxt; |
|
|
if (res[1].result === "0x") |
|
|
if (res[0].result === "0x") |
|
|
{ |
|
|
{ |
|
|
errorTxt = qsTr("Error when creating new owned regsitrar. Please use the regsitration Dapp. Aborting"); |
|
|
errorTxt = qsTr("Error when creating new owned registrar. Please use the registration Dapp. Aborting"); |
|
|
deploymentError(errorTxt); |
|
|
|
|
|
console.log(errorTxt); |
|
|
|
|
|
} |
|
|
|
|
|
else if (normalizeAddress(deploymentDialog.currentAccount) !== normalizeAddress(res[0].result)) |
|
|
|
|
|
{ |
|
|
|
|
|
errorTxt = qsTr("You are not the owner of " + dappUrl[0] + ". Aborting"); |
|
|
|
|
|
deploymentError(errorTxt); |
|
|
deploymentError(errorTxt); |
|
|
console.log(errorTxt); |
|
|
console.log(errorTxt); |
|
|
|
|
|
callBack(false, "ownedregistrar_creationfailed"); |
|
|
} |
|
|
} |
|
|
else if (nextAddr.replace(/0+/g, "") !== "") |
|
|
else if (nextAddr.replace(/0+/g, "") !== "") |
|
|
{ |
|
|
{ |
|
|
dappUrl.splice(0, 1); |
|
|
dappUrl.splice(0, 1); |
|
|
checkRegistration(dappUrl, nextAddr, callBack); |
|
|
checkRegistration(dappUrl, nextAddr, callBack, checkOnly); |
|
|
} |
|
|
} |
|
|
else |
|
|
else |
|
|
{ |
|
|
{ |
|
|
|
|
|
if (checkOnly) |
|
|
|
|
|
{ |
|
|
|
|
|
callBack(true); |
|
|
|
|
|
return; |
|
|
|
|
|
} |
|
|
var txt = qsTr("Registering sub domain " + dappUrl[0] + " ..."); |
|
|
var txt = qsTr("Registering sub domain " + dappUrl[0] + " ..."); |
|
|
console.log(txt); |
|
|
console.log(txt); |
|
|
deploymentStepChanged(txt); |
|
|
deploymentStepChanged(txt); |
|
|
//current registrar is owned => ownedregistrar creation and continue.
|
|
|
//current registrar is owned => ownedregistrar creation and continue.
|
|
|
requests = []; |
|
|
requests = []; |
|
|
|
|
|
var gasCost = clientModel.toHex(deploymentDialog.ownedRegistrarDeployGas); |
|
|
requests.push({ |
|
|
requests.push({ |
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_sendTransaction", |
|
|
method: "eth_sendTransaction", |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": 20000, "code": "0x600080547fffffffffffffffffffffffff0000000000000000000000000000000000000000163317815561058990819061003990396000f3007c010000000000000000000000000000000000000000000000000000000060003504630198489281146100a757806302571be3146100d957806321f8a721146100e35780632dff6941146100ed5780633b3b57de1461010d5780635a3a05bd1461013d5780635fd4b08a1461017057806389a69c0e1461017c578063b5c645bd146101b0578063be99a9801461022c578063c3d014d614610264578063d93e75731461029857005b73ffffffffffffffffffffffffffffffffffffffff600435166000908152600160205260409020548060005260206000f35b6000808052602081f35b6000808052602081f35b600435600090815260026020819052604090912001548060005260206000f35b600435600090815260026020908152604082205473ffffffffffffffffffffffffffffffffffffffff1680835291f35b600435600090815260026020908152604082206001015473ffffffffffffffffffffffffffffffffffffffff1680835291f35b60008060005260206000f35b6000546102c89060043590602435903373ffffffffffffffffffffffffffffffffffffffff90811691161461052557610585565b600435600090815260026020819052604090912080546001820154919092015473ffffffffffffffffffffffffffffffffffffffff9283169291909116908273ffffffffffffffffffffffffffffffffffffffff166000528173ffffffffffffffffffffffffffffffffffffffff166020528060405260606000f35b6000546102ce906004359060243590604435903373ffffffffffffffffffffffffffffffffffffffff9081169116146102e0576103af565b6000546102d49060043590602435903373ffffffffffffffffffffffffffffffffffffffff9081169116146103b4576103f1565b6000546102da90600435903373ffffffffffffffffffffffffffffffffffffffff9081169116146103f557610522565b60006000f35b60006000f35b60006000f35b60006000f35b600083815260026020526040902080547fffffffffffffffffffffffff000000000000000000000000000000000000000016831790558061034757827fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc60006040a26103ae565b73ffffffffffffffffffffffffffffffffffffffff8216837ff63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a854560006040a373ffffffffffffffffffffffffffffffffffffffff821660009081526001602052604090208390555b5b505050565b600082815260026020819052604080832090910183905583917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b5050565b60008181526002602090815260408083205473ffffffffffffffffffffffffffffffffffffffff16835260019091529020548114610432576104b2565b6000818152600260205260408082205473ffffffffffffffffffffffffffffffffffffffff169183917ff63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a85459190a360008181526002602090815260408083205473ffffffffffffffffffffffffffffffffffffffff16835260019091528120555b600081815260026020819052604080832080547fffffffffffffffffffffffff00000000000000000000000000000000000000009081168255600182018054909116905590910182905582917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b50565b60008281526002602052604080822060010180547fffffffffffffffffffffffff0000000000000000000000000000000000000000168417905583917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b505056" } ], |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": "0x" + gasCost, "code": "0x600080547fffffffffffffffffffffffff000000000000000000000000000000000000000016331781556105cd90819061003990396000f3007c010000000000000000000000000000000000000000000000000000000060003504630198489281146100b257806321f8a721146100e45780632dff6941146100ee5780633b3b57de1461010e5780635a3a05bd1461013e5780635fd4b08a146101715780637dd564111461017d57806389a69c0e14610187578063b387ef92146101bb578063b5c645bd146101f4578063be99a98014610270578063c3d014d6146102a8578063d93e7573146102dc57005b73ffffffffffffffffffffffffffffffffffffffff600435166000908152600160205260409020548060005260206000f35b6000808052602081f35b600435600090815260026020819052604090912001548060005260206000f35b600435600090815260026020908152604082205473ffffffffffffffffffffffffffffffffffffffff1680835291f35b600435600090815260026020908152604082206001015473ffffffffffffffffffffffffffffffffffffffff1680835291f35b60008060005260206000f35b6000808052602081f35b60005461030c9060043590602435903373ffffffffffffffffffffffffffffffffffffffff908116911614610569576105c9565b60005473ffffffffffffffffffffffffffffffffffffffff168073ffffffffffffffffffffffffffffffffffffffff1660005260206000f35b600435600090815260026020819052604090912080546001820154919092015473ffffffffffffffffffffffffffffffffffffffff9283169291909116908273ffffffffffffffffffffffffffffffffffffffff166000528173ffffffffffffffffffffffffffffffffffffffff166020528060405260606000f35b600054610312906004359060243590604435903373ffffffffffffffffffffffffffffffffffffffff90811691161461045457610523565b6000546103189060043590602435903373ffffffffffffffffffffffffffffffffffffffff90811691161461052857610565565b60005461031e90600435903373ffffffffffffffffffffffffffffffffffffffff90811691161461032457610451565b60006000f35b60006000f35b60006000f35b60006000f35b60008181526002602090815260408083205473ffffffffffffffffffffffffffffffffffffffff16835260019091529020548114610361576103e1565b6000818152600260205260408082205473ffffffffffffffffffffffffffffffffffffffff169183917ff63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a85459190a360008181526002602090815260408083205473ffffffffffffffffffffffffffffffffffffffff16835260019091528120555b600081815260026020819052604080832080547fffffffffffffffffffffffff00000000000000000000000000000000000000009081168255600182018054909116905590910182905582917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b50565b600083815260026020526040902080547fffffffffffffffffffffffff00000000000000000000000000000000000000001683179055806104bb57827fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc60006040a2610522565b73ffffffffffffffffffffffffffffffffffffffff8216837ff63780e752c6a54a94fc52715dbc5518a3b4c3c2833d301a204226548a2a854560006040a373ffffffffffffffffffffffffffffffffffffffff821660009081526001602052604090208390555b5b505050565b600082815260026020819052604080832090910183905583917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b5050565b60008281526002602052604080822060010180547fffffffffffffffffffffffff0000000000000000000000000000000000000000168417905583917fa6697e974e6a320f454390be03f74955e8978f1a6971ea6730542e37b66179bc91a25b505056" } ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
@ -329,11 +425,12 @@ function checkRegistration(dappUrl, addr, callBack) |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
var crLevel = clientModel.encodeStringParam(dappUrl[0]); |
|
|
var crLevel = clientModel.encodeStringParam(dappUrl[0]); |
|
|
|
|
|
var gasCost = clientModel.toHex(deploymentDialog.ownedRegistrarSetSubRegistrarGas); |
|
|
requests.push({ |
|
|
requests.push({ |
|
|
//setRegister()
|
|
|
//setRegister()
|
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_sendTransaction", |
|
|
method: "eth_sendTransaction", |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": 30000, "to": '0x' + addr, "data": "0x89a69c0e" + crLevel + deploymentDialog.pad(newCtrAddress) } ], |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": "0x" + gasCost, "to": '0x' + addr, "data": "0x89a69c0e" + crLevel + deploymentDialog.pad(newCtrAddress) } ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
@ -382,16 +479,16 @@ function registerContentHash(registrar, callBack) |
|
|
console.log(txt); |
|
|
console.log(txt); |
|
|
var requests = []; |
|
|
var requests = []; |
|
|
var paramTitle = clientModel.encodeStringParam(projectModel.projectTitle); |
|
|
var paramTitle = clientModel.encodeStringParam(projectModel.projectTitle); |
|
|
|
|
|
var gasCost = clientModel.toHex(deploymentDialog.ownedRegistrarSetContentHashGas); |
|
|
requests.push({ |
|
|
requests.push({ |
|
|
//setContent()
|
|
|
//setContent()
|
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_sendTransaction", |
|
|
method: "eth_sendTransaction", |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": "0xfffff", "to": '0x' + registrar, "data": "0xc3d014d6" + paramTitle + deploymentDialog.packageHash } ], |
|
|
params: [ { "from": deploymentDialog.currentAccount, "gas": "0x" + gasCost, "to": '0x' + registrar, "data": "0xc3d014d6" + paramTitle + deploymentDialog.packageHash } ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
rpcCall(requests, function (httpRequest, response) { |
|
|
callBack(); |
|
|
callBack(true); |
|
|
}); |
|
|
}); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -402,12 +499,12 @@ function registerToUrlHint() |
|
|
urlHintAddress(function(urlHint){ |
|
|
urlHintAddress(function(urlHint){ |
|
|
var requests = []; |
|
|
var requests = []; |
|
|
var paramUrlHttp = clientModel.encodeStringParam(deploymentDialog.applicationUrlHttp); |
|
|
var paramUrlHttp = clientModel.encodeStringParam(deploymentDialog.applicationUrlHttp); |
|
|
|
|
|
var gasCost = clientModel.toHex(deploymentDialog.urlHintSuggestUrlGas); |
|
|
requests.push({ |
|
|
requests.push({ |
|
|
//urlHint => suggestUrl
|
|
|
//urlHint => suggestUrl
|
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_sendTransaction", |
|
|
method: "eth_sendTransaction", |
|
|
params: [ { "to": '0x' + urlHint, "from": deploymentDialog.currentAccount, "gas": "0xfffff", "data": "0x584e86ad" + deploymentDialog.packageHash + paramUrlHttp } ], |
|
|
params: [ { "to": '0x' + urlHint, "from": deploymentDialog.currentAccount, "gas": "0x" + gasCost, "data": "0x584e86ad" + deploymentDialog.packageHash + paramUrlHttp } ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
@ -425,7 +522,7 @@ function urlHintAddress(callBack) |
|
|
//registrar: get UrlHint addr
|
|
|
//registrar: get UrlHint addr
|
|
|
jsonrpc: "2.0", |
|
|
jsonrpc: "2.0", |
|
|
method: "eth_call", |
|
|
method: "eth_call", |
|
|
params: [ { "to": '0x' + deploymentDialog.eth, "from": deploymentDialog.currentAccount, "gas": "0xfffff", "data": "0x3b3b57de" + urlHint }, "pending" ], |
|
|
params: [ { "to": '0x' + deploymentDialog.eth, "from": deploymentDialog.currentAccount, "data": "0x3b3b57de" + urlHint }, "pending" ], |
|
|
id: jsonRpcRequestId++ |
|
|
id: jsonRpcRequestId++ |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
@ -446,6 +543,8 @@ function normalizeAddress(addr) |
|
|
|
|
|
|
|
|
function formatAppUrl(url) |
|
|
function formatAppUrl(url) |
|
|
{ |
|
|
{ |
|
|
|
|
|
if (url.toLowerCase().lastIndexOf("/") === url.length - 1) |
|
|
|
|
|
url = url.substring(0, url.length - 1); |
|
|
if (url.toLowerCase().indexOf("eth://") === 0) |
|
|
if (url.toLowerCase().indexOf("eth://") === 0) |
|
|
url = url.substring(6); |
|
|
url = url.substring(6); |
|
|
if (url.toLowerCase().indexOf(projectModel.projectTitle + ".") === 0) |
|
|
if (url.toLowerCase().indexOf(projectModel.projectTitle + ".") === 0) |
|
|
|
subtly
10 years ago