Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

gas limit fix for RSK chain #290

Merged
merged 11 commits into from
Jun 12, 2019
Merged

gas limit fix for RSK chain #290

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
1b5358e
RSK gas limit fix
vbaranov Jun 11, 2019
1896daa
Update RSK test: set 21000 gasLimit
vbaranov Jun 11, 2019
5850039
Merge remote-tracking branch 'origin/develop' into rsk-gaslimit-fix
vbaranov Jun 11, 2019
dceef8f
-> node 8.15
vbaranov Jun 11, 2019
82b46c6
Remove blinking tests
vbaranov Jun 12, 2019
be41a61
eslint fix
vbaranov Jun 12, 2019
86cc173
revert packahe-lock.json update
vbaranov Jun 12, 2019
b2eac72
remove RSK testnet tests
vbaranov Jun 12, 2019
9e1793e
Remove RSK chain tests at all
vbaranov Jun 12, 2019
05f350a
remove blinking tests
vbaranov Jun 12, 2019
0953a05
fix npm run lint
vbaranov Jun 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/scripts/controllers/transactions/tx-gas-utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class TxGasUtil {
let code
if (recipient) code = await this.query.getCode(recipient)

if (hasRecipient && (!code || code === '0x')) {
if (hasRecipient && (!code || code === '0x' || code === '0x0')) {
txParams.gas = SIMPLE_GAS_COST
txMeta.simpleSend = true // Prevents buffer addition
return SIMPLE_GAS_COST
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/test-cases/RSK-network-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ const { screens, elements, NETWORKS } = require('../elements')
it('confirms transaction', async function () {
const inputGasLimit = await f.waitUntilShowUp(screens.confirmTransaction.fields.gasLimit)
await f.clearField(inputGasLimit)
await inputGasLimit.sendKeys('31500')
await inputGasLimit.sendKeys('21000')
const button = await f.waitUntilShowUp(screens.confirmTransaction.button.submit)
assert.equal(await button.getAttribute('value'), 'Submit', 'button has incorrect name')
await f.click(button)
Expand Down