* Make naming consistent for watched_contracts * Update FindContract and FindBlockByNumber to return errors rather than nil