Remove relays script (#117)

* Adds remove-relays script and operations templates. Bumps version to v0.3.1 * Adds ops templates * Bump to v0.3.2 & fix ops templates for remove relays & logging in remove relays script
anyone-protocol · Aug 21, 2024 · 7ee8b36 · 7ee8b36
1 parent bd94e74
commit 7ee8b36
Show file tree

Hide file tree

Showing 37 changed files with 49 additions and 44 deletions.
diff --git a/operations/cancel-distribution-dev.hcl b/operations/cancel-distribution-dev.hcl
@@ -11,7 +11,7 @@ job "cancel-distribution-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/cancel-distribution.ts"]

diff --git a/operations/cancel-distribution-live.hcl b/operations/cancel-distribution-live.hcl
@@ -11,7 +11,7 @@ job "cancel-distribution-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/cancel-distribution.ts"]

diff --git a/operations/cancel-distribution-stage.hcl b/operations/cancel-distribution-stage.hcl
@@ -11,7 +11,7 @@ job "cancel-distribution-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/cancel-distribution.ts"]

diff --git a/operations/deploy-distribution-dev.hcl b/operations/deploy-distribution-dev.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-dev" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/deploy-distribution-live.hcl b/operations/deploy-distribution-live.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-live" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/deploy-distribution-stage.hcl b/operations/deploy-distribution-stage.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-stage" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/deploy-relay-registry-dev.hcl b/operations/deploy-relay-registry-dev.hcl
@@ -11,7 +11,7 @@ job "deploy-relay-registry-dev" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/deploy-relay-registry-live.hcl b/operations/deploy-relay-registry-live.hcl
@@ -11,7 +11,7 @@ job "deploy-relay-registry-live" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/deploy-relay-registry-stage.hcl b/operations/deploy-relay-registry-stage.hcl
@@ -11,7 +11,7 @@ job "deploy-relay-registry-stage" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["deploy"]

diff --git a/operations/dev-tests/add-relays-dev.hcl b/operations/dev-tests/add-relays-dev.hcl
@@ -11,7 +11,7 @@ job "add-relays-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/relay-registry/add-relays.ts"]

diff --git a/operations/dev-tests/add-relays-stage.hcl b/operations/dev-tests/add-relays-stage.hcl
@@ -11,7 +11,7 @@ job "add-relays-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/relay-registry/add-relays.ts"]

diff --git a/operations/dev-tests/add-scores-dev.hcl b/operations/dev-tests/add-scores-dev.hcl
@@ -12,7 +12,7 @@ job "add-scores-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/add-scores.ts"]

diff --git a/operations/dev-tests/add-scores-stage.hcl b/operations/dev-tests/add-scores-stage.hcl
@@ -12,7 +12,7 @@ job "add-scores-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/add-scores.ts"]

