Skip to content

fix/enhancement: added bytes32 name/symbol support in get_token() #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ErikBjare merged 4 commits into from
Oct 28, 2021
Merged

fix/enhancement: added bytes32 name/symbol support in get_token() #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56cb8f1
fix/enhancement: added bytes32 name/symbol support in get_token()
liquid-8 Oct 27, 2021
b6d0846
Merge branch 'uniswap-python:master' into master
liquid-8 Oct 27, 2021
3db89ed
fix/enhancement: added bytes32 name/symbol support in get_token()
liquid-8 Oct 27, 2021
1f7587f
Merge branch 'master' of https://github.com/liquid-8/uniswap-python
liquid-8 Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
263 changes: 263 additions & 0 deletions uniswap/assets/erc20b32.abi
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,263 @@
[
{
"constant": true,
"inputs": [],
"name": "name",
"outputs": [
{
"name": "",
"type": "bytes32"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "symbol",
"outputs": [
{
"name": "",
"type": "bytes32"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "decimals",
"outputs": [
{
"name": "",
"type": "uint8"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "spender",
"type": "address"
},
{
"name": "value",
"type": "uint256"
}
],
"name": "approve",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [],
"name": "totalSupply",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "from",
"type": "address"
},
{
"name": "to",
"type": "address"
},
{
"name": "value",
"type": "uint256"
}
],
"name": "transferFrom",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "spender",
"type": "address"
},
{
"name": "addedValue",
"type": "uint256"
}
],
"name": "increaseAllowance",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "owner",
"type": "address"
}
],
"name": "balanceOf",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "spender",
"type": "address"
},
{
"name": "subtractedValue",
"type": "uint256"
}
],
"name": "decreaseAllowance",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": false,
"inputs": [
{
"name": "to",
"type": "address"
},
{
"name": "value",
"type": "uint256"
}
],
"name": "transfer",
"outputs": [
{
"name": "",
"type": "bool"
}
],
"payable": false,
"stateMutability": "nonpayable",
"type": "function"
},
{
"constant": true,
"inputs": [
{
"name": "owner",
"type": "address"
},
{
"name": "spender",
"type": "address"
}
],
"name": "allowance",
"outputs": [
{
"name": "",
"type": "uint256"
}
],
"payable": false,
"stateMutability": "view",
"type": "function"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "from",
"type": "address"
},
{
"indexed": true,
"name": "to",
"type": "address"
},
{
"indexed": false,
"name": "value",
"type": "uint256"
}
],
"name": "Transfer",
"type": "event"
},
{
"anonymous": false,
"inputs": [
{
"indexed": true,
"name": "owner",
"type": "address"
},
{
"indexed": true,
"name": "spender",
"type": "address"
},
{
"indexed": false,
"name": "value",
"type": "uint256"
}
],
"name": "Approval",
"type": "event"
}
]
16 changes: 12 additions & 4 deletions uniswap/uniswap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1172,22 +1172,30 @@ def _calculate_max_output_token(

# ------ Helpers ------------------------------------------------------------

def get_token(self, address: AddressLike) -> ERC20Token:
def get_token(self, address: AddressLike, abi_name:str="erc20") -> ERC20Token:
"""
Retrieves metadata from the ERC20 contract of a given token, like its name, symbol, and decimals.
"""
# FIXME: This function should always return the same output for the same input
# and would therefore benefit from caching
token_contract = _load_contract(self.w3, abi_name="erc20", address=address)
token_contract = _load_contract(self.w3, abi_name, address=address)
try:
name = token_contract.functions.name().call()
symbol = token_contract.functions.symbol().call()
_name = token_contract.functions.name().call()
_symbol = token_contract.functions.symbol().call()
decimals = token_contract.functions.decimals().call()
except Exception as e:
logger.warning(
f"Exception occurred while trying to get token {_addr_to_str(address)}: {e}"
)
raise InvalidToken(address)
try:
name = _name.decode()
except:
name = _name
try:
symbol = _symbol.decode()
except:
symbol = _symbol
return ERC20Token(symbol, address, name, decimals)

@functools.lru_cache()
Expand Down