Changes to merchant.py to make it work!
Fixed to make merchant.py work with the newer wallet version.