From 896198236692f6432353cba695c662410e753025 Mon Sep 17 00:00:00 2001 From: mmv Date: Thu, 14 Nov 2019 14:58:33 +0400 Subject: [PATCH] Fix send params for approval/execution txs --- src/logic/safe/transactions/send.js | 4 ++-- src/routes/safe/store/actions/createTransaction.js | 2 +- src/routes/safe/store/actions/processTransaction.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/logic/safe/transactions/send.js b/src/logic/safe/transactions/send.js index a2ed9030..ba1044a3 100644 --- a/src/logic/safe/transactions/send.js +++ b/src/logic/safe/transactions/send.js @@ -37,7 +37,7 @@ export const getApprovalTransaction = async ( const web3 = getWeb3() const contract = new web3.eth.Contract(GnosisSafeSol.abi, safeInstance.address) - return contract.methods.approveHash(txHash, { value: 0 }) + return contract.methods.approveHash(txHash) } catch (err) { console.error(`Error while approving transaction: ${err}`) @@ -59,7 +59,7 @@ export const getExecutionTransaction = async ( const web3 = getWeb3() const contract = new web3.eth.Contract(GnosisSafeSol.abi, safeInstance.address) - return contract.methods.execTransaction(to, valueInWei, data, operation, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs, { value: 0 }) + return contract.methods.execTransaction(to, valueInWei, data, operation, 0, 0, 0, ZERO_ADDRESS, ZERO_ADDRESS, sigs) } catch (err) { console.error(`Error while creating transaction: ${err}`) diff --git a/src/routes/safe/store/actions/createTransaction.js b/src/routes/safe/store/actions/createTransaction.js index 431e762d..2b85ee40 100644 --- a/src/routes/safe/store/actions/createTransaction.js +++ b/src/routes/safe/store/actions/createTransaction.js @@ -59,7 +59,7 @@ const createTransaction = ( tx = await getApprovalTransaction(safeInstance, to, valueInWei, txData, CALL, nonce, from) } - const sendParams = { from } + const sendParams = { from, value: 0 } // if not set owner management tests will fail on ganache if (process.env.NODE_ENV === 'test') { sendParams.gas = '7000000' diff --git a/src/routes/safe/store/actions/processTransaction.js b/src/routes/safe/store/actions/processTransaction.js index d870a1a1..1df89980 100644 --- a/src/routes/safe/store/actions/processTransaction.js +++ b/src/routes/safe/store/actions/processTransaction.js @@ -95,7 +95,7 @@ const processTransaction = ( transaction = await getApprovalTransaction(safeInstance, tx.recipient, tx.value, tx.data, CALL, nonce, from) } - const sendParams = { from } + const sendParams = { from, value: 0 } // if not set owner management tests will fail on ganache if (process.env.NODE_ENV === 'test') { sendParams.gas = '7000000'