diff --git a/app/App.js b/app/App.js index 8352db2..bf10933 100644 --- a/app/App.js +++ b/app/App.js @@ -9,7 +9,6 @@ import { PSDENOMINATIONS, COLORS, PAINT } from './constants'; export default class App { constructor() { this.blockRefs = []; - this.mempoolRefs = []; this.blockList = document.getElementById('blockList'); this.connectionStatus = document.getElementById('connectionStatus'); this.hero = document.getElementById('hero'); @@ -109,32 +108,29 @@ export default class App { fetch('https://insight.dash.org/insight-api/block/' + data) .then(resp => resp.json()) .then(data => { - let mined = []; + let leftovers = []; for (var i in data.tx) { const txid = data.tx[i]; let paint = document.getElementById(txid); if (paint) { - mined.push(paint); completedBlock.insertBefore(paint, completedBlock.firstChild); } } - this.mempoolRefs = this.mempoolRefs.filter(item => !mined.includes(item)); - this.mempoolRefs.forEach(item => { - item.classList.add('stale'); - item.data_ignored = item.data_ignored ? item.data_ignored + 1 : 1; - }); - this.mempoolRefs.filter(item => { - if (item.data_ignored > 4) { - try { - this.hero.removeChild(item); - } catch (err) { } - return false; + Array.from(this.hero.children).forEach(item => { + if (item.data_ignored > 3) { + item.remove(); + } else { + if (item.data_ignored) { + item.data_ignored++; + } else { + item.classList.add('stale'); + item.data_ignored = 1; + } } - return true; }); completedBlock.appendChild(blockLink); if (this.blockRefs.unshift(this.completedBlock) > 8) { - let toDelete = this.blockRefs.pop(); + var toDelete = this.blockRefs.pop(); if (toDelete) { toDelete.remove(); } @@ -187,10 +183,6 @@ export default class App { paint.style.setProperty('--size', Math.log(1 + tx.value)/Math.log(2)); paint.style.setProperty('--rotation', tx.rotation * 360 + 'deg'); paint.style.setProperty('--color', tx.color); - if (addToMempool && this.mempoolRefs.unshift(paint) > 200) { - let toDelete = this.mempoolRefs.pop(); - toDelete.remove(); - } target.appendChild(paint); } } diff --git a/app/constants.js b/app/constants.js index e2c0886..46bd483 100644 --- a/app/constants.js +++ b/app/constants.js @@ -22,8 +22,7 @@ export const PAINT = { 'paint-big07.svg', 'paint-big08.svg', 'paint-big09.svg', - 'paint-big00.svg', - 'paint-big01.svg', + 'paint-big10.svg', 'paint-big11.svg', 'paint-big12.svg' ], @@ -37,8 +36,7 @@ export const PAINT = { 'paint07.svg', 'paint08.svg', 'paint09.svg', - 'paint00.svg', - 'paint01.svg', - 'paint11.svg' + 'paint10.svg', + 'paint11.svg', ] }; diff --git a/app/styles/main.css b/app/styles/main.css index f847e77..cc44c4d 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -13,7 +13,6 @@ body { background-color: #bbb; color: black; height: 100vh; - overflow: hidden; } * { -webkit-box-sizing: inherit; @@ -45,7 +44,7 @@ a { overflow: hidden; } #hero { - position: absolute; + position: fixed; left: 41.125%; top: 50%; width: 77.5vw;