leaf2Addr: add support for address when it's in the last position

worm-emoji · worm-emoji · commit 6af51375e721 · 2023-06-14T01:23:29.000-07:00
diff --git a/api/tree.go b/api/tree.go
@@ -32,6 +32,10 @@ func leaf2Addr(leaf []byte, ltd []string, packed bool) common.Address {
 	if len(ltd) == 0 || (len(ltd) == 1 && ltd[0] == "address") {
 		return common.BytesToAddress(leaf)
 	}
+	if ltd[len(ltd)-1] == "address" && len(leaf) > 20 {
+		return common.BytesToAddress(leaf[len(leaf)-20:])
+	}
+
 	if packed {
 		return addrPacked(leaf, ltd)
 	}

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,10 @@ func leaf2Addr(leaf []byte, ltd []string, packed bool) common.Address {`
`32`	`32`	`if len(ltd) == 0 \|\| (len(ltd) == 1 && ltd[0] == "address") {`
`33`	`33`	`return common.BytesToAddress(leaf)`
`34`	`34`	`}`
	`35`	`+ if ltd[len(ltd)-1] == "address" && len(leaf) > 20 {`
	`36`	`+ return common.BytesToAddress(leaf[len(leaf)-20:])`
	`37`	`+ }`
	`38`	`+`
`35`	`39`	`if packed {`
`36`	`40`	`return addrPacked(leaf, ltd)`
`37`	`41`	`}`