Extra data query parameter for some of the votes
This commit is contained in:
parent
93563cfa8a
commit
56b59fdfd3
|
@ -259,7 +259,12 @@ async function voteAddValidator(req, res) {
|
||||||
if (ethers.utils.isHexString(req.params.validator, 20)) {
|
if (ethers.utils.isHexString(req.params.validator, 20)) {
|
||||||
logger.info('Voting for adding new validator')
|
logger.info('Voting for adding new validator')
|
||||||
const epoch = await bridge.epoch()
|
const epoch = await bridge.epoch()
|
||||||
const message = buildMessage(Action.VOTE_ADD_VALIDATOR, epoch, req.params.validator, padZeros('', 18))
|
const message = buildMessage(
|
||||||
|
Action.VOTE_ADD_VALIDATOR,
|
||||||
|
epoch,
|
||||||
|
req.params.validator,
|
||||||
|
padZeros(req.attempt, 18)
|
||||||
|
)
|
||||||
await processMessage(message)
|
await processMessage(message)
|
||||||
res.send('Voted\n')
|
res.send('Voted\n')
|
||||||
logger.info('Voted successfully')
|
logger.info('Voted successfully')
|
||||||
|
@ -270,7 +275,12 @@ async function voteChangeThreshold(req, res) {
|
||||||
if (/^[0-9]+$/.test(req.params.threshold)) {
|
if (/^[0-9]+$/.test(req.params.threshold)) {
|
||||||
logger.info('Voting for changing threshold')
|
logger.info('Voting for changing threshold')
|
||||||
const epoch = await bridge.epoch()
|
const epoch = await bridge.epoch()
|
||||||
const message = buildMessage(Action.VOTE_CHANGE_THRESHOLD, epoch, parseInt(req.params.threshold, 10), padZeros('', 54))
|
const message = buildMessage(
|
||||||
|
Action.VOTE_CHANGE_THRESHOLD,
|
||||||
|
epoch,
|
||||||
|
parseInt(req.params.threshold, 10),
|
||||||
|
padZeros(req.attempt, 54)
|
||||||
|
)
|
||||||
await processMessage(message)
|
await processMessage(message)
|
||||||
res.send('Voted\n')
|
res.send('Voted\n')
|
||||||
logger.info('Voted successfully')
|
logger.info('Voted successfully')
|
||||||
|
@ -281,7 +291,12 @@ async function voteChangeCloseEpoch(req, res) {
|
||||||
if (req.params.closeEpoch === 'true' || req.params.closeEpoch === 'false') {
|
if (req.params.closeEpoch === 'true' || req.params.closeEpoch === 'false') {
|
||||||
logger.info('Voting for changing close epoch')
|
logger.info('Voting for changing close epoch')
|
||||||
const epoch = await bridge.epoch()
|
const epoch = await bridge.epoch()
|
||||||
const message = buildMessage(Action.VOTE_CHANGE_CLOSE_EPOCH, epoch, req.params.closeEpoch === 'true', padZeros('', 56))
|
const message = buildMessage(
|
||||||
|
Action.VOTE_CHANGE_CLOSE_EPOCH,
|
||||||
|
epoch,
|
||||||
|
req.params.closeEpoch === 'true',
|
||||||
|
padZeros(req.attempt, 56)
|
||||||
|
)
|
||||||
await processMessage(message)
|
await processMessage(message)
|
||||||
res.send('Voted\n')
|
res.send('Voted\n')
|
||||||
logger.info('Voted successfully')
|
logger.info('Voted successfully')
|
||||||
|
@ -292,7 +307,12 @@ async function voteRemoveValidator(req, res) {
|
||||||
if (ethers.utils.isHexString(req.params.validator, 20)) {
|
if (ethers.utils.isHexString(req.params.validator, 20)) {
|
||||||
logger.info('Voting for removing validator')
|
logger.info('Voting for removing validator')
|
||||||
const epoch = await bridge.epoch()
|
const epoch = await bridge.epoch()
|
||||||
const message = buildMessage(Action.VOTE_REMOVE_VALIDATOR, epoch, req.params.validator, padZeros('', 18))
|
const message = buildMessage(
|
||||||
|
Action.VOTE_REMOVE_VALIDATOR,
|
||||||
|
epoch,
|
||||||
|
req.params.validator,
|
||||||
|
padZeros(req.attempt, 18)
|
||||||
|
)
|
||||||
await processMessage(message)
|
await processMessage(message)
|
||||||
res.send('Voted\n')
|
res.send('Voted\n')
|
||||||
logger.info('Voted successfully')
|
logger.info('Voted successfully')
|
||||||
|
@ -407,6 +427,14 @@ votesProxyApp.get('/vote/changeThreshold/:threshold', voteChangeThreshold)
|
||||||
votesProxyApp.get('/vote/changeCloseEpoch/:closeEpoch', voteChangeCloseEpoch)
|
votesProxyApp.get('/vote/changeCloseEpoch/:closeEpoch', voteChangeCloseEpoch)
|
||||||
votesProxyApp.get('/info', info)
|
votesProxyApp.get('/info', info)
|
||||||
|
|
||||||
|
votesProxyApp.use('/vote', (req, res, next) => {
|
||||||
|
if (/^[0-9]*$/.test(req.query.attempt)) {
|
||||||
|
req.attempt = req.query.attempt ? parseInt(req.query.attempt, 10).toString(16) : '0'
|
||||||
|
logger.debug(`Vote attempt 0x${req.attempt}`)
|
||||||
|
next()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
async function main() {
|
async function main() {
|
||||||
sideValidatorNonce = await sideWallet.getTransactionCount()
|
sideValidatorNonce = await sideWallet.getTransactionCount()
|
||||||
|
|
||||||
|
|
|
@ -25,5 +25,5 @@ docker cp "tests:/tests/results.xml" "./tests/results.xml" > /dev/null 2>&1 || t
|
||||||
|
|
||||||
echo "Killing all remaining docker containers"
|
echo "Killing all remaining docker containers"
|
||||||
docker kill $(docker ps | grep validator[1-3]_ | awk '{print $1}') > /dev/null 2>&1 || true
|
docker kill $(docker ps | grep validator[1-3]_ | awk '{print $1}') > /dev/null 2>&1 || true
|
||||||
docker kill ganache_home ganache_side > /dev/null 2>&1 || true
|
docker kill $(docker ps | grep ethereum-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true
|
||||||
docker kill $(docker ps | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true
|
docker kill $(docker ps | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true
|
||||||
|
|
Loading…
Reference in New Issue