From 14ce5a4c3c44b7caf202b7aff58b1f60f64b87ec Mon Sep 17 00:00:00 2001 From: Joe Clapis Date: Mon, 7 Oct 2024 12:49:42 -0400 Subject: [PATCH 1/3] Added nodeset.io encryption support --- install/deploy/networks/holesky-dev.yml | 3 ++- install/deploy/networks/holesky.yml | 3 ++- install/deploy/networks/mainnet.yml | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install/deploy/networks/holesky-dev.yml b/install/deploy/networks/holesky-dev.yml index 9e3422c..fcb0c81 100644 --- a/install/deploy/networks/holesky-dev.yml +++ b/install/deploy/networks/holesky-dev.yml @@ -10,4 +10,5 @@ networkResources: txWatchUrl: https://holesky.etherscan.io/tx flashbotsProtectUrl: https://rpc-holesky.flashbots.net/ hyperdriveResources: - nodeSetApiUrl: https://staging.nodeset.io/api \ No newline at end of file + nodeSetApiUrl: https://staging.nodeset.io/api + encryptionPubkey: age1fp3e7p5tzmf2lws97zjyvz6ke9mazrdwp9qh3rx5jjdehftm45use0j90d \ No newline at end of file diff --git a/install/deploy/networks/holesky.yml b/install/deploy/networks/holesky.yml index c01f8d4..dd06e21 100644 --- a/install/deploy/networks/holesky.yml +++ b/install/deploy/networks/holesky.yml @@ -10,4 +10,5 @@ networkResources: txWatchUrl: https://holesky.etherscan.io/tx flashbotsProtectUrl: https://rpc-holesky.flashbots.net/ hyperdriveResources: - nodeSetApiUrl: https://nodeset.io/api \ No newline at end of file + nodeSetApiUrl: https://nodeset.io/api + encryptionPubkey: placeholder \ No newline at end of file diff --git a/install/deploy/networks/mainnet.yml b/install/deploy/networks/mainnet.yml index 76369bd..69ffe01 100644 --- a/install/deploy/networks/mainnet.yml +++ b/install/deploy/networks/mainnet.yml @@ -10,4 +10,5 @@ networkResources: txWatchUrl: https://etherscan.io/tx flashbotsProtectUrl: https://rpc.flashbots.net/ hyperdriveResources: - nodeSetApiUrl: https://nodeset.io/api \ No newline at end of file + nodeSetApiUrl: https://nodeset.io/api + encryptionPubkey: placeholder \ No newline at end of file From 41a1edf7423fe9ea7999591ff499d500cc67407d Mon Sep 17 00:00:00 2001 From: Joe Clapis Date: Tue, 8 Oct 2024 12:27:05 -0400 Subject: [PATCH 2/3] Updated daemons --- go.mod | 9 +++++---- go.sum | 20 ++++++++++++-------- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index a2816c4..7be0106 100644 --- a/go.mod +++ b/go.mod @@ -15,9 +15,9 @@ require ( github.com/goccy/go-json v0.10.3 github.com/mholt/archiver/v4 v4.0.0-alpha.8 github.com/mitchellh/go-homedir v1.1.0 - github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2 - github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2 - github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2 + github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2 + github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f + github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e github.com/nodeset-org/osha v0.3.1 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854 // DO NOT UPGRADE @@ -32,6 +32,7 @@ require ( ) require ( + filippo.io/age v1.2.0 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20240716105424-66b64c4bb379 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect @@ -136,7 +137,7 @@ require ( github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nodeset-org/nodeset-client-go v1.1.0 // indirect + github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963 // indirect github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect diff --git a/go.sum b/go.sum index 4e34d4a..57e15e7 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,5 @@ +c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805 h1:u2qwJeEvnypw+OCPUHmoZE3IqwfuN5kgDfo5MLzpNM0= +c2sp.org/CCTV/age v0.0.0-20240306222714-3ec4d716e805/go.mod h1:FomMrUJ2Lxt5jCLmZkG3FHa72zUprnhd3v/Z18Snm4w= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= @@ -17,6 +19,8 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo contrib.go.opencensus.io/exporter/jaeger v0.2.1 h1:yGBYzYMewVL0yO9qqJv3Z5+IRhPdU7e9o/2oKpX4YvI= contrib.go.opencensus.io/exporter/jaeger v0.2.1/go.mod h1:Y8IsLgdxqh1QxYxPC5IgXVmBaeLUeQFfBeBi9PbeZd0= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +filippo.io/age v1.2.0 h1:vRDp7pUMaAJzXNIWJVAZnEf/Dyi4Vu4wI8S1LBzufhE= +filippo.io/age v1.2.0/go.mod h1:JL9ew2lTN+Pyft4RiNGguFfOpewKwSHm5ayKD/A4004= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240716105424-66b64c4bb379 h1:shYAfOpsleWVaSwGxQjmi+BBIwzj5jxB1FTCpVqs0N8= github.com/AdaLogics/go-fuzz-headers v0.0.0-20240716105424-66b64c4bb379/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8= github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 h1:dIScnXFlF784X79oi7MzVT6GWqr/W1uUt0pB5CsDs9M= @@ -444,14 +448,14 @@ github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOEL github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2 h1:jJIn0GAO79+WeBUMPnQ8MPoc1yjTY8VKgh0eYRotmHQ= -github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2/go.mod h1:VexoJF9nmfyyL/hZ02p/Jc8LSD8Jf1RGb2ij7zO2lqw= -github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2 h1:xFYeiFwIhMQSS2ce/jeh4MDTPDM9L/Xb3NJDBw+NfEk= -github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2/go.mod h1:JiseFwKiyDFhrPvhpbMb/yLkSq3jhzGLM1Q3vg56CfQ= -github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2 h1:ovxQuBlwecLRsPXcZptfiq/Q3juQm4SXjMeH99LIxPc= -github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2/go.mod h1:z6/4HfLDncpR+bS1MhiMU+wKMeWDZLy5gLwvI+r4Z6E= -github.com/nodeset-org/nodeset-client-go v1.1.0 h1:VjpU8FmRm+K37BRuHpBSO+nl4VWsc2etCmtxVpvchtk= -github.com/nodeset-org/nodeset-client-go v1.1.0/go.mod h1:slpwejkJ/vYU9SKA3SYw4hIPJLzDUeQxcx+Cm04kkIA= +github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2 h1:vznKOA4BhvkNDjsHDgu/KNRK4tHGwRXDYJd0bb9v4gk= +github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2/go.mod h1:gFOp+B23AN47YhcKz8lKWv5jAJh/8+0iEOc96WxUdGQ= +github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f h1:ogjzXS/x5bbPL5IGiIO7SS+kEgCs79m8p/Xl5qjqxkY= +github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f/go.mod h1:NS0CuHVVWW++j933beSACsJXFBdcH5TKRzBXIJmnacQ= +github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e h1:YxeX8ydzRM3YcvmCZLW7Jk+1Sfo30kvRBk+TLOw+bPw= +github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e/go.mod h1:i6UK3Tiuz8Glm4HRcAgX/sNkloRpP3amWAfz3Ezg9bQ= +github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963 h1:DhjPEnbtzPUEG+/INKjNHs7Q5JYA2aUURttcOD4WvGI= +github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963/go.mod h1:TATOnCsIvDjC7C+h1izgw0+t35N40Hr/CxhgaLK78e4= github.com/nodeset-org/osha v0.3.1 h1:xHDjCswxGDazY/UsZ0QOpcu7gTVnEuUwXcKGVAz72lI= github.com/nodeset-org/osha v0.3.1/go.mod h1:47D6kYMuxYDTbul3w/YtE1LKA0hfzbXzCEC3M9oQlOU= github.com/nodeset-org/rocketpool-smartnode/v2 v2.0.0-olddev.0.20240729151944-127e460038df h1:6QxnKZQMlkPD33l1Q1dOhg1cHgr4kl0t/P/0JTf1BzU= From 7c4075b85cffdf044e806eb5487a86960417254b Mon Sep 17 00:00:00 2001 From: Joe Clapis Date: Tue, 8 Oct 2024 16:14:24 -0400 Subject: [PATCH 3/3] Updated deps --- go.mod | 10 +++++----- go.sum | 20 ++++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/go.mod b/go.mod index 7be0106..9775f9a 100644 --- a/go.mod +++ b/go.mod @@ -15,13 +15,13 @@ require ( github.com/goccy/go-json v0.10.3 github.com/mholt/archiver/v4 v4.0.0-alpha.8 github.com/mitchellh/go-homedir v1.1.0 - github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2 - github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f - github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e + github.com/nodeset-org/hyperdrive-constellation v1.0.0-rc1 + github.com/nodeset-org/hyperdrive-daemon v1.1.0-rc1 + github.com/nodeset-org/hyperdrive-stakewise v1.1.0-rc1 github.com/nodeset-org/osha v0.3.1 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/rivo/tview v0.0.0-20230208211350-7dfff1ce7854 // DO NOT UPGRADE - github.com/rocket-pool/node-manager-core v0.5.2-0.20241003024529-05c829d805c6 + github.com/rocket-pool/node-manager-core v0.5.2-0.20241008173134-e04f3c1b9051 github.com/rocket-pool/rocketpool-go/v2 v2.0.0-b2.0.20240709170030-c27aeb5fb99b github.com/stretchr/testify v1.9.0 github.com/tyler-smith/go-bip39 v1.1.0 @@ -137,7 +137,7 @@ require ( github.com/multiformats/go-multihash v0.2.3 // indirect github.com/multiformats/go-varint v0.0.7 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963 // indirect + github.com/nodeset-org/nodeset-client-go v1.2.0 // indirect github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect diff --git a/go.sum b/go.sum index 57e15e7..22bdac9 100644 --- a/go.sum +++ b/go.sum @@ -448,14 +448,14 @@ github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOEL github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2 h1:vznKOA4BhvkNDjsHDgu/KNRK4tHGwRXDYJd0bb9v4gk= -github.com/nodeset-org/hyperdrive-constellation v1.0.0-b2.0.20241007164006-9d0f52c8f3d2/go.mod h1:gFOp+B23AN47YhcKz8lKWv5jAJh/8+0iEOc96WxUdGQ= -github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f h1:ogjzXS/x5bbPL5IGiIO7SS+kEgCs79m8p/Xl5qjqxkY= -github.com/nodeset-org/hyperdrive-daemon v1.1.0-b2.0.20241007163607-e439ed3db62f/go.mod h1:NS0CuHVVWW++j933beSACsJXFBdcH5TKRzBXIJmnacQ= -github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e h1:YxeX8ydzRM3YcvmCZLW7Jk+1Sfo30kvRBk+TLOw+bPw= -github.com/nodeset-org/hyperdrive-stakewise v1.1.0-b2.0.20241007164355-afd2c06e4b0e/go.mod h1:i6UK3Tiuz8Glm4HRcAgX/sNkloRpP3amWAfz3Ezg9bQ= -github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963 h1:DhjPEnbtzPUEG+/INKjNHs7Q5JYA2aUURttcOD4WvGI= -github.com/nodeset-org/nodeset-client-go v1.1.1-0.20241007162432-cba11fc62963/go.mod h1:TATOnCsIvDjC7C+h1izgw0+t35N40Hr/CxhgaLK78e4= +github.com/nodeset-org/hyperdrive-constellation v1.0.0-rc1 h1:fbUwclXCCpFBDcmpYBYgijTkNF991tR9i9kyaYmYxqY= +github.com/nodeset-org/hyperdrive-constellation v1.0.0-rc1/go.mod h1:YcQfiHB57dCDabEu7PFN4qzS2seZv0ANXGTA6WC7JFc= +github.com/nodeset-org/hyperdrive-daemon v1.1.0-rc1 h1:H7mfO7upKMvPmpl1wOLR8IU8EEcagnPdVl0BEV/TBLk= +github.com/nodeset-org/hyperdrive-daemon v1.1.0-rc1/go.mod h1:Vjdz7D7gAZr0NFMLgBfQN1/9/Nh+KiCFJWj+7tFcFTQ= +github.com/nodeset-org/hyperdrive-stakewise v1.1.0-rc1 h1:Q0dKjK2fpS6oGrEujJXnWdTCgJUXL7LeRRctYAvxvxc= +github.com/nodeset-org/hyperdrive-stakewise v1.1.0-rc1/go.mod h1:hgFZZFcJumWAp4AxhLeQAUbA5KDOuJ9RCPXJUzFzLM8= +github.com/nodeset-org/nodeset-client-go v1.2.0 h1:16GfFTkjMdgGiAdXWyLLMnLVHd+E6Rh+UYzS1i8/o+I= +github.com/nodeset-org/nodeset-client-go v1.2.0/go.mod h1:TATOnCsIvDjC7C+h1izgw0+t35N40Hr/CxhgaLK78e4= github.com/nodeset-org/osha v0.3.1 h1:xHDjCswxGDazY/UsZ0QOpcu7gTVnEuUwXcKGVAz72lI= github.com/nodeset-org/osha v0.3.1/go.mod h1:47D6kYMuxYDTbul3w/YtE1LKA0hfzbXzCEC3M9oQlOU= github.com/nodeset-org/rocketpool-smartnode/v2 v2.0.0-olddev.0.20240729151944-127e460038df h1:6QxnKZQMlkPD33l1Q1dOhg1cHgr4kl0t/P/0JTf1BzU= @@ -529,8 +529,8 @@ github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rocket-pool/batch-query v1.0.0 h1:5HejmT1n1fIdLIqUhTNwbkG2PGOPl3IVjCpFQcQZ4I4= github.com/rocket-pool/batch-query v1.0.0/go.mod h1:d1CmxShzk0fioJ4yX0eFGhz2an1odnW/LZ2cp3eDGIQ= -github.com/rocket-pool/node-manager-core v0.5.2-0.20241003024529-05c829d805c6 h1:QITxx3McsLw6Ov/6acjz58MI496Y05s4cn63zCXQskk= -github.com/rocket-pool/node-manager-core v0.5.2-0.20241003024529-05c829d805c6/go.mod h1:/H1wq3skacZi4zjgnKTtnm0wBLJH7H5r0CvLtWFs19Y= +github.com/rocket-pool/node-manager-core v0.5.2-0.20241008173134-e04f3c1b9051 h1:fUi7ZDDGsNK6lDmCaAwu2x2bRHSEj5KmMkRwA9p3yVU= +github.com/rocket-pool/node-manager-core v0.5.2-0.20241008173134-e04f3c1b9051/go.mod h1:/H1wq3skacZi4zjgnKTtnm0wBLJH7H5r0CvLtWFs19Y= github.com/rocket-pool/rocketpool-go/v2 v2.0.0-b2.0.20240709170030-c27aeb5fb99b h1:39UmJzNR71/OMIzblEY9wq+3nojGa/gQOJJpLBa6XcE= github.com/rocket-pool/rocketpool-go/v2 v2.0.0-b2.0.20240709170030-c27aeb5fb99b/go.mod h1:pcY43H/m5pjr7zacrsKVaXnXfKKi1UV08VDPUwxbJkc= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=