From ef6177e0077dd092002c3d896705cf5ab13ba574 Mon Sep 17 00:00:00 2001
From: Raffe <andrew@dogecoin.com>
Date: Tue, 29 Oct 2024 12:27:34 +1100
Subject: [PATCH] dogenet: 0.1.7

Uses --reflector option to obtain public IP address from
https://reflector.dogecoin.org/me

This is more reliable (retries) and shows errors in the logs,
which can now be viewed in DPanel.
---
 dogenet/manifest.json | 2 +-
 dogenet/pup.nix       | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/dogenet/manifest.json b/dogenet/manifest.json
index 4593a41..e1eff3e 100644
--- a/dogenet/manifest.json
+++ b/dogenet/manifest.json
@@ -14,7 +14,7 @@
   "container": {
     "build": {
       "nixFile": "pup.nix",
-      "nixFileSha256": "9af531398be4a5a139625663c0349d7af7d1c0ba25cdd627c9bdff219a5f41d7"
+      "nixFileSha256": "1d0e4f47a954a6ffbf21ed59bf59173fb7f309e22b6c3bf2521cccab95d1148b"
     },
     "services": [
       {
diff --git a/dogenet/pup.nix b/dogenet/pup.nix
index ee182aa..d643585 100644
--- a/dogenet/pup.nix
+++ b/dogenet/pup.nix
@@ -2,15 +2,13 @@
 
 let
   dogenet_upstream = pkgs.callPackage (pkgs.fetchurl {
-    url = "https://raw.githubusercontent.com/dogeorg/dogebox-nur-packages/0fe8f2bb6d1fb842f51145d87adb04d89e81046a/pkgs/dogenet/default.nix";
-    sha256 = "sha256-7AvXs1EUt66qiddSuVzVMEn0JZWmcObhRtEIEKcdQyE=";
+    url = "https://raw.githubusercontent.com/dogeorg/dogebox-nur-packages/c20d95a0695fdd0043e2e15d5f7967ed565e228d/pkgs/dogenet/default.nix";
+    sha256 = "sha256-hJ/74OtGf4EEj+JSTplgcSc1/jX4baxOI2QPeqOoaqI=";
   }) {};
 
   dogenet = pkgs.writeScriptBin "run.sh" ''
     #!${pkgs.bash}/bin/bash
-    export KEY=`cat /storage/delegated.key`
-    IP=`${pkgs.curl}/bin/curl https://reflector.dogecoin.org/me | ${pkgs.jq}/bin/jq -r .ip`
-    ${dogenet_upstream}/bin/dogenet --handler ''${DBX_PUP_IP}:42068 --web ''${DBX_PUP_IP}:8080 --public ''${IP}:42069 --dir /storage
+    KEY=`cat /storage/delegated.key` ${dogenet_upstream}/bin/dogenet --handler ''${DBX_PUP_IP}:42068 --web ''${DBX_PUP_IP}:8080 --dir /storage --reflector
   '';
 in
 {