From 08517a1d2257470c097708a962284ee7ceff0d80 Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Thu, 27 May 2021 00:57:54 +0400 Subject: [PATCH 1/3] chore: bump vyper version to v0.2.12 --- brownie_tokens/template.py | 2 +- brownie_tokens/token-template.vy | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/brownie_tokens/template.py b/brownie_tokens/template.py index 64b7572..4b0f6be 100644 --- a/brownie_tokens/template.py +++ b/brownie_tokens/template.py @@ -84,7 +84,7 @@ def ERC20( return_statement=RETURN_STATEMENT[success], fail_statement=FAIL_STATEMENT[fail], ) - contract = compile_source(source, vyper_version="0.2.11").Vyper + contract = compile_source(source, vyper_version="0.2.12").Vyper if deployer is None: tx_params = {"from": "0x0000000000000000000000000000000000001337", "silent": True} diff --git a/brownie_tokens/token-template.vy b/brownie_tokens/token-template.vy index 349d9d9..9fbaf45 100644 --- a/brownie_tokens/token-template.vy +++ b/brownie_tokens/token-template.vy @@ -1,4 +1,4 @@ -# @version 0.2.11 +# @version 0.2.12 """ @notice Mock non-standard ERC20 for testing """ From 8daa5dd9955c0ebb528fedb2af396751bf6f6a24 Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Thu, 27 May 2021 00:58:46 +0400 Subject: [PATCH 2/3] fix: query snx exchanger address --- brownie_tokens/forked.py | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/brownie_tokens/forked.py b/brownie_tokens/forked.py index cff4ca5..a03c33f 100644 --- a/brownie_tokens/forked.py +++ b/brownie_tokens/forked.py @@ -65,6 +65,22 @@ def _mint_for_testing(self, target: str, amount: Wei, tx: Dict = None) -> None: # be sure to include a comment with the symbol of the token +def _snx_exchanger() -> str: + abi = [ + { + "inputs": [{"name": "name", "type": "bytes32"}], + "name": "getAddress", + "outputs": [{"internalType": "uint256", "name": "", "type": "address"}], + "stateMutability": "view", + "type": "function", + } + ] + resolver = Contract.from_abi( + "AddressResolver", "0x4E3b31eB0E5CB73641EE1E65E7dCEFe520bA3ef2", abi + ) + return resolver.getAddress("0x45786368616e6765720000000000000000000000000000000000000000000000") + + def mint_0xE95A203B1a91a908F9B9CE46459d101078c2c3cb( token: MintableForkToken, target: str, amount: int ) -> None: @@ -131,7 +147,7 @@ def mint_0xfE18be6b3Bd88A2D2A7f928d00292E7a9963CfC6( ) -> None: # Synth sBTC target_contract = Contract("0xDB91E4B3b6E19bF22E810C43273eae48C9037e74") - target_contract.issue(target, amount, {"from": "0x778D2d3E3515e42573EB1e6a8d8915D4a22D9d54"}) + target_contract.issue(target, amount, {"from": _snx_exchanger()}) def mint_0x5e74C9036fb86BD7eCdcb084a0673EFc32eA31cb( @@ -139,7 +155,7 @@ def mint_0x5e74C9036fb86BD7eCdcb084a0673EFc32eA31cb( ) -> None: # Synth sETH target_contract = Contract("0x87641989057242Bff28D0D6108d007C79774D06f") - target_contract.issue(target, amount, {"from": "0x778D2d3E3515e42573EB1e6a8d8915D4a22D9d54"}) + target_contract.issue(target, amount, {"from": _snx_exchanger()}) def mint_0xD71eCFF9342A5Ced620049e616c5035F1dB98620( @@ -147,7 +163,7 @@ def mint_0xD71eCFF9342A5Ced620049e616c5035F1dB98620( ) -> None: # Synth sEURS target_contract = Contract("0xC61b352fCc311Ae6B0301459A970150005e74b3E") - target_contract.issue(target, amount, {"from": "0x778D2d3E3515e42573EB1e6a8d8915D4a22D9d54"}) + target_contract.issue(target, amount, {"from": _snx_exchanger()}) def mint_0x57Ab1ec28D129707052df4dF418D58a2D46d5f51( @@ -155,7 +171,7 @@ def mint_0x57Ab1ec28D129707052df4dF418D58a2D46d5f51( ) -> None: # Synth sUSD target_contract = Contract("0x6C85C5198C3CC4dB1b87Cb43b2674241a30f4845") - target_contract.issue(target, amount, {"from": "0x778D2d3E3515e42573EB1e6a8d8915D4a22D9d54"}) + target_contract.issue(target, amount, {"from": _snx_exchanger()}) def mint_0x8dAEBADE922dF735c38C80C7eBD708Af50815fAa( From 980065c8925a4615d0b8988a2fff541281ed2bd0 Mon Sep 17 00:00:00 2001 From: Ben Hauser Date: Thu, 27 May 2021 01:19:18 +0400 Subject: [PATCH 3/3] release: update changelog, bump version to v0.2.1 --- CHANGELOG.md | 9 +++++++++ setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d49e7c0..f6456ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased](https://github.com/iamdefinitelyahuman/brownie-token-tester) +## [0.2.1](https://github.com/iamdefinitelyahuman/brownie-token-tester/tree/v0.2.1) - 2021-05-26 + +### Changed +- Use Vyper `v0.2.12` + +### Fixed +- Query SNX exchanger address from address resolver + ## [0.2.0](https://github.com/iamdefinitelyahuman/brownie-token-tester/tree/v0.2.0) - 2021-03-28 + ### Added - Custom minting logic for: USDC, DAI, USDT, EURS, sEURS, sETH, sUSD, ankrETH, rETH diff --git a/setup.cfg b/setup.cfg index 8761f26..a8ac676 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.2.0 +current_version = 0.2.1 [bumpversion:file:setup.py] diff --git a/setup.py b/setup.py index e829ce2..df9ed17 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ name="brownie-token-tester", packages=find_packages(exclude=["tests", "tests.*"]), py_modules=["brownie_tokens"], - version="0.2.0", # don't change this manually, use bumpversion instead + version="0.2.1", # don't change this manually, use bumpversion instead license="MIT", description="Helper objects for generating ERC20s while testing a Brownie project.", long_description=long_description,