add p2sh support and test