Commit 93958b4d authored by Rob Stupay's avatar Rob Stupay

update for constructor encode

parent c554d87f
...@@ -329,9 +329,10 @@ function contractDropdown (events, appAPI, appEvents, opts, self) { ...@@ -329,9 +329,10 @@ function contractDropdown (events, appAPI, appEvents, opts, self) {
createPanel.innerHTML = '' createPanel.innerHTML = ''
if (opts.compiler.getContract && selectContractNames.selectedIndex >= 0 && selectContractNames.children.length > 0) { if (opts.compiler.getContract && selectContractNames.selectedIndex >= 0 && selectContractNames.children.length > 0) {
var ctrabi = txHelper.getConstructorInterface(getSelectedContract().contract.object.abi) var ctrabi = txHelper.getConstructorInterface(getSelectedContract().contract.object.abi)
var ctrEVMbc = getSelectedContract().contract.object.evm.bytecode.object
var createConstructorInstance = new MultiParamManager(0, ctrabi, (valArray, inputsValues) => { var createConstructorInstance = new MultiParamManager(0, ctrabi, (valArray, inputsValues) => {
createInstance(inputsValues) createInstance(inputsValues)
}, txHelper.inputParametersDeclarationToString(ctrabi.inputs), 'Deploy') }, txHelper.inputParametersDeclarationToString(ctrabi.inputs), 'Deploy', ctrEVMbc)
createPanel.appendChild(createConstructorInstance.render()) createPanel.appendChild(createConstructorInstance.render())
return return
} else { } else {
......
...@@ -15,14 +15,16 @@ class MultiParamManager { ...@@ -15,14 +15,16 @@ class MultiParamManager {
* @param {Function} clickMultiCallBack * @param {Function} clickMultiCallBack
* @param {string} inputs * @param {string} inputs
* @param {string} title * @param {string} title
* @param {string} evmBC
* *
*/ */
constructor (lookupOnly, funABI, clickCallBack, inputs, title) { constructor (lookupOnly, funABI, clickCallBack, inputs, title, evmBC) {
this.lookupOnly = lookupOnly this.lookupOnly = lookupOnly
this.funABI = funABI this.funABI = funABI
this.clickCallBack = clickCallBack this.clickCallBack = clickCallBack
this.inputs = inputs this.inputs = inputs
this.title = title this.title = title
this.evmBC = evmBC
this.basicInputField this.basicInputField
this.multiFields this.multiFields
} }
...@@ -154,7 +156,13 @@ class MultiParamManager { ...@@ -154,7 +156,13 @@ class MultiParamManager {
() => { () => {
var multiString = this.getMultiValsString() var multiString = this.getMultiValsString()
var multiJSON = JSON.parse('[' + multiString + ']') var multiJSON = JSON.parse('[' + multiString + ']')
var encodeObj = txFormat.encodeData(this.funABI, multiJSON) var encodeObj
if (this.evmBC) {
console.log(this.evmBC)
encodeObj = txFormat.encodeData(this.funABI, multiJSON, this.evmBC)
} else {
encodeObj = txFormat.encodeData(this.funABI, multiJSON)
}
if (encodeObj.error) { if (encodeObj.error) {
return encodeObj.error return encodeObj.error
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment