Updated GANA defintions.

11 files changed, 76 insertions, 40 deletions

diff --git a/src/gnunet/enums/blocktype_string.go b/src/gnunet/enums/blocktype_string.go
index b81cd19..adc4e5b 100644
--- a/src/gnunet/enums/blocktype_string.go
+++ b/src/gnunet/enums/blocktype_string.go
@@ -12,13 +12,13 @@ func _() {
         _ = x[BLOCK_TYPE_FS_DBLOCK-1]
         _ = x[BLOCK_TYPE_FS_IBLOCK-2]
         _ = x[BLOCK_TYPE_FS_ONDEMAND-6]
-        _ = x[BLOCK_TYPE_DHT_HELLO-7]
+        _ = x[BLOCK_TYPE_LEGACY_HELLO-7]
         _ = x[BLOCK_TYPE_TEST-8]
         _ = x[BLOCK_TYPE_FS_UBLOCK-9]
         _ = x[BLOCK_TYPE_DNS-10]
         _ = x[BLOCK_TYPE_GNS_NAMERECORD-11]
         _ = x[BLOCK_TYPE_REVOCATION-12]
-        _ = x[BLOCK_TYPE_DHT_URL_HELLO-13]
+        _ = x[BLOCK_TYPE_DHT_HELLO-13]
         _ = x[BLOCK_TYPE_REGEX-22]
         _ = x[BLOCK_TYPE_REGEX_ACCEPT-23]
         _ = x[BLOCK_TYPE_SET_TEST-24]
@@ -29,13 +29,13 @@ func _() {
 
 const (
         _BlockType_name_0 = "BLOCK_TYPE_ANYBLOCK_TYPE_FS_DBLOCKBLOCK_TYPE_FS_IBLOCK"
-        _BlockType_name_1 = "BLOCK_TYPE_FS_ONDEMANDBLOCK_TYPE_DHT_HELLOBLOCK_TYPE_TESTBLOCK_TYPE_FS_UBLOCKBLOCK_TYPE_DNSBLOCK_TYPE_GNS_NAMERECORDBLOCK_TYPE_REVOCATIONBLOCK_TYPE_DHT_URL_HELLO"
+        _BlockType_name_1 = "BLOCK_TYPE_FS_ONDEMANDBLOCK_TYPE_LEGACY_HELLOBLOCK_TYPE_TESTBLOCK_TYPE_FS_UBLOCKBLOCK_TYPE_DNSBLOCK_TYPE_GNS_NAMERECORDBLOCK_TYPE_REVOCATIONBLOCK_TYPE_DHT_HELLO"
         _BlockType_name_2 = "BLOCK_TYPE_REGEXBLOCK_TYPE_REGEX_ACCEPTBLOCK_TYPE_SET_TESTBLOCK_TYPE_CONSENSUS_ELEMENTBLOCK_TYPE_SETI_TESTBLOCK_TYPE_SETU_TEST"
 )
 
 var (
         _BlockType_index_0 = [...]uint8{0, 14, 34, 54}
-        _BlockType_index_1 = [...]uint8{0, 22, 42, 57, 77, 91, 116, 137, 161}
+        _BlockType_index_1 = [...]uint8{0, 22, 45, 60, 80, 94, 119, 140, 160}
         _BlockType_index_2 = [...]uint8{0, 16, 39, 58, 86, 106, 126}
 )
 
diff --git a/src/gnunet/enums/dht_block_type.go b/src/gnunet/enums/dht_block_type.go
index 9a03bf0..66fc0ca 100644
--- a/src/gnunet/enums/dht_block_type.go
+++ b/src/gnunet/enums/dht_block_type.go
@@ -11,13 +11,13 @@ BLOCK_TYPE_ANY BlockType = 0 // Identifier for any block.
 BLOCK_TYPE_FS_DBLOCK BlockType = 1 // Data block (leaf) in the CHK tree.
 BLOCK_TYPE_FS_IBLOCK BlockType = 2 // Inner block in the CHK tree.
 BLOCK_TYPE_FS_ONDEMAND BlockType = 6 // Type of a block representing a block to be encoded on demand from disk. Should never appear on the network directly.
-BLOCK_TYPE_DHT_HELLO BlockType = 7 // Type of a block that contains a HELLO for a peer.
+BLOCK_TYPE_LEGACY_HELLO BlockType = 7 // Legacy type of a block that contains a HELLO for a peer.
 BLOCK_TYPE_TEST BlockType = 8 // Block for testing.
 BLOCK_TYPE_FS_UBLOCK BlockType = 9 // Type of a block representing any type of search result (universal).
 BLOCK_TYPE_DNS BlockType = 10 // Block for storing DNS exit service advertisements.
 BLOCK_TYPE_GNS_NAMERECORD BlockType = 11 // Block for storing GNS record data.
 BLOCK_TYPE_REVOCATION BlockType = 12 // Block type for a revocation message by which a key is revoked.
-BLOCK_TYPE_DHT_URL_HELLO BlockType = 13 // Type of a block that contains a DHT-NG HELLO for a peer.
+BLOCK_TYPE_DHT_HELLO BlockType = 13 // Type of a block that contains a DHT-NG HELLO for a peer.
 BLOCK_TYPE_REGEX BlockType = 22 // Block to store a cadet regex state
 BLOCK_TYPE_REGEX_ACCEPT BlockType = 23 // Block to store a cadet regex accepting state
 BLOCK_TYPE_SET_TEST BlockType = 24 // Block for testing set/consensus.  If first byte of the block is non-zero, the block is considered invalid.
diff --git a/src/gnunet/enums/gnunet-dht.rec b/src/gnunet/enums/gnunet-dht.rec
index e2366d3..e73dea4 100644
--- a/src/gnunet/enums/gnunet-dht.rec
+++ b/src/gnunet/enums/gnunet-dht.rec
@@ -37,8 +37,8 @@ Comment: Type of a block representing a block to be encoded on demand from disk.
 References: None
 
 Number: 7
-Name: DHT_HELLO
-Comment: Type of a block that contains a HELLO for a peer.
+Name: LEGACY_HELLO
+Comment: Legacy type of a block that contains a HELLO for a peer.
 References: None
 
 Number: 8
@@ -67,9 +67,9 @@ Comment: Block type for a revocation message by which a key is revoked.
 References: None
 
 Number: 13
-Name: DHT_URL_HELLO
+Name: DHT_HELLO
 Comment: Type of a block that contains a DHT-NG HELLO for a peer.
-References: None
+References: LSD-0004
 
 Number: 22
 Name: REGEX
diff --git a/src/gnunet/enums/gnunet-signature.rec b/src/gnunet/enums/gnunet-signature.rec
index fbd57e4..1a73141 100644
--- a/src/gnunet/enums/gnunet-signature.rec
+++ b/src/gnunet/enums/gnunet-signature.rec
@@ -224,6 +224,12 @@ Subsystem: GNUnet-TRANSPORT-TCP
 #
 # Exchange offline signatures (with master key)
 #
+
+Number: 1017
+Name: MASTER_AML_KEY
+Comment: Initialize or update the status of an AML key for an AML officer
+Package: GNU Taler
+
 Number: 1018
 Name: MASTER_DRAIN_PROFIT
 Comment: Affirm wiring of exchange profits to operator account.
@@ -389,6 +395,11 @@ Name: EXCHANGE_CONFIRM_PURSE_REFUND
 Comment: Signature by which the exchange confirms that a purse expired and a coin was refunded.
 Package: GNU Taler
 
+Number: 1050
+Name: EXCHANGE_CONFIRM_AGE_WITHDRAW
+Comment: Signature where the Exchange confirms an age-withdraw.
+Package: GNU Taler
+
 #
 # Auditor signatures
 #
@@ -531,6 +542,16 @@ Name: WALLET_RESERVE_ATTEST_DETAILS
 Comment: Request attestation about reserve owner. Signed by the reserve private key.
 Package: GNU Taler
 
+Number: 1220
+Name: WALLET_PURSE_DELETE
+Comment: Signature by which a wallet requests a purse to be deleted.
+Package: GNU Taler
+
+Number: 1221
+Name: WALLET_RESERVE_AGE_WITHDRAW
+Comment: Signature where the reserve key confirms an age-withdraw request. Signed with the reserve private key.
+Package: GNU Taler
+
 #
 # Security module signatures
 #
@@ -565,6 +586,21 @@ Comment: EdDSA test signature.
 Package: GNU Taler
 
 #
+# AML officer signatures
+#
+
+Number: 1350
+Name: AML_DECISION
+Comment: Signature by which an AML officer signs an AML decision.
+Package: GNU Taler
+
+Number: 1351
+Name: AML_QUERY
+Comment: Signature by which an AML officer requests AML data.
+Package: GNU Taler
+
+
+#
 # GNU Anastasis signatures, >= 1400
 #
 
diff --git a/src/gnunet/go.mod b/src/gnunet/go.mod
index 4c12af3..e45a035 100644
--- a/src/gnunet/go.mod
+++ b/src/gnunet/go.mod
@@ -3,25 +3,25 @@ module gnunet
 go 1.19
 
 require (
-        github.com/bfix/gospel v1.2.21
+        github.com/bfix/gospel v1.2.22
         github.com/go-redis/redis/v8 v8.11.5
         github.com/go-sql-driver/mysql v1.6.0
         github.com/gorilla/mux v1.8.0
         github.com/gorilla/rpc v1.2.0
         github.com/mattn/go-sqlite3 v1.14.13
         github.com/miekg/dns v1.1.49
-        golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
+        golang.org/x/crypto v0.8.0
 )
 
 require (
         github.com/cespare/xxhash/v2 v2.1.2 // indirect
         github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
         github.com/huin/goupnp v1.0.0 // indirect
-        golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-        golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 // indirect
-        golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
-        golang.org/x/text v0.3.7 // indirect
-        golang.org/x/tools v0.1.11 // indirect
+        golang.org/x/mod v0.8.0 // indirect
+        golang.org/x/net v0.9.0 // indirect
+        golang.org/x/sys v0.7.0 // indirect
+        golang.org/x/text v0.9.0 // indirect
+        golang.org/x/tools v0.6.0 // indirect
 )
 
-// replace github.com/bfix/gospel v1.2.21 => ../gospel
+// replace github.com/bfix/gospel v1.2.22 => ../gospel
diff --git a/src/gnunet/go.sum b/src/gnunet/go.sum
index 26ce2b7..c7c04b9 100644
--- a/src/gnunet/go.sum
+++ b/src/gnunet/go.sum
@@ -1,5 +1,5 @@
-github.com/bfix/gospel v1.2.21 h1:rgllMlR+2AZt6+x0uaBF67a+pM7fJxHiO93amhKXZNU=
-github.com/bfix/gospel v1.2.21/go.mod h1:cdu63bA9ZdfeDoqZ+vnWOcbY9Puwdzmf5DMxMGMznRI=
+github.com/bfix/gospel v1.2.22 h1:b7hChvq4Cn/+KZDiaE0bKBx7b6L+aObbjR1dj6V5f9o=
+github.com/bfix/gospel v1.2.22/go.mod h1:cdu63bA9ZdfeDoqZ+vnWOcbY9Puwdzmf5DMxMGMznRI=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
@@ -27,21 +27,21 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
-golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898 h1:SLP7Q4Di66FONjDJbCYrCRrh97focO6sLogHO7/g8F0=
-golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.8.0 h1:pd9TJtTueMTVQXzk8E2XESSMQDj/U7OUu0PqJqPXQjQ=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y=
-golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.9.0 h1:aWJ/m6xSmxWBx+V0XRHTlrYrPG56jKsLdTFmsSsCzOM=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -50,21 +50,21 @@ golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a h1:dGzPydgVsqGcTRVwiLJ1jVbufYwmzD3LfVPLKsKg+0k=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.11 h1:loJ25fNOEhSXfHrpoGj91eCUThwdNX6u24rO1xnNteY=
-golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/src/gnunet/service/dht/blocks/generic.go b/src/gnunet/service/dht/blocks/generic.go
index 374bfc6..c0a9fe9 100644
--- a/src/gnunet/service/dht/blocks/generic.go
+++ b/src/gnunet/service/dht/blocks/generic.go
@@ -220,7 +220,7 @@ func (b *GenericBlock) String() string {
 var (
         blkFactory = map[enums.BlockType]func() Block{
                 enums.BLOCK_TYPE_GNS_NAMERECORD: NewGNSBlock,
-                enums.BLOCK_TYPE_DHT_URL_HELLO:  NewHelloBlock,
+                enums.BLOCK_TYPE_DHT_HELLO:      NewHelloBlock,
                 enums.BLOCK_TYPE_TEST:           NewTestBlock,
         }
 )
diff --git a/src/gnunet/service/dht/blocks/handlers.go b/src/gnunet/service/dht/blocks/handlers.go
index d8db6ae..d1f7533 100644
--- a/src/gnunet/service/dht/blocks/handlers.go
+++ b/src/gnunet/service/dht/blocks/handlers.go
@@ -83,6 +83,6 @@ func init() {
         BlockHandlers = make(map[enums.BlockType]BlockHandler)
 
         // add validation functions
-        BlockHandlers[enums.BLOCK_TYPE_DHT_URL_HELLO] = new(HelloBlockHandler)
+        BlockHandlers[enums.BLOCK_TYPE_DHT_HELLO] = new(HelloBlockHandler)
         BlockHandlers[enums.BLOCK_TYPE_TEST] = new(TestBlockHandler)
 }
diff --git a/src/gnunet/service/dht/blocks/hello.go b/src/gnunet/service/dht/blocks/hello.go
index da67521..5a1a3bb 100644
--- a/src/gnunet/service/dht/blocks/hello.go
+++ b/src/gnunet/service/dht/blocks/hello.go
@@ -231,7 +231,7 @@ func (h *HelloBlock) finalize() (err error) {
 
 // Return the block type
 func (h *HelloBlock) Type() enums.BlockType {
-        return enums.BLOCK_TYPE_DHT_URL_HELLO
+        return enums.BLOCK_TYPE_DHT_HELLO
 }
 
 // Bytes returns the raw block data
diff --git a/src/gnunet/service/dht/messages.go b/src/gnunet/service/dht/messages.go
index 912203d..18249d7 100644
--- a/src/gnunet/service/dht/messages.go
+++ b/src/gnunet/service/dht/messages.go
@@ -132,7 +132,7 @@ func (m *Module) HandleMessage(ctx context.Context, sender *util.PeerID, msgIn m
 
                 //------------------------------------------------------
                 // query for a HELLO? (9.4.3.3a)
-                if btype == enums.BLOCK_TYPE_DHT_URL_HELLO {
+                if btype == enums.BLOCK_TYPE_DHT_HELLO {
                         // try to find results in HELLO cache
                         results = m.lookupHelloCache(label, addr, rf, approx)
                         // DEBUG:
@@ -315,7 +315,7 @@ func (m *Module) HandleMessage(ctx context.Context, sender *util.PeerID, msgIn m
                 //--------------------------------------------------------------
                 // if the put is for a HELLO block, add the sender to the
                 // routing table (9.3.2.9)
-                if msg.BType == enums.BLOCK_TYPE_DHT_HELLO {
+                if msg.BType == enums.BLOCK_TYPE_LEGACY_HELLO {
                         m.addSender(msg.Block, label, sender)
                 }
                 //--------------------------------------------------------------
diff --git a/src/gnunet/service/dht/module.go b/src/gnunet/service/dht/module.go
index a954a37..16881c5 100644
--- a/src/gnunet/service/dht/module.go
+++ b/src/gnunet/service/dht/module.go
@@ -152,7 +152,7 @@ func NewModule(ctx context.Context, c *core.Core, cfg *config.DHTConfig) (m *Mod
                         // initiate peer discovery
                         case <-ticker.C:
                                 // query DHT for our own HELLO block
-                                query := blocks.NewGenericQuery(key, enums.BLOCK_TYPE_DHT_URL_HELLO, flags)
+                                query := blocks.NewGenericQuery(key, enums.BLOCK_TYPE_DHT_HELLO, flags)
                                 logger.Printf(logger.DBG, "[dht-discovery] own HELLO key %s", query.Key().Short())
                                 resCh = m.Get(ctx, query)
 
@@ -160,7 +160,7 @@ func NewModule(ctx context.Context, c *core.Core, cfg *config.DHTConfig) (m *Mod
                         case res := <-resCh:
                                 // check for correct type
                                 btype := res.Type()
-                                if btype == enums.BLOCK_TYPE_DHT_URL_HELLO {
+                                if btype == enums.BLOCK_TYPE_DHT_HELLO {
                                         hb, ok := res.(*blocks.HelloBlock)
                                         if !ok {
                                                 logger.Println(logger.WARN, "[dht-discovery] received invalid block data")