From f8c060fedde9ae69822219e93a2d3885bda13b81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20N=C3=A1jera?= Date: Thu, 1 Sep 2022 14:16:49 +0200 Subject: drop cardano testnet for preview --- config/doom/config.org | 2 +- config/shepherd/init.d/cardano.scm | 65 ++++++++------------------------------ 2 files changed, 14 insertions(+), 53 deletions(-) diff --git a/config/doom/config.org b/config/doom/config.org index fb10ce4..a2c0596 100644 --- a/config/doom/config.org +++ b/config/doom/config.org @@ -435,7 +435,7 @@ Emacs mode for managing ledger text files (defun on/cardano-set-network () (interactive) (let* ((networks '((:mainnet "/tmp/alinamn.socket" "http://localhost:8090" "--mainnet") - (:testnet "/tmp/alinatn.socket" "http://localhost:8091" "--testnet-magic" "1097911063") + (:preview "/tmp/alina-pr.socket" "http://localhost:8091" "--testnet-magic" "2") (:vasil "/home/titan/test-cardano/dev-vasil/bp-vasil.socket" "http://localhost:8093" "--testnet-magic" "9") )) (pick diff --git a/config/shepherd/init.d/cardano.scm b/config/shepherd/init.d/cardano.scm index 3c891b8..90fe281 100644 --- a/config/shepherd/init.d/cardano.scm +++ b/config/shepherd/init.d/cardano.scm @@ -6,38 +6,37 @@ (register-services (make - #:docstring "Cardano Test network ssh tunnel, node & psql" - #:provides '(testnet-ssh) + #:docstring "Cardano preview network ssh tunnel, node & psql" + #:provides '(preview-ssh) #:start (make-forkexec-constructor (list "ssh" "-NTv" "-o" "ServerAliveInterval=60" "-o" "ExitOnForwardFailure=yes" "-o" "StreamLocalBindUnlink=yes" - "-L" "/tmp/alinatn.socket:/run/cardano-node-testnet/socket" + "-L" "/tmp/alina-pr.socket:/run/cardano-node-preview/socket" "-L" "54321:localhost:5432" - "-R" "3005:localhost:3005" ;; Push to VPS vasil the block producer on 3005 + "-R" "3004:localhost:3004" ;; Push to VPS vasil the block producer on 3005 "cardano@alina") - #:log-file "/tmp/testnet-ssh.log") + #:log-file "/tmp/preview-ssh.log") #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C #:respawn? #t)) (register-services (make - #:docstring "Cardano Testnet wallet" - #:provides '(testnet-wallet) + #:docstring "Cardano preview wallet" + #:provides '(preview-wallet) #:start (make-forkexec-constructor (list "cardano-wallet" ;;(string-append (getenv "HOME") "/.cabal/bin/cardano-wallet") "serve" - "+RTS" "-T" "-RTS" "--port" "8091" - "--node-socket" "/tmp/alinatn.socket" - "--database" (string-append (getenv "HOME") "/test-cardano/testnet/wallet") - "--testnet" (string-append (getenv "HOME") "/test-cardano/config/testnet-byron-genesis.json")) - #:log-file (string-append (getenv "HOME") "/test-cardano/testnet/log/wallet.log")) + "--node-socket" "/tmp/alina-pr.socket" + "--database" (string-append (getenv "HOME") "/test-cardano/preview/wallet") + "--testnet" (string-append (getenv "HOME") "/dev/archlinux-ansible/roles/cardano/files/preview/byron-genesis.json")) + #:log-file (string-append (getenv "HOME") "/test-cardano/preview/log/wallet.log")) #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C - #:requires '(testnet-ssh))) + #:requires '(preview-ssh))) (register-services (make @@ -71,26 +70,6 @@ #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C #:requires '(mainnet-ssh))) -(register-services - (make - #:docstring "Vasil devnet node" - #:provides '(vasil-devnet) - #:start (make-forkexec-constructor - (list ;;(string-append (getenv "HOME") "/.cabal/bin/cardano-wallet") - "/home/titan/dev/cardano/cardano-node/dist-newstyle/build/x86_64-linux/ghc-8.10.7/cardano-node-1.35.0/x/cardano-node/build/cardano-node/cardano-node" - "run" - "+RTS" "-N2" "-A16m" "-qg" "-qb" "-RTS" - "--database-path" (string-append (getenv "HOME") "/test-cardano/dev-vasil/node") - "--socket-path" (string-append (getenv "HOME") "/test-cardano/dev-vasil/vasil.socket") - "--port" "3004" - "--config" (string-append (getenv "HOME") "/dev/cardano/cardano-world/docs/environments/vasil-dev/config.json") - "--topology" (string-append (getenv "HOME") "/dev/cardano/cardano-world/docs/environments/vasil-dev/relay-topology.json") - - ) - #:log-file (string-append (getenv "HOME") "/test-cardano/dev-vasil/log/node.log")) - #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C - #:respawn? #t)) - (register-services (make #:docstring "Vasil devnet block producer" @@ -113,7 +92,7 @@ #:environment-variables (list (string-append "LD_LIBRARY_PATH=" (getenv "HOME") "/.local/lib")) #:log-file (string-append (getenv "HOME") "/test-cardano/dev-vasil/log/bp-node.log")) #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C - #:requires '(testnet-ssh) + #:requires '(preview-ssh) #:respawn? #t)) (register-services @@ -149,21 +128,3 @@ #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C #:requires '(vasil-bp))) -(register-services - (make - #:docstring "Cardano Vasil wallet" - #:provides '(vasil-wallet) - #:start (make-forkexec-constructor - (list "cardano-wallet" - ;;(string-append (getenv "HOME") "/.cabal/bin/cardano-wallet") - "serve" - "+RTS" "-T" "-RTS" - "--port" "8093" - "--node-socket" (string-append (getenv "HOME") "/test-cardano/dev-vasil/vasil.socket") - "--database" (string-append (getenv "HOME") "/test-cardano/dev-vasil/wallet") - "--testnet" (string-append (getenv "HOME") "/dev/cardano/cardano-world/docs/environments/vasil-dev/byron-genesis.json") - ) - #:log-file (string-append (getenv "HOME") "/test-cardano/dev-vasil/log/wallet.log")) - - #:stop (make-kill-destructor 2) ;; 2 is SIGINT - interupt process stream, ctrl-C - #:requires '(vasil-devnet))) -- cgit v1.2.3