Merge remote-tracking branch 'origin/devel' into devel

katzenpost · Dec 25, 2022 · c97f5fb · c97f5fb
2 parents 8652c88 + ceb7049
commit c97f5fb
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 221 deletions.
diff --git a/default_config_with_tor.toml b/default_config_with_tor.toml
@@ -5,23 +5,23 @@
 
 [Logging]
   Disable = false
-  Level = "NOTICE"
+  Level = "DEBUG"
   File = ""
 
 [Debug]
-  PollingInterval = 1000
   DisableDecoyTraffic = false
-  PreferedTransports = [ "onion" ]
+  PreferedTransports = ["onion"]
+
 [VotingAuthority]
   [[VotingAuthority.Peers]]
 # annares
 Addresses = ["131.155.69.135:65534"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 /fjoRTnyDITTtD1ialtNWSzfTp9Vd47kEUa7sc3LM2I+PRgv+JbeuaLpEbJLfAoR
 K1Q/TqWuvrUThx2FvnRDMIQtUnlAUleZT/ScJJ2av9Qh0gx8v2yZG0TuqpCiJmY0
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 7NNX023odnDnPM5oB9jR+A6onG4Af3hfU+pjtu2j3Sm8jCR3R5ct9JYSw2H8VcLB
 lj+k9Jb+I2MmhzT0gCK/yYbWC1R7UjZqlKJLtXZFjA3TuIX4wHfXUpn9+HUSA4hz
 Bn1v8RALFg5kJrmxSK/5BJQIoSoDUCVdoF4Rp5dhEFpXolqscI2T1lY9Kp+jgSZ2
@@ -51,16 +51,15 @@ hm8ySnLAh52a0CsVDKFgYWY6MGJRupt0aiQXIzCZQUdgWsE6AnxHzBgHsAhemrhG
 -----END KYBER768-X25519 PUBLIC KEY-----
 """
 
-
   [[VotingAuthority.Peers]]
 # beeblebrox
 Addresses = ["37.218.247.39:3333"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 sffL6SrX94zltrKWiCc1bxvgqPaKuCpUsErChV3bUEop4+YrTXDMgH3JzKemFBf8
 nmKjcV8le0fvASF0COhBdCoSse7YWSuR0zCiB1YiZk4nkfyhClxcTmXMV4hY7pvp
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 4X5ezeYQSDsLZ9RBpIYGw3RUnj/trGRjwzD0ToFixV64VT9REsQMynI7BXtDtSLw
 yld5CR3ld2EPmUryF2gnODOTl5rzVWuXpALXyspscm3IZr1fayIphjqkpmy4cmjo
 RoViwVxQRspZcBjjUaGtc4KyAYs+A56tYGA7dRBGoWmg2wbqYlhy4LRuk4sAQsjg
@@ -93,13 +92,13 @@ VSZNStzaExhQ9wxg7HeRaQ==
   [[VotingAuthority.Peers]]
 # gnunet
 Addresses = [ "131.159.74.69:65534", "[2001:4ca0:2001:42:225:90ff:fe6b:d60]:65534" ]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 jclECUIi0bp4f627W/T3q/bVZTV/zBYiT4Ry/9RlTpEr7ul+qPLGaHNbtPwH1kxD
 86iP48/CFAz8W0RVnwtGm14wruOrE1d02917Qn7StkVVDxRMyf8yyGY7pis1wgBL
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      # from gnunet_auth_id_link_key.pem
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+# from gnunet_auth_id_link_key.
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 X+8liX6+O1jT7IAub2R/cC3d92V+JLl0xN7GjYWHr1TipqTHJBsj+4HRKMHNYGzG
 /Aq3YsU+uiW1Spfn6BZOCbST5ggDNgzepYcVZ6TYwXhsgIk651PrIVtyMQ2MRTHw
 CBDAG7DBuC+f04XWlbib/JXzUE+4pjziAqX8kTdNAUrgVwcOMjrD5U46yWD+86EX
@@ -132,12 +131,12 @@ feOstL0pARWr1YI6PonRbQ==
   [[VotingAuthority.Peers]]
 # marighella
 Addresses = [ "191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 cEAu8JISHrc9n45xz6vUkJfvPnf3LlzowA0pyc443q+TAWiB5+NaRgK42Y01hDiK
 m0bmjPCQnMjcLEPTRVjdHirHTZXQLJq+w2i0ubNhI/nFn1Xka08WHpvLYC+XqgM5
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 5Mr5o0xywq18GdC8l7JGcLNhzRTNqpPIvSA6q4XTIyeo4m0p9pORJ3gwmndUGHZE
 0r+nu1o5crS46VGC4Xa6+mHdrDgVpr3SEI1FaIZ6Na4/JVWkkspUCSWQ0G1ESjY3
 ZYORWR8rbEI24h2YCYKz9n0wNKr2R4kD3AFpyipsqAYJx71Ikmvd8lLIAI9twT6n
@@ -170,12 +169,12 @@ d7pNKav+/Mrl4pfWQT5/kSMNHI+m61VemmQ3HJ5HoSbROjoS4ndumaOAOnFFVUAl
   [[VotingAuthority.Peers]]
 # nutria
 Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS
 l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d
 53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU
 KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB
@@ -208,12 +207,12 @@ xKymaSdIB5pbFkGCV1C0ew==
   [[VotingAuthority.Peers]]
 # windfall
 Addresses = ["74.50.67.182:40002"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 +oxlrZurSc3JD/eJsRmSabtFVsbFB/N1fSZSHTEajndgX/rGGZTCiBqMDqXC/qTS
 dfvVb+yOmo+pnbnEeWuCecXFplODH92p83pp+nzmMadGUprzadL9smufJlb7+GkD
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 MaoZ3OQXJXvoWu9v9Yq5aq+adWwzfAm8FYYXM0olCCXxTKnR/FPRoJKEGTtOU7VA
 VqgtGcFyFoxctB82pAapdjcn1FHxXMjUyMWUh4810MRiAVgU9F3/BKuv/HVholmX
 KLlRegvlhcf+VQlsAVDbXA3d87nHbG7gRqEARkRniTh4FlAok0eecZPmFkbt5EgT
@@ -242,4 +241,3 @@ EQQMNqHcB8Z61ya7aG6K9wHLlnNpF0ZPV8n4k0Sp1QmJGJYt7/HMTAIK/ZHtHoQf
 vkdQm1uuoKMh1qC6oRRsgQ==
 -----END KYBER768-X25519 PUBLIC KEY-----
 """
-
diff --git a/default_config_without_tor.toml b/default_config_without_tor.toml
@@ -3,22 +3,22 @@
 
 [Logging]
   Disable = false
-  Level = "NOTICE"
+  Level = "DEBUG"
   File = ""
 
 [Debug]
-  PollingInterval = 1000
   DisableDecoyTraffic = false
+
 [VotingAuthority]
   [[VotingAuthority.Peers]]
 # annares
 Addresses = ["131.155.69.135:65534"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 /fjoRTnyDITTtD1ialtNWSzfTp9Vd47kEUa7sc3LM2I+PRgv+JbeuaLpEbJLfAoR
 K1Q/TqWuvrUThx2FvnRDMIQtUnlAUleZT/ScJJ2av9Qh0gx8v2yZG0TuqpCiJmY0
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 7NNX023odnDnPM5oB9jR+A6onG4Af3hfU+pjtu2j3Sm8jCR3R5ct9JYSw2H8VcLB
 lj+k9Jb+I2MmhzT0gCK/yYbWC1R7UjZqlKJLtXZFjA3TuIX4wHfXUpn9+HUSA4hz
 Bn1v8RALFg5kJrmxSK/5BJQIoSoDUCVdoF4Rp5dhEFpXolqscI2T1lY9Kp+jgSZ2
@@ -48,16 +48,15 @@ hm8ySnLAh52a0CsVDKFgYWY6MGJRupt0aiQXIzCZQUdgWsE6AnxHzBgHsAhemrhG
 -----END KYBER768-X25519 PUBLIC KEY-----
 """
 
-
   [[VotingAuthority.Peers]]
 # beeblebrox
 Addresses = ["37.218.247.39:3333"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 sffL6SrX94zltrKWiCc1bxvgqPaKuCpUsErChV3bUEop4+YrTXDMgH3JzKemFBf8
 nmKjcV8le0fvASF0COhBdCoSse7YWSuR0zCiB1YiZk4nkfyhClxcTmXMV4hY7pvp
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 4X5ezeYQSDsLZ9RBpIYGw3RUnj/trGRjwzD0ToFixV64VT9REsQMynI7BXtDtSLw
 yld5CR3ld2EPmUryF2gnODOTl5rzVWuXpALXyspscm3IZr1fayIphjqkpmy4cmjo
 RoViwVxQRspZcBjjUaGtc4KyAYs+A56tYGA7dRBGoWmg2wbqYlhy4LRuk4sAQsjg
@@ -90,13 +89,13 @@ VSZNStzaExhQ9wxg7HeRaQ==
   [[VotingAuthority.Peers]]
 # gnunet
 Addresses = [ "131.159.74.69:65534", "[2001:4ca0:2001:42:225:90ff:fe6b:d60]:65534" ]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 jclECUIi0bp4f627W/T3q/bVZTV/zBYiT4Ry/9RlTpEr7ul+qPLGaHNbtPwH1kxD
 86iP48/CFAz8W0RVnwtGm14wruOrE1d02917Qn7StkVVDxRMyf8yyGY7pis1wgBL
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      # from gnunet_auth_id_link_key.pem
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+# from gnunet_auth_id_link_key.
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 X+8liX6+O1jT7IAub2R/cC3d92V+JLl0xN7GjYWHr1TipqTHJBsj+4HRKMHNYGzG
 /Aq3YsU+uiW1Spfn6BZOCbST5ggDNgzepYcVZ6TYwXhsgIk651PrIVtyMQ2MRTHw
 CBDAG7DBuC+f04XWlbib/JXzUE+4pjziAqX8kTdNAUrgVwcOMjrD5U46yWD+86EX
@@ -129,12 +128,12 @@ feOstL0pARWr1YI6PonRbQ==
   [[VotingAuthority.Peers]]
 # marighella
 Addresses = [ "191.101.71.152:40000", "[2a02:4780:14:af58::1]:40000" ]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 cEAu8JISHrc9n45xz6vUkJfvPnf3LlzowA0pyc443q+TAWiB5+NaRgK42Y01hDiK
 m0bmjPCQnMjcLEPTRVjdHirHTZXQLJq+w2i0ubNhI/nFn1Xka08WHpvLYC+XqgM5
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 5Mr5o0xywq18GdC8l7JGcLNhzRTNqpPIvSA6q4XTIyeo4m0p9pORJ3gwmndUGHZE
 0r+nu1o5crS46VGC4Xa6+mHdrDgVpr3SEI1FaIZ6Na4/JVWkkspUCSWQ0G1ESjY3
 ZYORWR8rbEI24h2YCYKz9n0wNKr2R4kD3AFpyipsqAYJx71Ikmvd8lLIAI9twT6n
@@ -167,12 +166,12 @@ d7pNKav+/Mrl4pfWQT5/kSMNHI+m61VemmQ3HJ5HoSbROjoS4ndumaOAOnFFVUAl
   [[VotingAuthority.Peers]]
 # nutria
 Addresses = ["65.108.220.173:40000", "[2a01:4f9:c011:4e7b::1]:40000"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 TUchIOZ98fc7UABosstqDlRN7aRQtKk/NTeVkhoNdSI62g883BupqMBY2RafKJfS
 l2WZdf75HCsxMigPJwQhB64HD8i+cg2VgLF0ndZh703HnNjiv1EH+2Z2uYH3El6Z
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 eoRieDZr+HV4lqUcEtLRUzJKQ0anel3dEsm737d0TwW3l6zwsMDm8kaW7BuwRT4d
 53Bs98rpgGxrvMWFagQdHE9jnITJ02m3I4GJwJJQgj2pZ4py0ckBK3/cdKXK6FVU
 KZtuywueUKCLci2RGD6/GRYDdJV5yplQs58kBDAgSaUFY2d6VCnaSrdP1UnVmiWB
@@ -205,12 +204,12 @@ xKymaSdIB5pbFkGCV1C0ew==
   [[VotingAuthority.Peers]]
 # windfall
 Addresses = ["74.50.67.182:40002"]
-IdentityPublicKeyPem = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
+IdentityPublicKey = """-----BEGIN ED25519 SPHINCS+ PUBLIC KEY-----
 +oxlrZurSc3JD/eJsRmSabtFVsbFB/N1fSZSHTEajndgX/rGGZTCiBqMDqXC/qTS
 dfvVb+yOmo+pnbnEeWuCecXFplODH92p83pp+nzmMadGUprzadL9smufJlb7+GkD
 -----END ED25519 SPHINCS+ PUBLIC KEY-----
 """
-      LinkPublicKeyPem = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
+LinkPublicKey = """-----BEGIN KYBER768-X25519 PUBLIC KEY-----
 MaoZ3OQXJXvoWu9v9Yq5aq+adWwzfAm8FYYXM0olCCXxTKnR/FPRoJKEGTtOU7VA
 VqgtGcFyFoxctB82pAapdjcn1FHxXMjUyMWUh4810MRiAVgU9F3/BKuv/HVholmX
 KLlRegvlhcf+VQlsAVDbXA3d87nHbG7gRqEARkRniTh4FlAok0eecZPmFkbt5EgT