diff --git a/operations/evolve-distribution-dev.hcl b/operations/evolve-distribution-dev.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-dev" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/evolve-distribution-live.hcl b/operations/evolve-distribution-live.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-live" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/evolve-distribution-stage.hcl b/operations/evolve-distribution-stage.hcl
@@ -11,7 +11,7 @@ job "deploy-distribution-stage" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/evolve-relay-registry-dev.hcl b/operations/evolve-relay-registry-dev.hcl
@@ -11,7 +11,7 @@ job "evolve-relay-registry-dev" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/evolve-relay-registry-live.hcl b/operations/evolve-relay-registry-live.hcl
@@ -11,7 +11,7 @@ job "evolve-relay-registry-live" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/evolve-relay-registry-stage.hcl b/operations/evolve-relay-registry-stage.hcl
@@ -11,7 +11,7 @@ job "evolve-relay-registry-stage" {
 
         config {
             network_mode = "host"
-            image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+            image = "ghcr.io/ator-development/smart-contracts:0.3.2"
             entrypoint = ["npm"]
             command = "run"
             args = ["evolve"]

diff --git a/operations/remove-relays-dev.hcl b/operations/remove-relays-dev.hcl
@@ -11,10 +11,11 @@ job "remove-relays-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/relay-registry/remove-relays.ts"]
+      volumes = [ "data/data.json:/usr/src/app/smartweave/data/data.json" ]
     }
 
     vault {
@@ -24,7 +25,7 @@ job "remove-relays-dev" {
     template {
       data = <<EOH
       {{with secret "kv/relay-registry/dev"}}
-        RELAY_REGISTRY_OWNER_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
+        RELAY_REGISTRY_OPERATOR_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
         CONSUL_TOKEN="{{.Data.data.CONSUL_TOKEN}}"
       {{end}}
       EOH

diff --git a/operations/remove-relays-live.hcl b/operations/remove-relays-live.hcl
@@ -11,10 +11,11 @@ job "remove-relays-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/relay-registry/remove-relays.ts"]
+      volumes = [ "data/data.json:/usr/src/app/smartweave/data/data.json" ]
     }
 
     vault {
@@ -24,7 +25,7 @@ job "remove-relays-live" {
     template {
       data = <<EOH
       {{with secret "kv/relay-registry/live"}}
-        RELAY_REGISTRY_OWNER_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
+        RELAY_REGISTRY_OPERATOR_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
         CONSUL_TOKEN="{{.Data.data.CONSUL_TOKEN}}"
       {{end}}
       EOH

diff --git a/operations/remove-relays-stage.hcl b/operations/remove-relays-stage.hcl
@@ -11,10 +11,11 @@ job "remove-relays-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/relay-registry/remove-relays.ts"]
+      volumes = [ "data/data.json:/usr/src/app/smartweave/data/data.json" ]
     }
 
     vault {
@@ -24,7 +25,7 @@ job "remove-relays-stage" {
     template {
       data = <<EOH
       {{with secret "kv/relay-registry/stage"}}
-        RELAY_REGISTRY_OWNER_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
+        RELAY_REGISTRY_OPERATOR_KEY="{{.Data.data.RELAY_REGISTRY_OWNER_KEY}}"
         CONSUL_TOKEN="{{.Data.data.CONSUL_TOKEN}}"
       {{end}}
       EOH
@@ -36,7 +37,7 @@ job "remove-relays-stage" {
       data = <<EOH
       {
         "fingerprints": [
-          
+
         ]
       }
       EOH

diff --git a/operations/set-distribution-bonus-dev.hcl b/operations/set-distribution-bonus-dev.hcl
@@ -11,7 +11,7 @@ job "set-distribution-bonus-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-distribution-bonus.ts"]

diff --git a/operations/set-distribution-bonus-live.hcl b/operations/set-distribution-bonus-live.hcl
@@ -11,7 +11,7 @@ job "set-distribution-bonus-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-distribution-bonus.ts"]

diff --git a/operations/set-distribution-bonus-stage.hcl b/operations/set-distribution-bonus-stage.hcl
@@ -11,7 +11,7 @@ job "set-distribution-bonus-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-distribution-bonus.ts"]

diff --git a/operations/set-distribution-multipliers-dev.hcl b/operations/set-distribution-multipliers-dev.hcl
@@ -11,7 +11,7 @@ job "set-distribution-multipliers-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-multipliers.ts"]

diff --git a/operations/set-distribution-multipliers-live.hcl b/operations/set-distribution-multipliers-live.hcl
@@ -11,7 +11,7 @@ job "set-distribution-multipliers-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-multipliers.ts"]

diff --git a/operations/set-distribution-multipliers-stage.hcl b/operations/set-distribution-multipliers-stage.hcl
@@ -11,7 +11,7 @@ job "set-distribution-multipliers-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-multipliers.ts"]

diff --git a/operations/set-distribution-previous-tracking-limit-dev.hcl b/operations/set-distribution-previous-tracking-limit-dev.hcl
@@ -11,7 +11,7 @@ job "set-previous-distribution-tracking-limit-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/operations/set-distribution-previous-tracking-limit-live.hcl b/operations/set-distribution-previous-tracking-limit-live.hcl
@@ -11,7 +11,7 @@ job "set-previous-distribution-tracking-limit-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/operations/set-distribution-previous-tracking-limit-stage.hcl b/operations/set-distribution-previous-tracking-limit-stage.hcl
@@ -11,7 +11,7 @@ job "set-previous-distribution-tracking-limit-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/operations/set-token-distribution-rate-dev.hcl b/operations/set-token-distribution-rate-dev.hcl
@@ -11,7 +11,7 @@ job "set-token-distribution-rate-dev" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/operations/set-token-distribution-rate-live.hcl b/operations/set-token-distribution-rate-live.hcl
@@ -11,7 +11,7 @@ job "set-token-distribution-rate-live" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/operations/set-token-distribution-rate-stage.hcl b/operations/set-token-distribution-rate-stage.hcl
@@ -11,7 +11,7 @@ job "set-token-distribution-rate-stage" {
 
     config {
       network_mode = "host"
-      image = "ghcr.io/ator-development/smart-contracts:0.3.1"
+      image = "ghcr.io/ator-development/smart-contracts:0.3.2"
       entrypoint = ["npx"]
       command = "ts-node"
       args = ["scripts/distribution/set-token-distribution-rate.ts"]

diff --git a/smartweave/package-lock.json b/smartweave/package-lock.json
diff --git a/smartweave/package.json b/smartweave/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ator/smart-contracts-smartweave",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "contributors": [
     "ATOR Labs",
     "Jim Toth <[email protected]>"

diff --git a/smartweave/scripts/relay-registry/remove-relays.ts b/smartweave/scripts/relay-registry/remove-relays.ts
@@ -74,7 +74,7 @@ async function main() {
 
     const input: RemoveClaimable = { function: 'removeClaimable', fingerprint }
 
-    console.log(`Runnning sanity check for ${input}`)
+    console.log(`Runnning sanity check for ${JSON.stringify(input)}`)
     try {
       // NB: Dry-run sanity check
       const { cachedValue: { state } } = await contract.readState()
@@ -89,7 +89,9 @@ async function main() {
         .connect(signer)
         .writeInteraction<RemoveClaimable>(input)
 
-      console.log(`Remove relay ${input} result ${result?.originalTxId}`)
+      console.log(
+        `Remove relay ${JSON.stringify(input)} result ${result?.originalTxId}`
+      )
     } catch (error) {
       console.error(error)
       console.log('Continuing execution')