|
@@ -113,7 +113,9 @@ class SNIP:
|
|
|
snip.snipdict["auth"])
|
|
|
else:
|
|
|
assert(merklelib.verify_leaf_inclusion(
|
|
|
- snip.__str__(False), snip.snipdict["auth"],
|
|
|
+ snip.__str__(False),
|
|
|
+ [merklelib.AuditNode(p[0], p[1])
|
|
|
+ for p in snip.snipdict["auth"]],
|
|
|
merklelib.Hasher(), consensus.consdict["merkleroot"]))
|
|
|
|
|
|
|
|
@@ -315,8 +317,8 @@ class RelayPicker:
|
|
|
# do it now, and store it in the SNIP so that the client
|
|
|
# will get it.
|
|
|
if "auth" not in r.snipdict:
|
|
|
- r.snipdict["auth"] = \
|
|
|
- self.merkletree.get_proof(r.__str__(False))
|
|
|
+ r.snipdict["auth"] = [ (p.hash, p.type) for p in \
|
|
|
+ self.merkletree.get_proof(r.__str__(False))._nodes]
|
|
|
return r
|
|
|
|
|
|
def pick_weighted_relay(self):
|