more ABI updates, trade_ids in markets, tests