merge from main

components/DashboardFooter.vue

@@ -61,7 +61,7 @@ const getLink = (address: string, type: string) => {
 };
 
 const openCommitUrl = () => {
-  const url = `https://github.com/ATOR-Development/ator-relay-dashboard/commit/${commitHash}`;
+  const url = `https://github.com/anyone-protocol/ator-relay-dashboard/commit/${commitHash}`;
   window.open(url, '_blank');
 };
 

composables/ardb.ts

@@ -11,9 +11,10 @@ export async function getLatestBlockHeight(): Promise<number> {
   return height;
 }
 
-export async function calculateBlockHeightOneMonthAgo(
+export async function calculateMinimumQueryBlockHeight(
   latestHeight: number
 ): Promise<number> {
   const blocksPerMonth = 60 * 24 * 30;
-  return latestHeight - blocksPerMonth;
+  const twoWeeksAgo = Math.floor(blocksPerMonth / 2);
+  return latestHeight - twoWeeksAgo;
 }

deploy.mjs

@@ -1,7 +1,13 @@
 import Irys from '@irys/sdk'
 import { ANT, ArweaveSigner } from '@ar.io/sdk'
+import { copyFileSync } from 'fs'
+
+// ator-dashboard process id
+// const processId = '9UpvN6H7sMo0vkuQeou3Ra0pZguWavtpt_8lfqPQlI8'
+
+// anyone process id
+const processId = 'lZKDfIa5JiWQ8ojjXiRSey_81Bftbib4tLpIJh4UO0g' 
 
-const processId = '9UpvN6H7sMo0vkuQeou3Ra0pZguWavtpt_8lfqPQlI8'
 const DEPLOY_FOLDER = './.output/public'
 const IRYS_NODE = 'https://node2.irys.xyz/'
 const jwk = JSON.parse(
@@ -21,6 +27,10 @@ if (process.env.PHASE === 'stage') {
 }
 
 async function deploy() {
+  // Hack: copy index.html to a file named "*" so it gets added to manifest as
+  //       a wildcard route
+  copyFileSync(DEPLOY_FOLDER + '/index.html', DEPLOY_FOLDER + '/*')
+
   const buildArtifact = await irys.uploadFolder(DEPLOY_FOLDER, {
     indexFile: 'index.html'
   })
@@ -46,4 +56,4 @@ async function deploy() {
   )
 }
 
-deploy().then().catch(err => console.error(err))
+deploy().then().catch(err => { console.error(err); process.exit(1); })

nuxt.config.ts

@@ -63,7 +63,7 @@ export default defineNuxtConfig({
       distributionDeployer: 'G5tXjZS4SaMJNwOENZYgymvc6Zxp2Wws4Qf8wB0b',
       warpGateway: 'https://gw.warp.cc/gateway/v2',
       githubNewIssueUrl:
-        'https://github.com/ATOR-Development/ator-dashboard/issues/new',
+        'https://github.com/anyone-protocol/ator-dashboard/issues/new',
       phase: 'dev',
       supportWalletPublicKeyBase64:
         'K3jnSGVyHj4kSzgce3+k8gJsfHvUoQeJMNPO8CcsO2s=',

operations/deploy-dashboard-dev.hcl

@@ -11,7 +11,7 @@ job "deploy-relay-dashboard-dev" {
         driver = "docker"
 
         config {
-            image = "ghcr.io/ator-development/ator-relay-dashboard:[[.deploy]]"
+            image = "ghcr.io/anyone-protocol/ator-relay-dashboard:[[.deploy]]"
             force_pull = true
             entrypoint = ["pnpm"]
             command = "run"
@@ -29,7 +29,7 @@ job "deploy-relay-dashboard-dev" {
             NUXT_PUBLIC_DISTRIBUTION_CONTRACT="[[ consulKey "smart-contracts/dev/distribution-address" ]]"
             NUXT_PUBLIC_FACILITATOR_CONTRACT="[[ consulKey "facilitator/sepolia/dev/address" ]]"
             NUXT_PUBLIC_SEPOLIA_ATOR_TOKEN_CONTRACT="[[ consulKey "ator-token/sepolia/dev/address" ]]"
-            NUXT_PUBLIC_WARP_GATEWAY = "https://warp-dre-node-dev.dmz.ator.dev"
+            NUXT_PUBLIC_WARP_GATEWAY = "https://dre-dev.ec.anyone.tech"
             NUXT_PUBLIC_SUPPORT_WALLET_PUBLIC_KEY_BASE64 = "{{.Data.data.SUPPORT_ADDRESS_BASE64}}"
             NUXT_PUBLIC_REGISTRATOR_CONTRACT="[[ consulKey "registrator/sepolia/dev/address" ]]"
             {{with secret "kv/dashboard/dev"}}

operations/deploy-dashboard-live.hcl

@@ -11,7 +11,7 @@ job "deploy-relay-dashboard-live" {
         driver = "docker"
 
         config {
-            image = "ghcr.io/ator-development/ator-relay-dashboard:[[.deploy]]"
+            image = "ghcr.io/anyone-protocol/ator-relay-dashboard:[[.deploy]]"
             entrypoint = ["pnpm"]
             command = "run"
             args = ["deploy"]
@@ -28,7 +28,7 @@ job "deploy-relay-dashboard-live" {
             NUXT_PUBLIC_DISTRIBUTION_CONTRACT="[[ consulKey "smart-contracts/live/distribution-address" ]]"
             NUXT_PUBLIC_FACILITATOR_CONTRACT="[[ consulKey "facilitator/sepolia/live/address" ]]"
             NUXT_PUBLIC_SEPOLIA_ATOR_TOKEN_CONTRACT="[[ consulKey "ator-token/sepolia/live/address" ]]"
-            NUXT_PUBLIC_WARP_GATEWAY = "https://warp-dre-node-live.dmz.ator.dev"
+            NUXT_PUBLIC_WARP_GATEWAY = "https://dre.ec.anyone.tech"
             NUXT_PUBLIC_REGISTRATOR_CONTRACT="[[ consulKey "registrator/sepolia/live/address" ]]"
             {{with secret "kv/dashboard/live"}}
                 PERMAWEB_KEY="{{.Data.data.DASHBOARD_OWNER_KEY}}"

operations/deploy-dashboard-stage.hcl

@@ -11,7 +11,7 @@ job "deploy-relay-dashboard-stage" {
         driver = "docker"
 
         config {
-            image = "ghcr.io/ator-development/ator-relay-dashboard:[[.deploy]]"
+            image = "ghcr.io/anyone-protocol/ator-relay-dashboard:[[.deploy]]"
             force_pull = true
             entrypoint = ["pnpm"]
             command = "run"
@@ -29,7 +29,7 @@ job "deploy-relay-dashboard-stage" {
             NUXT_PUBLIC_DISTRIBUTION_CONTRACT="[[ consulKey "smart-contracts/stage/distribution-address" ]]"
             NUXT_PUBLIC_FACILITATOR_CONTRACT="[[ consulKey "facilitator/sepolia/stage/address" ]]"
             NUXT_PUBLIC_SEPOLIA_ATOR_TOKEN_CONTRACT="[[ consulKey "ator-token/sepolia/stage/address" ]]"
-            NUXT_PUBLIC_WARP_GATEWAY = "https://warp-dre-node-stage.dmz.ator.dev"
+            NUXT_PUBLIC_WARP_GATEWAY = "https://dre-stage.ec.anyone.tech"
             NUXT_PUBLIC_REGISTRATOR_CONTRACT="[[ consulKey "registrator/sepolia/stage/address" ]]"
             {{with secret "kv/dashboard/stage"}}
                 PERMAWEB_KEY="{{.Data.data.DASHBOARD_OWNER_KEY}}"

operations/scripts/fund.mjs

@@ -0,0 +1,16 @@
+import Irys from '@irys/sdk'
+
+const IRYS_NODE = 'https://node2.irys.xyz/'
+const jwk = JSON.parse(
+  Buffer.from(process.env.PERMAWEB_KEY || 'NO_KEY', 'base64').toString('utf-8')
+)
+const irys = new Irys({ url: IRYS_NODE, token: 'arweave', key: jwk })
+
+async function fund() {
+  const fundResponse = await irys.fund(irys.utils.toAtomic('0.1'))
+
+  console.log('Fund response')
+  console.dir(fundResponse)
+}
+
+fund().then().catch(err => { console.error(err); process.exit(1); })

operations/scripts/get-balance.mjs

@@ -0,0 +1,14 @@
+import Irys from '@irys/sdk'
+
+const IRYS_NODE = 'https://node2.irys.xyz/'
+const jwk = JSON.parse(
+  Buffer.from(process.env.PERMAWEB_KEY || 'NO_KEY', 'base64').toString('utf-8')
+)
+const irys = new Irys({ url: IRYS_NODE, token: 'arweave', key: jwk })
+
+async function getBalance() {
+  const balance = await irys.getLoadedBalance()
+  console.log('Irys AR balance', irys.utils.fromAtomic(balance))
+}
+
+getBalance().then().catch(err => { console.error(err); process.exit(1); })

stores/useMetricsStore.ts

@@ -6,7 +6,7 @@ import { parseTimestampTag } from '@/utils/transactions';
 import {
   useArdb,
   getLatestBlockHeight,
-  calculateBlockHeightOneMonthAgo,
+  calculateMinimumQueryBlockHeight,
 } from '@/composables/ardb';
 import { useTxCache } from '@/composables/txCache';
 
@@ -71,7 +71,7 @@ export interface MetricsStoreState {
   };
   relayMetricsPending: boolean;
   latestHeight: number | null;
-  oneMonthAgoHeight: number | null;
+  minimumHeight: number | null;
 }
 
 const logger = new Logger('MetricsStore');
@@ -92,7 +92,7 @@ export const useMetricsStore = defineStore('metrics', {
       },
       relayMetricsPending: true,
       latestHeight: null,
-      oneMonthAgoHeight: null,
+      minimumHeight: null,
     };
   },
   getters: {},
@@ -125,13 +125,13 @@ export const useMetricsStore = defineStore('metrics', {
       if (!this.latestHeight) {
         this.latestHeight = await getLatestBlockHeight();
       }
-      if (!this.oneMonthAgoHeight) {
-        this.oneMonthAgoHeight = await calculateBlockHeightOneMonthAgo(
+      if (!this.minimumHeight) {
+        this.minimumHeight = await calculateMinimumQueryBlockHeight(
           this.latestHeight
         );
       }
       console.log('this.latestHeight', this.latestHeight);
-      console.log('this.oneMonthAgoHeight', this.oneMonthAgoHeight);
+      console.log('this.minimumHeight', this.minimumHeight);
 
       const txCache = useTxCache();
 
@@ -140,12 +140,12 @@ export const useMetricsStore = defineStore('metrics', {
           .search('transactions')
           .from(runtimeConfig.public.metricsDeployer as string)
           .tags([
-            { name: 'Protocol', values: 'ator' },
+            // { name: 'Protocol', values: 'ator' },
             { name: 'Entity-Type', values: 'relay/metrics' },
           ])
           .limit(limit)
-          .min(this.oneMonthAgoHeight)
-          .max(this.latestHeight)
+          .min(this.minimumHeight)
+          // .max(this.latestHeight)
           .sort('HEIGHT_DESC')
           .find()) as ArdbTransaction[];
 
@@ -202,8 +202,8 @@ export const useMetricsStore = defineStore('metrics', {
       if (!this.latestHeight) {
         this.latestHeight = await getLatestBlockHeight();
       }
-      if (!this.oneMonthAgoHeight) {
-        this.oneMonthAgoHeight = await calculateBlockHeightOneMonthAgo(
+      if (!this.minimumHeight) {
+        this.minimumHeight = await calculateMinimumQueryBlockHeight(
           this.latestHeight
         );
       }
@@ -212,12 +212,12 @@ export const useMetricsStore = defineStore('metrics', {
           .search('transactions')
           .from(runtimeConfig.public.metricsDeployer as string)
           .tags([
-            { name: 'Protocol', values: 'ator' },
+            // { name: 'Protocol', values: 'ator' },
             { name: 'Entity-Type', values: 'validation/stats' },
           ])
           .limit(limit)
-          .min(this.oneMonthAgoHeight)
-          .max(this.latestHeight)
+          .min(this.minimumHeight)
+          // .max(this.latestHeight)
           .sort('HEIGHT_DESC')
           .find()) as ArdbTransaction[];