updated code for latests bitcoinj master head