@ -123,9 +123,9 @@ function onPoolsFound($modal, $modalBody, channel, store) {
$poolsDropdown . blur ( ) $poolsDropdown . blur ( )
$ ( 'textarea' , $poolInfo ) . val ( epochs ) $ ( 'textarea' , $poolInfo ) . val ( epochs )
$ ( '#token-reward-sum' , $poolInfo ) . html ( tokenRewardSum ) . data ( 'default' , tokenRewardSum ) $ ( '#token-reward-sum' , $poolInfo ) . text ( tokenRewardSum ) . data ( 'default' , tokenRewardSum )
$ ( '#native-reward-sum' , $poolInfo ) . html ( nativeRewardSum ) . data ( 'default' , nativeRewardSum ) $ ( '#native-reward-sum' , $poolInfo ) . text ( nativeRewardSum ) . data ( 'default' , nativeRewardSum )
$ ( '#tx-gas-limit' , $poolInfo ) . html ( '~' + gasLimit ) . data ( 'default' , gasLimit ) $ ( '#tx-gas-limit' , $poolInfo ) . text ( '~' + gasLimit ) . data ( 'default' , gasLimit )
$ ( '#epoch-choice-all' , $poolInfo ) . click ( ) $ ( '#epoch-choice-all' , $poolInfo ) . click ( )
$specifiedEpochsText . val ( '' ) $specifiedEpochsText . val ( '' )
$poolInfo . removeClass ( 'hidden' ) $poolInfo . removeClass ( 'hidden' )
@ -217,7 +217,15 @@ function onPoolsFound($modal, $modalBody, channel, store) {
function claimStarted ( ) { function claimStarted ( ) {
status = 'claiming' status = 'claiming'
hideInputError ( $submitButton ) hideInputError ( $submitButton )
lockUI ( true , $modal , $submitButton , $poolsDropdown , $epochChoiceRadio , $specifiedEpochsText ) ; lockUI (
true ,
$modal ,
$submitButton ,
$poolsDropdown ,
$epochChoiceRadio ,
$specifiedEpochsText ,
'Please, sign transaction in MetaMask'
)
const gasLimit = parseInt ( $ ( '#tx-gas-limit' , $modalBody ) . text ( ) . replace ( /~/g , '' ) . trim ( ) , 10 ) const gasLimit = parseInt ( $ ( '#tx-gas-limit' , $modalBody ) . text ( ) . replace ( /~/g , '' ) . trim ( ) , 10 )
const state = store . getState ( ) const state = store . getState ( )
@ -238,22 +246,31 @@ function onPoolsFound($modal, $modalBody, channel, store) {
} else { } else {
stakingContract . methods . claimReward ( epochs , poolStakingAddress ) . send ( { stakingContract . methods . claimReward ( epochs , poolStakingAddress ) . send ( {
from , from ,
gasPrice : 1000000000 , gasPrice : web3 . utils . toWei ( '1' , 'gwei' ) ,
gas : Math . ceil ( gasLimit * 1.2 ) gas : Math . ceil ( gasLimit * 1.2 ) // +20% reserve to ensure enough gas
} , async function ( error , txHash ) { } , async function ( error , txHash ) {
if ( error ) { if ( error ) {
claimFinished ( error . message ) claimFinished ( error . message )
} else { } else {
try { try {
let tx let tx
let currentBlockNumber
const maxWaitBlocks = 6
const startBlockNumber = ( await web3 . eth . getBlockNumber ( ) ) - 0
const finishBlockNumber = startBlockNumber + maxWaitBlocks
do { do {
await sleep ( 5000 ) await sleep ( 5 ) // seconds
tx = await web3 . eth . getTransactionReceipt ( txHash ) tx = await web3 . eth . getTransactionReceipt ( txHash )
} while ( tx === null ) currentBlockNumber = await web3 . eth . getBlockNumber ( )
if ( tx . status === true || tx . status === '0x1' ) { } while ( tx === null && currentBlockNumber <= finishBlockNumber )
claimFinished ( ) if ( tx ) {
if ( tx . status === true || tx . status === '0x1' ) {
claimFinished ( )
} else {
claimFinished ( 'Transaction reverted' )
}
} else { } else {
claimFinished ( 'Transaction reverted' ) claimFinished ( ` Your transaction was not mined in ${ maxWaitBlocks } blocks. Please, try again with the increased gas price or fixed nonce (use Reset Account feature of MetaMask). ` )
} }
} catch ( e ) { } catch ( e ) {
claimFinished ( e . message ) claimFinished ( e . message )
@ -275,9 +292,9 @@ function onPoolsFound($modal, $modalBody, channel, store) {
} ) } )
} }
function lockUI ( lock , $modal , $button , $poolsDropdown , $epochChoiceRadio , $specifiedEpochsText ) { function lockUI ( lock , $modal , $button , $poolsDropdown , $epochChoiceRadio , $specifiedEpochsText , spinnerText ) {
if ( lock ) { if ( lock ) {
lockModal ( $modal , $button ) lockModal ( $modal , $button , spinnerText )
} else { } else {
unlockModal ( $modal , $button ) unlockModal ( $modal , $button )
} }
@ -286,8 +303,8 @@ function lockUI(lock, $modal, $button, $poolsDropdown, $epochChoiceRadio, $speci
$specifiedEpochsText . prop ( 'disabled' , lock ) $specifiedEpochsText . prop ( 'disabled' , lock )
} }
function sleep ( m s) { function sleep ( second s) {
return new Promise ( resolve => setTimeout ( resolve , ms ) ) return new Promise ( resolve => setTimeout ( resolve , seconds * 1000 ) )
} }
function showButton ( type , $modalBody , calculations ) { function showButton ( type , $modalBody , calculations ) {
@ -325,8 +342,8 @@ function expandEpochsToArray(epochs) {
ranges = ranges . map ( ( v ) => { ranges = ranges . map ( ( v ) => {
if ( v . indexOf ( '-' ) > - 1 ) { if ( v . indexOf ( '-' ) > - 1 ) {
v = v . split ( '-' ) v = v . split ( '-' )
v [ 0 ] = parseInt ( v [ 0 ] ) v [ 0 ] = parseInt ( v [ 0 ] , 10 )
v [ 1 ] = parseInt ( v [ 1 ] ) v [ 1 ] = parseInt ( v [ 1 ] , 10 )
v . sort ( ( a , b ) => a - b ) v . sort ( ( a , b ) => a - b )
const min = v [ 0 ] const min = v [ 0 ]
const max = v [ 1 ] const max = v [ 1 ]
@ -336,7 +353,7 @@ function expandEpochsToArray(epochs) {
} }
return expanded return expanded
} else { } else {
return parseInt ( v ) return parseInt ( v , 10 )
} }
} ) } )
ranges = ranges . reduce ( ( acc , val ) => acc . concat ( val ) , [ ] ) // similar to ranges.flat()
ranges = ranges . reduce ( ( acc , val ) => acc . concat ( val ) , [ ] ) // similar to ranges.flat()
Vadim
5 years ago
committed by
Victor Baranov