From 30ab87a0b54bb23479e2dea12c615d4b5956e487 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Aug 2022 20:21:39 +0000 Subject: [PATCH 1/2] Bump eth-account from 0.4.0 to 0.5.9 Bumps [eth-account](https://github.com/ethereum/eth-account) from 0.4.0 to 0.5.9. - [Release notes](https://github.com/ethereum/eth-account/releases) - [Changelog](https://github.com/ethereum/eth-account/blob/master/docs/release_notes.rst) - [Commits](https://github.com/ethereum/eth-account/compare/v0.4.0...v0.5.9) --- updated-dependencies: - dependency-name: eth-account dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c278cfa..33c0f23 100644 --- a/setup.py +++ b/setup.py @@ -80,7 +80,7 @@ "cytoolz>=0.9.0,<1.0.0;implementation_name=='cpython'", "eth-abi>=2.0.0b6,<3.0.0", - "eth-account==0.4.0", + "eth-account==0.5.9", "eth-utils>=1.3.0,<2.0.0", "eth-hash[pycryptodome]>=0.2.0,<1.0.0", From 0e3553020dd950cff883b3f35ec3850dde418011 Mon Sep 17 00:00:00 2001 From: anon Date: Sat, 28 Jan 2023 10:24:58 +0200 Subject: [PATCH 2/2] Fix #106 --- .gitignore | 1 + tronapi/common/encoding.py | 2 +- tronapi/main.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f4e6946..346fea2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea +.DS_Store # Byte-compiled / optimized / DLL files __pycache__/ diff --git a/tronapi/common/encoding.py b/tronapi/common/encoding.py index e5512c7..d578253 100644 --- a/tronapi/common/encoding.py +++ b/tronapi/common/encoding.py @@ -2,7 +2,7 @@ import re from typing import Union -from eth_account.datastructures import AttributeDict +from tronapi.common.datastructures import AttributeDict from hexbytes import HexBytes from eth_utils import ( diff --git a/tronapi/main.py b/tronapi/main.py index a1bf985..f7f72be 100644 --- a/tronapi/main.py +++ b/tronapi/main.py @@ -15,7 +15,7 @@ :license: MIT License """ -from eth_account.datastructures import AttributeDict +from tronapi.common.datastructures import AttributeDict from urllib.parse import urlencode from eth_utils import ( apply_to_return_value,