Merge branch 'master' of git+ssh://git.gnunet.org/gana

3 files changed, 59 insertions, 4 deletions

diff --git a/gnu-taler-error-codes/registry.rec b/gnu-taler-error-codes/registry.rec
index 68edac2..101fee1 100644
--- a/gnu-taler-error-codes/registry.rec
+++ b/gnu-taler-error-codes/registry.rec
@@ -388,6 +388,10 @@ Name: EXCHANGE_PURSE_DEPOSIT_COIN_AGE_ATTESTATION_FAILURE
 Description: The provided attestation for the minimum age couldn't be verified by the exchange.
 HttpStatus: 400
 
+Value: 1031
+Name: EXCHANGE_GENERIC_PURSE_DELETED
+Description: The purse was deleted.
+HttpStatus: 410
 
 Value: 1100
 Name: EXCHANGE_DEPOSITS_GET_NOT_FOUND
@@ -820,6 +824,16 @@ Name: EXCHANGE_RESERVES_PURSE_FEE_TOO_LOW
 Description: The purse fee specified for the request is lower than the purse fee charged by the exchange at this time.
 HttpStatus: 400
 
+Value: 1679
+Name: EXCHANGE_PURSE_DELETE_ALREADY_DECIDED
+Description: The payment request cannot be deleted anymore, as it either already completed or timed out.
+HttpStatus: 409
+
+Value: 1680
+Name: EXCHANGE_PURSE_DELETE_SIGNATURE_INVALID
+Description: The signature affirming the purse deletion is invalid.
+HttpStatus: 403
+
 
 Value: 1700
 Name: EXCHANGE_DENOMINATION_HELPER_UNAVAILABLE
@@ -1217,6 +1231,11 @@ Name: MERCHANT_GENERIC_HOLE_IN_WIRE_FEE_STRUCTURE
 Description: The start and end-times in the wire fee structure leave a hole. This is not allowed.
 HttpStatus: 0
 
+Value: 2002
+Name: MERCHANT_GENERIC_EXCHANGE_WIRE_REQUEST_FAILED
+Description: The merchant was unable to obtain a valid answer to /wire from the exchange.
+HttpStatus: 502
+
 Value: 2005
 Name: MERCHANT_GENERIC_ORDER_UNKNOWN
 Description: The proposal is not known to the backend.
@@ -2146,6 +2165,21 @@ Name: WALLET_WITHDRAWAL_KYC_REQUIRED
 Description: A KYC step is required before withdrawal can proceed.
 HttpStatus: 0
 
+Value: 7026
+Name: WALLET_DEPOSIT_GROUP_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to create a deposit group.
+HttpStatus: 0
+
+Value: 7027
+Name: WALLET_PEER_PUSH_PAYMENT_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to create a peer push payment.
+HttpStatus: 0
+
+Value: 7028
+Name: WALLET_PEER_PULL_PAYMENT_INSUFFICIENT_BALANCE
+Description: The wallet does not have sufficient balance to pay for an invoice.
+HttpStatus: 0
+
 
 # 8000 - 8999: Reserved for Anastasis
 
diff --git a/gnunet-dht-block-types/registry.rec b/gnunet-dht-block-types/registry.rec
index e2366d3..e73dea4 100644
--- a/gnunet-dht-block-types/registry.rec
+++ b/gnunet-dht-block-types/registry.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/gnunet-signatures/registry.rec b/gnunet-signatures/registry.rec
index fbd57e4..086544d 100644
--- a/gnunet-signatures/registry.rec
+++ b/gnunet-signatures/registry.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.
@@ -531,6 +537,11 @@ 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
+
 #
 # Security module signatures
 #
@@ -565,6 +576,16 @@ 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
+
+
+#
 # GNU Anastasis signatures, >= 1400
 #