-
-
-
${data.finalityDelay}
-
+ waitForTurnstileToken(()=>{
+ fetch("/latestState", {headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}})
+ .then(function (res) {
+ return res.json()
+ })
+ .then(function (data) {
+ // always visible
+ var epochHandle = document.getElementById("banner-epoch-data")
+
+ if (data.currentEpoch) {
+ epochHandle.innerHTML = addCommas(data.currentEpoch)
+ epochHandle.setAttribute("href", "/epoch/" + data.currentEpoch)
+ }
+
+ var slotHandle = document.getElementById("banner-slot-data")
+ if (data.currentSlot) {
+ slotHandle.innerHTML = addCommas(data.currentSlot)
+ slotHandle.setAttribute("href", "/slot/" + data.currentSlot)
+ }
+
+ var ethPriceHandle = document.getElementById("banner-eth-price-data")
+
+ try {
+ let userCurrency = getCookie("currency")
+ if (userCurrency == data.rates.mainCurrency) userCurrency = data.rates.tickerCurrency
+ var price = data.rates.mainCurrencyPrices[userCurrency]
+ ethPriceHandle.innerHTML = `
${price.symbol} ${price.truncPrice}${addCommas(price.roundPrice)}`
+ } catch (err) {
+ console.error("failed updating banner-price:", err)
+ }
+
+ var finDelayDataHandle = document.getElementById("banner-fin-data")
+ finDelayHtml = `
+
+
+
+ ${data.finalityDelay}
+
+
-
- `
-
- if (!finDelayDataHandle && data.finalityDelay > 3 && !data.syncing) {
- // create fin delay node
- document.getElementById("banner-slot").insertAdjacentHTML("afterend", finDelayHtml)
- $("#banner-fin i").each(function () {
- $(this).tooltip("update")
- })
- } else if (finDelayDataHandle && data.finalityDelay > 3 && !data.syncing) {
- // update fin delay node
- finDelayDataHandle.textContent = data.finalityDelay
- var icons = document.querySelectorAll("#banner-fin i")
- for (let i = 0; i < icons.length; i++) {
- const icon = icons[i]
- icon.setAttribute("data-original-title", `The last finalized epoch was ${data.finalityDelay} epochs ago.`)
+ `
+
+ if (!finDelayDataHandle && data.finalityDelay > 3 && !data.syncing) {
+ // create fin delay node
+ document.getElementById("banner-slot").insertAdjacentHTML("afterend", finDelayHtml)
+ $("#banner-fin i").each(function () {
+ $(this).tooltip("update")
+ })
+ } else if (finDelayDataHandle && data.finalityDelay > 3 && !data.syncing) {
+ // update fin delay node
+ finDelayDataHandle.textContent = data.finalityDelay
+ var icons = document.querySelectorAll("#banner-fin i")
+ for (let i = 0; i < icons.length; i++) {
+ const icon = icons[i]
+ icon.setAttribute("data-original-title", `The last finalized epoch was ${data.finalityDelay} epochs ago.`)
+ }
+ $("#banner-fin i").each(function () {
+ $(this).tooltip("update")
+ })
+ } else {
+ // delete fin delay node if it exists
+ let findDelayHandle = document.getElementById("banner-fin")
+ if (findDelayHandle) findDelayHandle.remove()
}
- $("#banner-fin i").each(function () {
- $(this).tooltip("update")
- })
- } else {
- // delete fin delay node if it exists
- let findDelayHandle = document.getElementById("banner-fin")
- if (findDelayHandle) findDelayHandle.remove()
- }
- if (data.syncing) {
- // remove fin delay if we are still syncing
- let findDelayHandle = document.getElementById("banner-fin")
- if (findDelayHandle) findDelayHandle.remove()
-
- var bannerHandle = document.getElementById("banner-status")
- if (!bannerHandle) {
- var statusHtml = `
-
|
+ if (data.syncing) {
+ // remove fin delay if we are still syncing
+ let findDelayHandle = document.getElementById("banner-fin")
+ if (findDelayHandle) findDelayHandle.remove()
+
+ var bannerHandle = document.getElementById("banner-status")
+ if (!bannerHandle) {
+ var statusHtml = `
+
|
+ `
+ document.getElementById("banner-home").remove()
+ document.getElementById("banner-stats").insertAdjacentHTML("afterbegin", statusHtml)
+ }
+ } else {
+ // delete sync if it exists otherwise do nothing
+ var statusHandle = document.getElementById("banner-status")
+ if (statusHandle) {
+ var homeHtml = `
+
|
`
- document.getElementById("banner-home").remove()
- document.getElementById("banner-stats").insertAdjacentHTML("afterbegin", statusHtml)
- }
- } else {
- // delete sync if it exists otherwise do nothing
- var statusHandle = document.getElementById("banner-status")
- if (statusHandle) {
- var homeHtml = `
-
|
- `
- statusHandle.remove()
- document.getElementById("banner-stats").insertAdjacentHTML("afterbegin", homeHtml)
+ statusHandle.remove()
+ document.getElementById("banner-stats").insertAdjacentHTML("afterbegin", homeHtml)
+ }
}
- }
- })
+ })
+ })
}
// update the banner every 12 seconds
diff --git a/static/js/dashboard.js b/static/js/dashboard.js
index b22eb2e135..e5156e1538 100644
--- a/static/js/dashboard.js
+++ b/static/js/dashboard.js
@@ -116,38 +116,58 @@ function toggleFirstrow() {
}
function updateValidatorInfo(index) {
- fetch(`/validator/${index}/proposedblocks?draw=1&start=1&length=1`, {
- method: "GET",
- }).then((res) => {
- res.json().then((data) => {
- $("#blockCount span").text(data.recordsTotal)
+ waitForTurnstileToken(() => {
+ fetch(`/validator/${index}/proposedblocks?draw=1&start=1&length=1`, {
+ method: "GET",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ }).then((res) => {
+ res.json().then((data) => {
+ $("#blockCount span").text(data.recordsTotal)
+ })
+ }).finally(()=>{
+ resetTurnstileToken()
})
})
- fetch(`/validator/${index}/attestations?draw=1&start=1&length=1`, {
- method: "GET",
- }).then((res) => {
- res.json().then((data) => {
- $("#attestationCount span").text(data.recordsTotal)
+ waitForTurnstileToken(() => {
+ fetch(`/validator/${index}/attestations?draw=1&start=1&length=1`, {
+ method: "GET",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ }).then((res) => {
+ res.json().then((data) => {
+ $("#attestationCount span").text(data.recordsTotal)
+ })
+ }).finally(()=>{
+ resetTurnstileToken()
})
})
- fetch(`/validator/${index}/slashings?draw=1&start=1&length=1`, {
- method: "GET",
- }).then((res) => {
- res.json().then((data) => {
- var total = parseInt(data.recordsTotal)
- if (total > 0) {
- $("#slashingsCountDiv").removeClass("d-none")
- $("#slashingsCount span").text(total)
- } else {
- $("#slashingsCountDiv").addClass("d-none")
- }
+ waitForTurnstileToken(() => {
+ fetch(`/validator/${index}/slashings?draw=1&start=1&length=1`, {
+ method: "GET",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ }).then((res) => {
+ res.json().then((data) => {
+ var total = parseInt(data.recordsTotal)
+ if (total > 0) {
+ $("#slashingsCountDiv").removeClass("d-none")
+ $("#slashingsCount span").text(total)
+ } else {
+ $("#slashingsCountDiv").addClass("d-none")
+ }
+ })
+ }).finally(()=>{
+ resetTurnstileToken()
})
})
- fetch(`/validator/${index}/effectiveness`, {
- method: "GET",
- }).then((res) => {
- res.json().then((data) => {
- setValidatorEffectiveness("effectiveness", data.effectiveness)
+ waitForTurnstileToken(() => {
+ fetch(`/validator/${index}/effectiveness`, {
+ method: "GET",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ }).then((res) => {
+ res.json().then((data) => {
+ setValidatorEffectiveness("effectiveness", data.effectiveness)
+ })
+ }).finally(()=>{
+ resetTurnstileToken()
})
})
}
@@ -292,15 +312,19 @@ function renderProposedHistoryTable(data) {
}
function showProposedHistoryTable() {
- fetch("/dashboard/data/proposalshistory" + getValidatorQueryString(), {
- method: "GET",
- }).then((res) => {
- res.json().then(function (data) {
- let proposedHistTableData = []
- for (let item of data) {
- proposedHistTableData.push([item[0], item[1], [item[2], item[3], item[4]]])
- }
- renderProposedHistoryTable(proposedHistTableData)
+ waitForTurnstileToken(()=>{
+ fetch("/dashboard/data/proposalshistory" + getValidatorQueryString(), {
+ method: "GET",
+ }).then((res) => {
+ res.json().then(function (data) {
+ let proposedHistTableData = []
+ for (let item of data) {
+ proposedHistTableData.push([item[0], item[1], [item[2], item[3], item[4]]])
+ }
+ renderProposedHistoryTable(proposedHistTableData)
+ })
+ }).finally(()=>{
+ resetTurnstileToken()
})
})
}
@@ -692,6 +716,18 @@ $(document).ready(function () {
}
create_validators_typeahead("input[aria-controls='validators']", "#validators")
+
+ function prepare(query,settings){
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(jqXHR){
+ resetTurnstileToken()
+ }
+ return settings
+ }
+
var timeWait = 0
var debounce = function (context, func) {
var timeout, result
@@ -721,11 +757,16 @@ $(document).ready(function () {
// use prepare hook to modify the rateLimitWait parameter on input changes
// NOTE: we only need to do this for the first function because testing showed that queries are executed/queued in order
// No need to update `timeWait` multiple times.
- prepare: function (_, settings) {
- var cur_query = $(".typeahead-dashboard").val()
- timeWait = 4000 - Math.min(cur_query.length, 5) * 500
+ prepare: function (query, settings) {
+ timeWait = 4000 - Math.min(query.length, 5) * 500
// "wildcard" can't be used anymore, need to set query wildcard ourselves now
- settings.url = settings.url.replace("%QUERY", encodeURIComponent(cur_query))
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
return settings
},
},
@@ -739,7 +780,7 @@ $(document).ready(function () {
},
remote: {
url: "/search/validators_by_pubkey/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhPubkey.remote.transport._get = debounce(bhPubkey.remote.transport, bhPubkey.remote.transport._get)
@@ -751,7 +792,7 @@ $(document).ready(function () {
},
remote: {
url: "/search/indexed_validators_by_eth1_addresses/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhEth1Addresses.remote.transport._get = debounce(bhEth1Addresses.remote.transport, bhEth1Addresses.remote.transport._get)
@@ -763,7 +804,7 @@ $(document).ready(function () {
},
remote: {
url: "/search/indexed_validators_by_name/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhName.remote.transport._get = debounce(bhName.remote.transport, bhName.remote.transport._get)
@@ -775,7 +816,7 @@ $(document).ready(function () {
},
remote: {
url: "/search/indexed_validators_by_graffiti/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhGraffiti.remote.transport._get = debounce(bhGraffiti.remote.transport, bhGraffiti.remote.transport._get)
@@ -972,19 +1013,22 @@ $(document).ready(function () {
$("#dash-validator-history-index-div").removeClass("d-none")
$("#dash-validator-history-index-div").addClass("d-flex")
- fetch(`/dashboard/data/effectiveness${getValidatorQueryString()}`, {
- method: "GET",
- }).then((res) => {
- res.json().then((data) => {
- if (Object.keys(data).length === 0) {
- return
- }
- let sum = 0.0
- for (let eff of data) {
- sum += eff
- }
- sum = sum / data.length
- setValidatorEffectiveness("validator-eff-total", sum)
+ waitForTurnstileToken(()=>{
+ fetch(`/dashboard/data/effectiveness${getValidatorQueryString()}`, {
+ method: "GET",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ }).then((res) => {
+ res.json().then((data) => {
+ if (Object.keys(data).length === 0) {
+ return
+ }
+ let sum = 0.0
+ for (let eff of data) {
+ sum += eff
+ }
+ sum = sum / data.length
+ setValidatorEffectiveness("validator-eff-total", sum)
+ })
})
})
@@ -1184,73 +1228,82 @@ $(document).ready(function () {
document.querySelector("#copy-button").style.visibility = "visible"
document.querySelector("#clear-search").style.visibility = "visible"
- $.ajax({
- url: "/dashboard/data/validators" + qryStr,
- success: function (result) {
- var t1 = Date.now()
- console.log(`loaded validators-data: length: ${result.data.length}, fetch: ${t1 - t0}ms`)
- if (!result || !result.data.length) {
- document.getElementById("validators-table-holder").style.display = "none"
- return
- }
- // pubkey, idx, currbal, effbal, slashed, acteligepoch, actepoch, exitepoch
- // 0:pubkey, 1:idx, 2:[currbal,effbal], 3:state, 4:[actepoch,acttime], 5:[exit,exittime], 6:[wd,wdt], 7:[lasta,lastat], 8:[exprop,misprop]
- state.validatorsCount.deposited = 0
- state.validatorsCount.pending = 0
- state.validatorsCount.active_online = 0
- state.validatorsCount.active_offline = 0
- state.validatorsCount.slashing_online = 0
- state.validatorsCount.slashing_offline = 0
- state.validatorsCount.exiting_online = 0
- state.validatorsCount.exiting_offline = 0
- state.validatorsCount.exited = 0
- state.validatorsCount.slashed = 0
-
- for (var i = 0; i < result.data.length; i++) {
- var v = result.data[i]
- var vIndex = v[1]
- var vState = v[3][1]
- if (!state.validatorsCount[vState]) state.validatorsCount[vState] = 0
- state.validatorsCount[vState]++
- var el = document.querySelector(`#selected-validators .item[data-validator-index="${vIndex}"]`)
- if (el) el.dataset.state = vState
- }
- validatorsDataTable.clear()
-
- validatorsDataTable.rows.add(result.data).draw()
- validatorsDataTable.column(6).visible(false)
-
- requestAnimationFrame(() => {
- validatorsDataTable.columns.adjust().responsive.recalc()
- })
-
- document.getElementById("validators-table-holder").style.display = "block"
-
- renderDashboardInfo()
- },
+ waitForTurnstileToken(()=>{
+ $.ajax({
+ url: "/dashboard/data/validators" + qryStr,
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken},
+ success: function (result) {
+ var t1 = Date.now()
+ console.log(`loaded validators-data: length: ${result.data.length}, fetch: ${t1 - t0}ms`)
+ if (!result || !result.data.length) {
+ document.getElementById("validators-table-holder").style.display = "none"
+ return
+ }
+ // pubkey, idx, currbal, effbal, slashed, acteligepoch, actepoch, exitepoch
+ // 0:pubkey, 1:idx, 2:[currbal,effbal], 3:state, 4:[actepoch,acttime], 5:[exit,exittime], 6:[wd,wdt], 7:[lasta,lastat], 8:[exprop,misprop]
+ state.validatorsCount.deposited = 0
+ state.validatorsCount.pending = 0
+ state.validatorsCount.active_online = 0
+ state.validatorsCount.active_offline = 0
+ state.validatorsCount.slashing_online = 0
+ state.validatorsCount.slashing_offline = 0
+ state.validatorsCount.exiting_online = 0
+ state.validatorsCount.exiting_offline = 0
+ state.validatorsCount.exited = 0
+ state.validatorsCount.slashed = 0
+
+ for (var i = 0; i < result.data.length; i++) {
+ var v = result.data[i]
+ var vIndex = v[1]
+ var vState = v[3][1]
+ if (!state.validatorsCount[vState]) state.validatorsCount[vState] = 0
+ state.validatorsCount[vState]++
+ var el = document.querySelector(`#selected-validators .item[data-validator-index="${vIndex}"]`)
+ if (el) el.dataset.state = vState
+ }
+ validatorsDataTable.clear()
+
+ validatorsDataTable.rows.add(result.data).draw()
+
+ validatorsDataTable.column(6).visible(false)
+
+ requestAnimationFrame(() => {
+ validatorsDataTable.columns.adjust().responsive.recalc()
+ })
+
+ document.getElementById("validators-table-holder").style.display = "block"
+
+ renderDashboardInfo()
+ },
+ })
})
if (firstValidatorWithIndex() !== undefined) {
document.querySelector("#rewards-button").style.visibility = "visible"
document.querySelector("#bookmark-button").style.visibility = "visible"
-
- $.ajax({
- url: "/dashboard/data/earnings" + qryStr,
- success: function (result) {
- var t1 = Date.now()
- console.log(`loaded earnings: fetch: ${t1 - t0}ms`)
- if (!result) return
-
- document.querySelector("#earnings-day").innerHTML = result.lastDayFormatted || summaryDefaultValue
- document.querySelector("#earnings-week").innerHTML = result.lastWeekFormatted || summaryDefaultValue
- document.querySelector("#earnings-month").innerHTML = result.lastMonthFormatted || summaryDefaultValue
- document.querySelector("#earnings-total").innerHTML = result.totalFormatted || summaryDefaultValue
- $("#earnings-total").find('[data-toggle="tooltip"]').tooltip()
- document.querySelector("#balance-total").innerHTML = result.totalBalance || summaryDefaultValue
- $("#balance-total span:first").removeClass("text-success").removeClass("text-danger")
- $("#balance-total span:first").html($("#balance-total span:first").html().replace("+", ""))
- },
+ waitForTurnstileToken(()=>{
+ $.ajax({
+ url: "/dashboard/data/earnings" + qryStr,
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken},
+ success: function (result) {
+ var t1 = Date.now()
+ console.log(`loaded earnings: fetch: ${t1 - t0}ms`)
+ if (!result) return
+
+ document.querySelector("#earnings-day").innerHTML = result.lastDayFormatted || summaryDefaultValue
+ document.querySelector("#earnings-week").innerHTML = result.lastWeekFormatted || summaryDefaultValue
+ document.querySelector("#earnings-month").innerHTML = result.lastMonthFormatted || summaryDefaultValue
+ document.querySelector("#earnings-total").innerHTML = result.totalFormatted || summaryDefaultValue
+ $("#earnings-total").find('[data-toggle="tooltip"]').tooltip()
+ document.querySelector("#balance-total").innerHTML = result.totalBalance || summaryDefaultValue
+ $("#balance-total span:first").removeClass("text-success").removeClass("text-danger")
+ $("#balance-total span:first").html($("#balance-total span:first").html().replace("+", ""))
+ },
+ complete:()=>{
+ resetTurnstileToken()
+ }
+ })
})
} else {
document.querySelector("#rewards-button").style.visibility = "hidden"
@@ -1323,32 +1376,44 @@ $(document).ready(function () {
function renderCharts() {
var t0 = Date.now()
var qryStr = "?validators=" + state.validators.join(",")
- $.ajax({
- url: "/dashboard/data/allbalances" + qryStr + "&days=31",
- success: function (result) {
- var t1 = Date.now()
- createIncomeChart(result.consensusChartData, result.executionChartData)
- var t2 = Date.now()
- console.log(`loaded balance-data: length: ${result.length}, fetch: ${t1 - t0}ms, render: ${t2 - t1}ms`)
- allIncomeLoaded = false
- $("#load-income-btn").removeClass("d-none")
- },
+ waitForTurnstileToken(()=>{
+ $.ajax({
+ url: "/dashboard/data/allbalances" + qryStr + "&days=31",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken},
+ success: function (result) {
+ var t1 = Date.now()
+ createIncomeChart(result.consensusChartData, result.executionChartData)
+ var t2 = Date.now()
+ console.log(`loaded balance-data: length: ${result.length}, fetch: ${t1 - t0}ms, render: ${t2 - t1}ms`)
+ allIncomeLoaded = false
+ $("#load-income-btn").removeClass("d-none")
+ },
+ complete:()=>{
+ resetTurnstileToken()
+ }
+ })
})
- $.ajax({
- url: "/dashboard/data/proposals" + qryStr,
- success: function (result) {
- var t1 = Date.now()
- if (result && result.length) {
- createProposedChart(result)
- } else {
- var chart = $("#proposed-chart").highcharts()
- if (chart !== undefined) {
- hideProposedChart()
+ waitForTurnstileToken(()=>{
+ $.ajax({
+ url: "/dashboard/data/proposals" + qryStr,
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken},
+ success: function (result) {
+ var t1 = Date.now()
+ if (result && result.length) {
+ createProposedChart(result)
+ } else {
+ var chart = $("#proposed-chart").highcharts()
+ if (chart !== undefined) {
+ hideProposedChart()
+ }
}
+ var t2 = Date.now()
+ console.log(`loaded proposal-data: length: ${result.length}, fetch: ${t1 - t0}ms, render: ${t2 - t1}ms`)
+ },
+ complete:()=>{
+ resetTurnstileToken()
}
- var t2 = Date.now()
- console.log(`loaded proposal-data: length: ${result.length}, fetch: ${t1 - t0}ms, render: ${t2 - t1}ms`)
- },
+ })
})
}
@@ -1360,25 +1425,28 @@ $(document).ready(function () {
const url = "/dashboard/data/allbalances?validators=" + state.validators.join(",")
$("#load-income-btn").text("Loading...")
- fetch(url)
- .then((response) => {
- if (!response.ok) {
- throw new Error("Network response was not ok.")
- }
- return response.json()
- })
- .then((data) => {
- createIncomeChart(data.consensusChartData, data.executionChartData)
- $("#load-income-btn").addClass("d-none")
- })
- .catch((error) => {
- console.error(error)
- alert("Error loading income data. Please try again.")
- allIncomeLoaded = false
- })
- .finally(() => {
- $("#load-income-btn").text("Show all rewards")
- })
+ waitForTurnstileToken(()=>{
+ fetch(url,{headers : {'X-TURNSTILE-TOKEN': window.turnstileToken}})
+ .then((response) => {
+ if (!response.ok) {
+ throw new Error("Network response was not ok.")
+ }
+ return response.json()
+ })
+ .then((data) => {
+ createIncomeChart(data.consensusChartData, data.executionChartData)
+ $("#load-income-btn").addClass("d-none")
+ })
+ .catch((error) => {
+ console.error(error)
+ alert("Error loading income data. Please try again.")
+ allIncomeLoaded = false
+ })
+ .finally(() => {
+ resetTurnstileToken()
+ $("#load-income-btn").text("Show all rewards")
+ })
+ })
})
})
diff --git a/static/js/datatable_loader.js b/static/js/datatable_loader.js
index 3821a8cc32..afdba633ae 100644
--- a/static/js/datatable_loader.js
+++ b/static/js/datatable_loader.js
@@ -27,7 +27,7 @@ function dataTableLoader(path, param, dataSrc) {
}
const doFetch = (tableData, callback) => {
- fetch(`${path}?${$.param(tableData)}&${param}`)
+ fetch(`${path}?${$.param(tableData)}&${param}`, {headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}})
.then((response) => {
if (!response.ok) {
throw new Error(`Failed with status: ${response.status}`)
@@ -53,7 +53,9 @@ function dataTableLoader(path, param, dataSrc) {
const fetchWithRetry = (tableData, callback) => {
clearTimeout(timeoutId) // Clear any pending retries.
retries = 0 // Reset retry count.
- doFetch(tableData, callback)
+ waitForTurnstileToken(()=>{
+ doFetch(tableData, callback)
+ })
}
const debouncedFetchData = debounce(fetchWithRetry, DEBOUNCE_DELAY)
diff --git a/static/js/herofeed.js b/static/js/herofeed.js
index 0bf222c1af..439bc91564 100644
--- a/static/js/herofeed.js
+++ b/static/js/herofeed.js
@@ -58,38 +58,43 @@ function findNewDoner(data) {
}
function updateFeed() {
- $.ajax({
- url: "/gitcoinfeed",
- success: (data) => {
- let isLive = data.isLive
- if (!isLive && feedInterval !== null) {
- clearInterval(feedInterval)
- return
- }
- data = data.donors
-
- if (isLive) {
- $("#hero-feed").addClass("d-lg-flex fade-in-top")
-
- if (data.length > 0) {
- donors = findNewDoner(data)
- $("#hero-feed ul>li#gitcoinwaitmsg").remove()
- $(".hover-shadow").hover(
- function () {
- $(this).addClass("shadow color-shift-anim border-rounded")
- },
- function () {
- $(this).removeClass("shadow color-shift-anim border-rounded fade-in")
- }
- )
- } else {
- $("#hero-feed ul").html("")
- $("#hero-feed ul").prepend(`
-
Waiting for the next gitcoin round to start
- `)
+ waitForTurnstileToken(()=>{
+ $.ajax({
+ url: "/gitcoinfeed",
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken},
+ success: (data) => {
+ let isLive = data.isLive
+ if (!isLive && feedInterval !== null) {
+ clearInterval(feedInterval)
+ return
+ }
+ data = data.donors
+
+ if (isLive) {
+ $("#hero-feed").addClass("d-lg-flex fade-in-top")
+
+ if (data.length > 0) {
+ donors = findNewDoner(data)
+ $("#hero-feed ul>li#gitcoinwaitmsg").remove()
+ $(".hover-shadow").hover(
+ function () {
+ $(this).addClass("shadow color-shift-anim border-rounded")
+ },
+ function () {
+ $(this).removeClass("shadow color-shift-anim border-rounded fade-in")
+ }
+ )
+ } else {
+ $("#hero-feed ul").html("")
+ $("#hero-feed ul").prepend(`
+
Waiting for the next gitcoin round to start
+ `)
+ }
}
+ },complete:()=>{
+ resetTurnstileToken()
}
- },
+ })
})
}
diff --git a/static/js/layout.js b/static/js/layout.js
index 4fe01a84d2..06df81b19a 100644
--- a/static/js/layout.js
+++ b/static/js/layout.js
@@ -221,6 +221,17 @@ $(document).ready(function () {
$('[data-toggle="tooltip"]').tooltip()
}
+ function prepare(query,settings){
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
+ return settings
+ }
+
// set maxParallelRequests to number of datasets queried in each search
// make sure this is set in every one bloodhound object
let requestNum = 10
@@ -237,7 +248,9 @@ $(document).ready(function () {
var args = arguments,
later = function () {
timeout = null
- result = func.apply(context, args)
+ waitForTurnstileToken(()=>{
+ result = func.apply(context, args)
+ })
}
clearTimeout(timeout)
timeout = setTimeout(later, timeWait)
@@ -259,11 +272,16 @@ $(document).ready(function () {
// use prepare hook to modify the rateLimitWait parameter on input changes
// NOTE: we only need to do this for the first function because testing showed that queries are executed/queued in order
// No need to update `timeWait` multiple times.
- prepare: function (_, settings) {
- var cur_query = $("input.typeahead.tt-input").val()
- timeWait = 4000 - Math.min(cur_query.length, 5) * 500
+ prepare: function (query, settings) {
+ timeWait = 4000 - Math.min(query.length, 5) * 500
// "wildcard" can't be used anymore, need to set query wildcard ourselves now
- settings.url = settings.url.replace("%QUERY", encodeURIComponent(cur_query))
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
return settings
},
maxPendingRequests: requestNum,
@@ -279,11 +297,11 @@ $(document).ready(function () {
},
remote: {
url: "/search/ens/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
transform: function (data) {
return data?.address && data?.domain ? { data: { ...data } } : null
},
+ prepare:prepare,
},
})
bhEns.remote.transport._get = debounce(bhEns.remote.transport, bhEns.remote.transport._get)
@@ -296,8 +314,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/slots/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhSlots.remote.transport._get = debounce(bhSlots.remote.transport, bhSlots.remote.transport._get)
@@ -310,8 +328,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/blocks/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhBlocks.remote.transport._get = debounce(bhBlocks.remote.transport, bhBlocks.remote.transport._get)
@@ -324,8 +342,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/transactions/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhTransactions.remote.transport._get = debounce(bhTransactions.remote.transport, bhTransactions.remote.transport._get)
@@ -338,8 +356,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/graffiti/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhGraffiti.remote.transport._get = debounce(bhGraffiti.remote.transport, bhGraffiti.remote.transport._get)
@@ -352,8 +370,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/epochs/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhEpochs.remote.transport._get = debounce(bhEpochs.remote.transport, bhEpochs.remote.transport._get)
@@ -366,8 +384,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/eth1_addresses/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhEth1Accounts.remote.transport._get = debounce(bhEth1Accounts.remote.transport, bhEth1Accounts.remote.transport._get)
@@ -380,8 +398,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/count_indexed_validators_by_eth1_address/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhValidatorsByAddress.remote.transport._get = debounce(bhValidatorsByAddress.remote.transport, bhValidatorsByAddress.remote.transport._get)
@@ -394,8 +412,8 @@ $(document).ready(function () {
},
remote: {
url: "/search/validators_by_pubkey/%QUERY",
- wildcard: "%QUERY",
maxPendingRequests: requestNum,
+ prepare:prepare,
},
})
bhPubkey.remote.transport._get = debounce(bhPubkey.remote.transport, bhPubkey.remote.transport._get)
diff --git a/static/js/notificationsCenter.js b/static/js/notificationsCenter.js
index 127bc22cd3..5c5225a3f5 100755
--- a/static/js/notificationsCenter.js
+++ b/static/js/notificationsCenter.js
@@ -4,7 +4,19 @@ const VALIDATOR_EVENTS = ["validator_attestation_missed", "validator_proposal_mi
// const MONITORING_EVENTS = ['monitoring_machine_offline', 'monitoring_hdd_almostfull', 'monitoring_cpu_load']
+function prepare(query,settings){
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
+ return settings
+}
+
function create_typeahead(input_container) {
+
var timeWait = 0
var debounce = function (context, func) {
var timeout, result
@@ -13,7 +25,9 @@ function create_typeahead(input_container) {
var args = arguments,
later = function () {
timeout = null
- result = func.apply(context, args)
+ waitForTurnstileToken(()=>{
+ result = func.apply(context, args)
+ })
}
clearTimeout(timeout)
timeout = setTimeout(later, timeWait)
@@ -35,11 +49,16 @@ function create_typeahead(input_container) {
// use prepare hook to modify the rateLimitWait parameter on input changes
// NOTE: we only need to do this for the first function because testing showed that queries are executed/queued in order
// No need to update `timeWait` multiple times.
- prepare: function (_, settings) {
- var cur_query = $(input_container).val()
- timeWait = 4000 - Math.min(cur_query.length, 5) * 500
+ prepare: function (query, settings) {
+ timeWait = 4000 - Math.min(query.length, 5) * 500
// "wildcard" can't be used anymore, need to set query wildcard ourselves now
- settings.url = settings.url.replace("%QUERY", encodeURIComponent(cur_query))
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
return settings
},
},
@@ -53,7 +72,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_name/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhName.remote.transport._get = debounce(bhName.remote.transport, bhName.remote.transport._get)
@@ -65,7 +84,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_graffiti/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhGraffiti.remote.transport._get = debounce(bhGraffiti.remote.transport, bhGraffiti.remote.transport._get)
@@ -77,7 +96,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_eth1_addresses/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhEth1Addresses.remote.transport._get = debounce(bhEth1Addresses.remote.transport, bhEth1Addresses.remote.transport._get)
@@ -180,7 +199,7 @@ function create_validators_typeahead(input_container_selector, table_selector) {
},
remote: {
url: "/search/indexed_validators_by_eth1_addresses/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
$(input_container_selector).typeahead(
diff --git a/static/js/turnstile.js b/static/js/turnstile.js
new file mode 100644
index 0000000000..7934f5fcca
--- /dev/null
+++ b/static/js/turnstile.js
@@ -0,0 +1,98 @@
+function getCookie(cname) {
+ var name = cname + "="
+ var ca = document.cookie.split(";")
+ for (var i = 0; i < ca.length; i++) {
+ var c = ca[i]
+ while (c.charAt(0) == " ") {
+ c = c.substring(1)
+ }
+ if (c.indexOf(name) == 0) {
+ return c.substring(name.length, c.length)
+ }
+ }
+ return ""
+}
+
+function renderTurnStile(){
+
+ if(!window.turnstile || getCookie("turnstile") === "verified") return
+
+ if(window.isRequestingTurnstileToken) return
+ window.isRequestingTurnstileToken = true
+
+ window.turnstileWidgetId = turnstile.render('#turnstileModalContent', {
+ sitekey: window.turnstileSiteKey,
+ theme: 'auto',
+ callback: function(token) {
+ window.turnstileToken = token;
+ console.log(`Challenge Success ${token}`);
+ verifyTurnStileToken(()=>{
+ window.isRequestingTurnstileToken = false
+ })
+ },
+ 'before-interactive-callback': function() {
+ $('#turnstileModal').modal('show');
+ },
+ 'after-interactive-callback': function() {
+ $('#turnstileModal').modal('hide');
+ },
+ 'error-callback': function(error) {
+ console.log(`error callback called with ${error}`);
+ window.isRequestingTurnstileToken = false
+ },
+ 'expired-callback': function() {
+ window.isRequestingTurnstileToken = false
+ },
+ 'timeout-callback': function() {
+ window.isRequestingTurnstileToken = false
+ },
+ 'unsupported-callback': function() {
+ console.log('unsupported callback called')
+ },
+ });
+}
+
+function _turnstileCb() {
+ // onSiteLoad turnstile iframe loaded, show modal if cookie not set
+ console.debug('_turnstileCb called');
+ renderTurnStile()
+}
+
+function waitForTurnstileToken(cb) {
+ if(window.turnstileSiteKey && !window.turnstileToken && !window.isRequestingTurnstileToken){
+ renderTurnStile()
+ }
+ if(window.turnstileSiteKey && !window.turnstileToken && getCookie("turnstile") !== "verified") {//we want it to match
+ setTimeout(waitForTurnstileToken.bind(this,cb), 50);//wait 50 milliseconds then recheck
+ return;
+ } else {
+ cb && cb()
+ }
+}
+
+function verifyTurnStileToken(cb){
+ fetch('/turnstile/verify', {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-TURNSTILE-TOKEN': window.turnstileToken
+ }
+ }).then((res)=>{
+ cb && cb()
+ }).catch((err)=>{
+ console.log('error verifying turnstile token',err)
+ })
+}
+
+// resetting a widget causes it to rerender
+// rerender only if the cookie is not present
+function resetTurnstileToken() {
+ if(getCookie("turnstile") !== "verified") {
+ if(window.turnstile){
+ if(window.turnstileWidgetId){
+ window.turnstile.reset(window.turnstileWidgetId);
+ window.turnstileToken = ""
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/static/js/validatorRewards.js b/static/js/validatorRewards.js
index 16d8bcd5a9..cef52d6679 100644
--- a/static/js/validatorRewards.js
+++ b/static/js/validatorRewards.js
@@ -7,6 +7,18 @@ var subsTable = null
// let validators = []
function create_typeahead(input_container) {
+
+ function prepare(query,settings){
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
+ return settings
+ }
+
var timeWait = 0
var debounce = function (context, func) {
var timeout, result
@@ -15,7 +27,9 @@ function create_typeahead(input_container) {
var args = arguments,
later = function () {
timeout = null
- result = func.apply(context, args)
+ waitForTurnstileToken(()=>{
+ result = func.apply(context, args)
+ })
}
clearTimeout(timeout)
timeout = setTimeout(later, timeWait)
@@ -37,11 +51,16 @@ function create_typeahead(input_container) {
// use prepare hook to modify the rateLimitWait parameter on input changes
// NOTE: we only need to do this for the first function because testing showed that queries are executed/queued in order
// No need to update `timeWait` multiple times.
- prepare: function (_, settings) {
- var cur_query = $(input_container).val()
- timeWait = 4000 - Math.min(cur_query.length, 5) * 500
+ prepare: function (query, settings) {
+ timeWait = 4000 - Math.min(query.length, 5) * 500
// "wildcard" can't be used anymore, need to set query wildcard ourselves now
- settings.url = settings.url.replace("%QUERY", encodeURIComponent(cur_query))
+ settings.url = settings.url.replace("%QUERY", encodeURIComponent(query))
+ settings.beforeSend = function(jqXHR){
+ jqXHR.setRequestHeader('X-TURNSTILE-TOKEN', window.turnstileToken)
+ }
+ settings.complete = function(){
+ resetTurnstileToken()
+ }
return settings
},
},
@@ -55,7 +74,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_eth1_addresses/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhEth1Addresses.remote.transport._get = debounce(bhEth1Addresses.remote.transport, bhEth1Addresses.remote.transport._get)
@@ -67,7 +86,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_name/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhName.remote.transport._get = debounce(bhName.remote.transport, bhName.remote.transport._get)
@@ -79,7 +98,7 @@ function create_typeahead(input_container) {
},
remote: {
url: "/search/indexed_validators_by_graffiti/%QUERY",
- wildcard: "%QUERY",
+ prepare:prepare,
},
})
bhGraffiti.remote.transport._get = debounce(bhGraffiti.remote.transport, bhGraffiti.remote.transport._get)
diff --git a/templates/charts.html b/templates/charts.html
index 8d94b2c105..ee43082383 100644
--- a/templates/charts.html
+++ b/templates/charts.html
@@ -218,10 +218,12 @@
function fetchChart(chartHolderId) {
return new Promise((resolve, reject) => {
- fetch(`/charts/${chartHolderId}/data`)
- .then(res => res.json())
- .then(resolve)
- .catch(reject)
+ waitForTurnstileToken(()=>{
+ fetch(`/charts/${chartHolderId}/data`,{ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}})
+ .then(res => res.json())
+ .then(resolve)
+ .catch(reject)
+ })
})
}
diff --git a/templates/gasnow.html b/templates/gasnow.html
index 3ada10d750..fda10d11bf 100644
--- a/templates/gasnow.html
+++ b/templates/gasnow.html
@@ -528,12 +528,30 @@
methods: {
tick: function () {
if (this.updateIn <= 0) {
- $.getJSON('/gasnow/data', function (response) {
- // console.log('gasnow data', response)
- this.page = response;
-
- document.title = (response.data.rapid / 1e9).toFixed(0) + "-" + (response.data.fast / 1e9).toFixed(0) + " GWei | Ethereum (ETH) Mainnet - GasNow - beaconcha.in - " + new Date().getFullYear();
- }.bind(this));
+ waitForTurnstileToken(()=>{
+ fetch('/gasnow/data', {
+ headers: {'X-TURNSTILE-TOKEN': window.turnstileToken}
+ })
+ .then((res)=>{
+ if (!res.ok) {
+ throw new Error(`Failed with status: ${res.status}`)
+ }
+ if(window.turnstile){
+ window.turnstile.reset(window.turnstileWidgetId);
+ window.turnstileToken = "";
+ }
+ return res.json()
+ })
+ .then((result)=>{
+ this.page = result;
+ document.title = (result.data.rapid / 1e9).toFixed(0) + "-" + (result.data.fast / 1e9).toFixed(0) + " GWei | Ethereum (ETH) Mainnet - GasNow - beaconcha.in - " + new Date().getFullYear();
+ }).catch((err)=>{
+ console.log(err)
+ })
+ .finally(()=>{
+ resetTurnstileToken()
+ })
+ })
this.updateIn = 5;
this.progress = 0;
} else {
diff --git a/templates/layout.html b/templates/layout.html
index 0d4e31065a..6a7f37e4f3 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -36,6 +36,12 @@
+
+ {{ if not (eq $.TurnstileSiteKey "") }}
+
+ {{ end }}
@@ -480,6 +500,13 @@
Links
GoDebug.initialize({{ . }})
{{ end }}
+
+ {{ if not (eq $.TurnstileSiteKey "") }}
+
+
+ {{ end }}