Proxy fixes #1530
Proxy fixes #1530
Conversation
|
this might cause some confusion, because two instances of |
Yup, that may be. Would you prefer to wait till we remove the old contracts? |
|
I think we can merge it if we want to use contracts in parallel... we'll eventually switch to wrapped manager when the old contracts are removed. |
raiden/blockchain/abi.py
Outdated
| @@ -51,7 +51,7 @@ | |||
| CONTRACT_NETTING_CHANNEL = 'NettingChannelContract' | |||
| CONTRACT_REGISTRY = 'Registry' | |||
|
|
|||
| CONTRACT_TOKEN_NETWORK_REGISTRY = 'TokenNetworkRegistry' | |||
| CONTRACT_TOKEN_NETWORK_REGISTRY = 'TokenNetworksRegistry' | |||
There was a problem hiding this comment.
The name should be fixed in the smart contracts, not here, as suggested by Lefteris. Issue: raiden-network/raiden-contracts#107
There was a problem hiding this comment.
yep, please switch to singular
raiden/blockchain/abi.py
Outdated
| @@ -51,7 +51,7 @@ | |||
| CONTRACT_NETTING_CHANNEL = 'NettingChannelContract' | |||
| CONTRACT_REGISTRY = 'Registry' | |||
|
|
|||
| CONTRACT_TOKEN_NETWORK_REGISTRY = 'TokenNetworkRegistry' | |||
| CONTRACT_TOKEN_NETWORK_REGISTRY = 'TokenNetworksRegistry' | |||
There was a problem hiding this comment.
yep, please switch to singular
raiden/network/blockchain_service.py
Outdated
| @@ -36,8 +36,8 @@ def __init__( | |||
| self, | |||
| privatekey_bin: bytes, | |||
| jsonrpc_client: JSONRPCClient, | |||
| poll_timeout: int = DEFAULT_POLL_TIMEOUT): | |||
|
|
|||
| poll_timeout: int = DEFAULT_POLL_TIMEOUT | |||
There was a problem hiding this comment.
hehe, you bothered fixing style but forgot the trailing comma in the last argument
| CONTRACT_SECRET_REGISTRY | ||
| ) | ||
|
|
||
| # TODO: add this back |
There was a problem hiding this comment.
If you leave a TODO like that please make an issue and assign yourself (or someone else). Same goes for the other instances below
There was a problem hiding this comment.
Don't think that's worth an issue right now, added a task here: #1383
There was a problem hiding this comment.
@palango Whatever floats your boat. It's just to keep track of them. If it's part of an issue adding a task is fine. Thank you!
| ): | ||
| web3 = deploy_client.web3 | ||
|
|
||
| contract_interface = CONTRACT_MANAGER.abi['SecretRegistry'] |
There was a problem hiding this comment.
Please don't use the contract names directly - use the imported names from the raiden-contracts package (ideally) or blockchain/abi.py
We have to increase the block gas limit for that.
[skip ci]
| @@ -7,7 +7,7 @@ | |||
| RPC_CACHE_TTL = 600 | |||
| CACHE_TTL = 60 | |||
| ESTIMATED_BLOCK_TIME = 7 | |||
| GAS_LIMIT = 3141592 # Morden's gasLimit. | |||
| GAS_LIMIT = 10 * 10**6 | |||
There was a problem hiding this comment.
It's all fine @palango, so I will merge but why did you increase the default gas limit? The 3.14 mill was really old a value, that's true -- ropsten now has 8 mill. But why 10? Any specific reason? I am curious.
There was a problem hiding this comment.
@palango I just saw the commit that explains that you needed bigger gas limit for the new deployment so this is why you made the change. How much gas was needed exactly?
There was a problem hiding this comment.
4.8 mil last I know of - for the TokenNetworkRegistry.
Use the raiden-contracts
ContractManagerfor now and disable version checks.Also fix some styling and add some type annotations.