diff --git a/LICENSE b/LICENSE index ed35fe5..9dba397 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ -MIT License +The MIT License (MIT) -Copyright (c) 2021 vn.py +Copyright (c) 2015-present, Xiaoyou Chen Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 52500a1..26ffbf6 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

- + @@ -13,13 +13,11 @@ ## 说明 -基于Coinbase交易所的API开发,支持账户下的数字货币交易。 - -请在Coinbase网站完成账户的相应设置后再使用。 +基于Coinbase交易所的API开发。 ## 安装 -安装需要基于2.2.0版本以上的[VN Studio](https://www.vnpy.com)。 +安装需要基于2.6.0版本以上的[VN Studio](https://www.vnpy.com)。 直接使用pip命令: diff --git a/setup.cfg b/setup.cfg index 4dffec1..55214af 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,11 +1,11 @@ [metadata] name = vnpy_coinbase -version = 2021.8.25 +version = 2021.9.17 url = https://www.vnpy.com license = MIT author = Xiaoyou Chen author_email = xiaoyou.chen@mail.vnpy.com -description = COINBASE gateway for vn.py quant trading framework. +description = Coinbase gateway for vn.py quant trading framework. long_description = file: README.md long_description_content_type = text/markdown keywords = diff --git a/vnpy_coinbase/__init__.py b/vnpy_coinbase/__init__.py index 5b34d7b..d7c6327 100644 --- a/vnpy_coinbase/__init__.py +++ b/vnpy_coinbase/__init__.py @@ -1 +1,31 @@ +# The MIT License (MIT) +# +# Copyright (c) 2015-present, Xiaoyou Chen +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +import importlib_metadata + from .coinbase_gateway import CoinbaseGateway + + +try: + __version__ = importlib_metadata.version("vnpy_coinbase") +except importlib_metadata.PackageNotFoundError: + __version__ = "dev" diff --git a/vnpy_coinbase/coinbase_gateway.py b/vnpy_coinbase/coinbase_gateway.py index 3c5d929..8fd077f 100644 --- a/vnpy_coinbase/coinbase_gateway.py +++ b/vnpy_coinbase/coinbase_gateway.py @@ -40,6 +40,7 @@ HistoryRequest ) + # UTC时区 UTC_TZ = pytz.utc @@ -179,7 +180,7 @@ def init_query(self) -> None: """初始化查询任务""" self.event_engine.register(EVENT_TIMER, self.process_timer_event) - + class CoinbaseRestApi(RestClient): """Coinbase的REST接口""" @@ -199,8 +200,12 @@ def __init__(self, gateway: CoinbaseGateway) -> None: def sign(self, request: Request) -> Request: """生成Coinbase签名""" timestamp: str = str(time.time()) - message: str = "".join([timestamp, request.method, - request.path, request.data or ""]) + message: str = "".join([ + timestamp, + request.method, + request.path, + request.data or "" + ]) request.headers = (get_auth_header(timestamp, message, self.key, self.secret,