Merge pull request #1064 from pirapira/0.23.0

0.23.0 release

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.22.0
+current_version = 0.23.0
 commit = True
 tag = True
 

.bumpversion_contracts.cfg

@@ -1,14 +1,11 @@
 [bumpversion]
-current_version = 0.15.0
+current_version = 0.16.0
 commit = True
 tag = False
 
 [bumpversion:file:raiden_contracts/constants.py]
 serialize = CONTRACTS_VERSION = "{major}.{minor}.{patch}"
 
-[bumpversion:file:raiden_contracts/data/source/raiden/EndpointRegistry.sol]
-serialize = contract_version = "{major}.{minor}.{patch}";
-
 [bumpversion:file:raiden_contracts/data/source/services/MonitoringService.sol]
 serialize = contract_version = "{major}.{minor}.{patch}";
 

CHANGELOG.md

@@ -7,9 +7,12 @@ Documents changes that result in:
 
 ## Unreleased
 
+## [0.23.0](https://github.com/raiden-network/raiden-contracts/releases/tag/v0.23.0) - 2019-06-07
+
 - [#1013](https://github.com/raiden-network/raiden-contracts/pull/1013) Remove EndpointRegistry contract
-- When OneToN checks the signature of an IOU, it considers MessageTypeId.IOU
-- Stopped using Merkle trees; instead the concatenation of all submitted locks is hashed
+- [#1024](https://github.com/raiden-network/raiden-contracts/pull/1024) When OneToN checks the signature of an IOU, it considers MessageTypeId.IOU
+- [#1062](https://github.com/raiden-network/raiden-contracts/pull/1062) Stopped using Merkle trees; instead the concatenation of all submitted locks is hashed
+- [#1043](https://github.com/raiden-network/raiden-contracts/pull/1062) This Changelog is supposed to appear in the package
 
 ## [0.22.0](https://github.com/raiden-network/raiden-contracts/releases/tag/v0.22.0) - 2019-06-03
 

raiden_contracts/constants.py

@@ -2,12 +2,11 @@
 from enum import Enum, IntEnum
 
 # Do not change this, this is handled by bumpversion with .bumpversion_contracts.cfg
-CONTRACTS_VERSION = "0.15.0"
+CONTRACTS_VERSION = "0.16.0"
 
 PRECOMPILED_DATA_FIELDS = ["abi", "bin", "bin-runtime", "metadata"]
 
 # Contract names
-CONTRACT_ENDPOINT_REGISTRY = "EndpointRegistry"
 CONTRACT_HUMAN_STANDARD_TOKEN = "HumanStandardToken"
 CONTRACT_TOKEN_NETWORK_REGISTRY = "TokenNetworkRegistry"
 CONTRACT_TOKEN_NETWORK = "TokenNetwork"
@@ -41,7 +40,6 @@
 GAS_REQUIRED_FOR_UNLOCK_6_LOCKS = 72944
 
 GAS_REQUIRED_FOR_REGISTER_SECRET = 46161
-GAS_REQUIRED_FOR_ENDPOINT_REGISTER = 49183
 
 GAS_REQUIRED_FOR_MS_MONITOR = 203802
 GAS_REQUIRED_FOR_MS_CLAIM_REWARD = 42647
@@ -160,7 +158,6 @@ class DeploymentModule(Enum):
 ContractListEntry = namedtuple("ContractListEntry", "module name")
 
 CONTRACT_LIST = [
-    ContractListEntry(module=DeploymentModule.RAIDEN, name=CONTRACT_ENDPOINT_REGISTRY),
     ContractListEntry(module=DeploymentModule.RAIDEN, name=CONTRACT_SECRET_REGISTRY),
     ContractListEntry(module=DeploymentModule.RAIDEN, name=CONTRACT_TOKEN_NETWORK_REGISTRY),
     ContractListEntry(module=DeploymentModule.SERVICES, name=CONTRACT_SERVICE_REGISTRY),

raiden_contracts/data/deployment_goerli.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 5, "contracts": {"EndpointRegistry": {"address": "0xEBF790f5489D4c89242d0E838D9dCB140Ec56417", "transaction_hash": "0xb6759d1a72fb082885b5b9cc6cd87a47690ccf9513e326c650fccbb29cf796fb", "block_number": 703320, "gas_cost": 555366, "constructor_arguments": []}, "SecretRegistry": {"address": "0x0d6b8D4AF589ea32fD88461602033D4D680Efc19", "transaction_hash": "0xc50a1eeb9b9ddfb0ce2fb18d176657e297675369c4f4a3b6f1e0f90e2ca5bff3", "block_number": 703321, "gas_cost": 350161, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0xb6D67aF000551dAA01ca889e1b8aEED032479cC4", "transaction_hash": "0x0f610cfc03bb56af4c2b59b78a87f7499ec257a31c05780958dadafa5e4c5fab", "block_number": 703324, "gas_cost": 5236384, "constructor_arguments": ["0x0d6b8D4AF589ea32fD88461602033D4D680Efc19", 5, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}
+{"contracts_version": "0.16.0", "chain_id": 5, "contracts": {"SecretRegistry": {"address": "0xA0834414FCf610efb961dC9d45e2656c436E4F15", "transaction_hash": "0xd3b42c7af96fe884c8126e1b2653e83a1c2a746a5231cd7cd26f2cdc02e14d99", "block_number": 727900, "gas_cost": 350097, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0xeDD4d279a652DdF5a9F9e251908a78A026A4dce4", "transaction_hash": "0x3a6c7eba8b031464b22313154472244104c231d65216380d66c296b68b8e4285", "block_number": 727901, "gas_cost": 5028193, "constructor_arguments": ["0xA0834414FCf610efb961dC9d45e2656c436E4F15", 5, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}

raiden_contracts/data/deployment_kovan.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 42, "contracts": {"EndpointRegistry": {"address": "0x31C31939f9F5C005C18026e5871574b82729019c", "transaction_hash": "0xe5cea1114621c8594a152965b03b4e085dda9f0be8cee2db4ae0ea53b116e5d2", "block_number": 11333195, "gas_cost": 555366, "constructor_arguments": []}, "SecretRegistry": {"address": "0x14a2Df9433dBD20ecDC0D7E50815e36F98263494", "transaction_hash": "0xeb93646f620b804a7344e3a3f3449160082b27276da883606ee60762e3c783d4", "block_number": 11333198, "gas_cost": 350161, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0x089f259a97203Bb57C4df1f12a9BCedc98F1CA77", "transaction_hash": "0x9d47a8de8a552a3c4ebd6b9dd949c36ed076ca5abc5103fd3591d2d2e5cb9af6", "block_number": 11333201, "gas_cost": 5236384, "constructor_arguments": ["0x14a2Df9433dBD20ecDC0D7E50815e36F98263494", 42, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}
+{"contracts_version": "0.16.0", "chain_id": 42, "contracts": {"SecretRegistry": {"address": "0x9113F0FfCdCb9Ca0095cA79DC4f99BEEc750b3F1", "transaction_hash": "0x4782da056533e28495b3ac96f7beebf7262c2be8f7b0a3c9b18dfdecd6553981", "block_number": 11425561, "gas_cost": 350097, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0x7b20E8C821Ee72d0ebd23457C60f5e06c6242036", "transaction_hash": "0x75c1ebc0e8ed3ecfffe178c8e734222dda75c62760f96b52707a592f6f752e8c", "block_number": 11425564, "gas_cost": 5028193, "constructor_arguments": ["0x9113F0FfCdCb9Ca0095cA79DC4f99BEEc750b3F1", 42, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}

raiden_contracts/data/deployment_rinkeby.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 4, "contracts": {"EndpointRegistry": {"address": "0xE1184c5Cf95b6c53ec12E491e78288C691DFfA61", "transaction_hash": "0x228dd6f51350829c484a3db88d7b0974f43ffca962c1755180964ebfd7d3a475", "block_number": 4494564, "gas_cost": 555366, "constructor_arguments": []}, "SecretRegistry": {"address": "0x57C197864c07765BAD981a39b25059eeC0560bE1", "transaction_hash": "0xb1d20deef31df1b22ea725fe0b43242d229ebf66df9c298b28726a41b698f17f", "block_number": 4494565, "gas_cost": 350161, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0xd353c140CB3B2B994672784B7363928B8191B884", "transaction_hash": "0xa6765fdf71e8379b5628eda2c2fa3557d764cd9c36f6f90c96a649e493ea24f8", "block_number": 4494566, "gas_cost": 5236384, "constructor_arguments": ["0x57C197864c07765BAD981a39b25059eeC0560bE1", 4, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}
+{"contracts_version": "0.16.0", "chain_id": 4, "contracts": {"SecretRegistry": {"address": "0xAc633fb8c3cd65cC941e8D911FFeeF6e906fCc5C", "transaction_hash": "0xcca1fce183d220165b4f2c9e597d301deba0799c763d65d8b04a0e2624eb6b57", "block_number": 4519179, "gas_cost": 350097, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0xCBee035Df4E3f2b40506c4cCc7be4D76407F7FF7", "transaction_hash": "0xf384383d89ab980e6c8b503210e9356c12af7c67d6bbe2dea55777828b4fec21", "block_number": 4519180, "gas_cost": 5028193, "constructor_arguments": ["0xAc633fb8c3cd65cC941e8D911FFeeF6e906fCc5C", 4, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}

raiden_contracts/data/deployment_ropsten.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 3, "contracts": {"EndpointRegistry": {"address": "0xBBf5D6919b349D05E604d507383Ad92B69b3A047", "transaction_hash": "0xcd9f84121a94179e4f96fad9bd94350a320e405b8f8edeb8a07b2ef3ac8031f2", "block_number": 5721968, "gas_cost": 555366, "constructor_arguments": []}, "SecretRegistry": {"address": "0x410F1b4a5c2600e22041BEb5dF8f961405205eb6", "transaction_hash": "0x7cbc62c240311a561aaa7bbdfbba5ac1acacd4c9dbcc9b2df82e2097b30bbd8b", "block_number": 5721969, "gas_cost": 350161, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0x751d7292250F7c1e6C2F3412471cd4DB6B545dD6", "transaction_hash": "0x4db184efac5c523ae28db191dce10ce51c628df06ee7100c30a38ea329647a74", "block_number": 5721971, "gas_cost": 5236320, "constructor_arguments": ["0x410F1b4a5c2600e22041BEb5dF8f961405205eb6", 3, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}
+{"contracts_version": "0.16.0", "chain_id": 3, "contracts": {"SecretRegistry": {"address": "0xc1bcfEDac2c0f8F6A866BD3973A8f75F9C00A87C", "transaction_hash": "0x2da1c5e65e95970123141aa935123fdd44adc2ce08718d537da953caf2a52a57", "block_number": 5748883, "gas_cost": 350097, "constructor_arguments": []}, "TokenNetworkRegistry": {"address": "0x3CbD1A399edD50150aB30Da9C2DDaF8EaF36922e", "transaction_hash": "0x450e019cea7843b4dbaef75b47f8260b5b9edef631b3bc7c768b916df668a29a", "block_number": 5748884, "gas_cost": 5028129, "constructor_arguments": ["0xc1bcfEDac2c0f8F6A866BD3973A8f75F9C00A87C", 3, 500, 555428, 115792089237316195423570985008687907853269984665640564039457584007913129639935]}}}

raiden_contracts/data/deployment_services_goerli.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 5, "contracts": {"ServiceRegistry": {"address": "0x7a57ca9736B01399a225Cc3d11018556dbF7E03b", "transaction_hash": "0xdb357dec5871db0d4fd298416611b325539d07b71104b4aa32a747de8932ce2e", "block_number": 703334, "gas_cost": 748878, "constructor_arguments": ["0x44F86617BFB4c59CD0294922c0B795Daee4871F3"]}, "UserDeposit": {"address": "0x0d86895aA1C9240BcC763C32bCDf713FD016c302", "transaction_hash": "0x7a6b56c9f4e2a4988fd727fa16692affdbaf6d1ac1468a1260c915ea8a0d486c", "block_number": 703336, "gas_cost": 1494030, "constructor_arguments": ["0x44F86617BFB4c59CD0294922c0B795Daee4871F3", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0xC6FE862d2d8748DC0DCe98D174fA95929Ee82aa5", "transaction_hash": "0xf2ee0b25e59e510cca082d42b05c3416107cdaee51e562445c2253e72dce7ed7", "block_number": 703337, "gas_cost": 1852097, "constructor_arguments": ["0x44F86617BFB4c59CD0294922c0B795Daee4871F3", "0x7a57ca9736B01399a225Cc3d11018556dbF7E03b", "0x0d86895aA1C9240BcC763C32bCDf713FD016c302"]}, "OneToN": {"address": "0x906224902906f08Ac4559afD7ED169B7aa552E5F", "transaction_hash": "0xfc9db79e81e48608f7202490fd731eacb576977312a3e7f2c6eb7370a93e1db0", "block_number": 703339, "gas_cost": 837579, "constructor_arguments": ["0x0d86895aA1C9240BcC763C32bCDf713FD016c302", 5]}}}
+{"contracts_version": "0.16.0", "chain_id": 5, "contracts": {"ServiceRegistry": {"address": "0xe31Ea67C598146E01718822731531c2f6060B855", "transaction_hash": "0x2bc0f0929f967ac9cade6213df1fd9183d6f54f60230fb0045671ea90ad6f79f", "block_number": 727945, "gas_cost": 748878, "constructor_arguments": ["0xaC728DF5126bf82C191fD2Fc101C6F9C5CC13766"]}, "UserDeposit": {"address": "0x6978D210a7F69527a210C0942ED7520045FE1a29", "transaction_hash": "0x3baa5b651d3f9a6c579123afb82594f75b6d3642a2fae652e6d6cb6b75e6642a", "block_number": 727946, "gas_cost": 1494030, "constructor_arguments": ["0xaC728DF5126bf82C191fD2Fc101C6F9C5CC13766", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0x11DaA71F7141f438e0371dc24a9895F2C4913Fde", "transaction_hash": "0x054bcaa0067c37a68c364c28854219f98302a1842aa5fff95cc99362ed1cc954", "block_number": 727947, "gas_cost": 1852033, "constructor_arguments": ["0xaC728DF5126bf82C191fD2Fc101C6F9C5CC13766", "0xe31Ea67C598146E01718822731531c2f6060B855", "0x6978D210a7F69527a210C0942ED7520045FE1a29"]}, "OneToN": {"address": "0x2853e12196968d5A1770d0056BbDD40f3Ea28E6a", "transaction_hash": "0xc94ac139e6d293fa378c393d04248edc6dbd91bd3c3928f9535c7f48e0338f51", "block_number": 727948, "gas_cost": 842875, "constructor_arguments": ["0x6978D210a7F69527a210C0942ED7520045FE1a29", 5]}}}

raiden_contracts/data/deployment_services_kovan.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 42, "contracts": {"ServiceRegistry": {"address": "0x93D2cDf4b1f396E00736EC36F8bEd376912223EF", "transaction_hash": "0xb076dcf7143142c604aee6121bf99c38ea8cee8cc54050870cb12aac111bbbe7", "block_number": 11333222, "gas_cost": 748878, "constructor_arguments": ["0xd167e7A23205DF7038e5682E6B4323D2A8E60eB9"]}, "UserDeposit": {"address": "0xaC86765006dFb3BCb46Bd648744e3382126a57E4", "transaction_hash": "0x911cc2c8232dc2e7304db32f1b3329a9939a3fcb401b4d23505d484a5752f453", "block_number": 11333225, "gas_cost": 1494030, "constructor_arguments": ["0xd167e7A23205DF7038e5682E6B4323D2A8E60eB9", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0xfEc73b5aD302FD003C1a46C127A32cC6C7099531", "transaction_hash": "0x1ff70a8634f69fd78022be66d53718d14059f771618a9c7e2bded0c17cd38b0a", "block_number": 11333228, "gas_cost": 1852097, "constructor_arguments": ["0xd167e7A23205DF7038e5682E6B4323D2A8E60eB9", "0x93D2cDf4b1f396E00736EC36F8bEd376912223EF", "0xaC86765006dFb3BCb46Bd648744e3382126a57E4"]}, "OneToN": {"address": "0xAB9791BA17c6B9c8f9352ddfeeE5f6940bb342E2", "transaction_hash": "0x81b59f9f126df847e865a051a6fe7ba619568671f9253b215a5b06d653041045", "block_number": 11333231, "gas_cost": 837579, "constructor_arguments": ["0xaC86765006dFb3BCb46Bd648744e3382126a57E4", 42]}}}
+{"contracts_version": "0.16.0", "chain_id": 42, "contracts": {"ServiceRegistry": {"address": "0x735B7Ff62bd8FC1302aD8b5ED069b82EDBeBC370", "transaction_hash": "0x4262da985647e89c0aa7711d09061121c1db65294644184b09405fac3dfa5017", "block_number": 11425584, "gas_cost": 748878, "constructor_arguments": ["0x0Cd7A3A8b2f5322F122FD075c590b6d50a69d69a"]}, "UserDeposit": {"address": "0xFa1ec7838C0A7289866baBB12b616ee12F7fBd77", "transaction_hash": "0x036321054f7de776d029eacbca9c7784bd02dcbd1eaf0bdc3f1cfecf3809cf3b", "block_number": 11425587, "gas_cost": 1494030, "constructor_arguments": ["0x0Cd7A3A8b2f5322F122FD075c590b6d50a69d69a", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0x20D74Fbab3609DAB4E1c717671C2c0B44A91a9Cd", "transaction_hash": "0x2da4c8053e235d6dc5ed2b98790e2d38e442c883278cadc2439e2825f47ab730", "block_number": 11425590, "gas_cost": 1852097, "constructor_arguments": ["0x0Cd7A3A8b2f5322F122FD075c590b6d50a69d69a", "0x735B7Ff62bd8FC1302aD8b5ED069b82EDBeBC370", "0xFa1ec7838C0A7289866baBB12b616ee12F7fBd77"]}, "OneToN": {"address": "0x08A1548abDDEC22d5fB6E05887f1012251915326", "transaction_hash": "0x93b9d3333e13eca69b046947335dd5c96b36e85ca2b664527f029bed942b1175", "block_number": 11425593, "gas_cost": 842939, "constructor_arguments": ["0xFa1ec7838C0A7289866baBB12b616ee12F7fBd77", 42]}}}

raiden_contracts/data/deployment_services_rinkeby.json

@@ -1 +1 @@
-{"contracts_version": "0.15.0", "chain_id": 4, "contracts": {"ServiceRegistry": {"address": "0x67FBdd078A3782fbE685206c63A080b227b641bC", "transaction_hash": "0x4dad66297921ebea3bab14a942f34fe03deadb46127437f2497b1f28199a8e51", "block_number": 4494575, "gas_cost": 748878, "constructor_arguments": ["0xD8608eE4db52Ac333762fef2481e950eD07BBa2C"]}, "UserDeposit": {"address": "0x53Abe3154Ba94617B4b4e5D2510991D2046aF93f", "transaction_hash": "0x88caf3a2ab9395ece5194acefe578b77ee78ae2cc3ccda7f169bddf00f422215", "block_number": 4494576, "gas_cost": 1494030, "constructor_arguments": ["0xD8608eE4db52Ac333762fef2481e950eD07BBa2C", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0xFcFa1B3dfd57d0eA7A5AAEC385Ea19928065E304", "transaction_hash": "0xb872bd283c32c1de1d318ebe675e6b397da1f927c58303a5c2fd1e8c9160301e", "block_number": 4494577, "gas_cost": 1852097, "constructor_arguments": ["0xD8608eE4db52Ac333762fef2481e950eD07BBa2C", "0x67FBdd078A3782fbE685206c63A080b227b641bC", "0x53Abe3154Ba94617B4b4e5D2510991D2046aF93f"]}, "OneToN": {"address": "0x81b3D96ab565E41c68b1Df2aa02b161fa474a598", "transaction_hash": "0xb222e5fd4d31811140f7f0a974e9d766953ff5005649c3bcb5686a803a5168f1", "block_number": 4494578, "gas_cost": 837579, "constructor_arguments": ["0x53Abe3154Ba94617B4b4e5D2510991D2046aF93f", 4]}}}
+{"contracts_version": "0.16.0", "chain_id": 4, "contracts": {"ServiceRegistry": {"address": "0xdD39F5BC6A509a8872119dF7c380713f7b1ec85f", "transaction_hash": "0xf06baf1e0ccf4747ae5dfaa347531fb044e11b4def2f0275efe17d494faabe67", "block_number": 4519200, "gas_cost": 748878, "constructor_arguments": ["0x1F6EB206CA83dc9b57936139D281E9eE49688CCD"]}, "UserDeposit": {"address": "0xee773Bd0910b0836D1Ee90028a4e942F1cAF26e0", "transaction_hash": "0x83f6d3ba1bbfc0e06ac375a1d8a61f6344a666b5c54098dcdcf9890949c1510f", "block_number": 4519201, "gas_cost": 1494030, "constructor_arguments": ["0x1F6EB206CA83dc9b57936139D281E9eE49688CCD", 115792089237316195423570985008687907853269984665640564039457584007913129639935]}, "MonitoringService": {"address": "0xb88a5775dac7e387a90a900946B969e9796ac6e2", "transaction_hash": "0xe98718b11667a95e05343b354c6361abc78bda736c8ff9e4071d9fed4eb6a1ec", "block_number": 4519202, "gas_cost": 1852097, "constructor_arguments": ["0x1F6EB206CA83dc9b57936139D281E9eE49688CCD", "0xdD39F5BC6A509a8872119dF7c380713f7b1ec85f", "0xee773Bd0910b0836D1Ee90028a4e942F1cAF26e0"]}, "OneToN": {"address": "0xA7dAf683780174Ed0aaC699E1494a90f2b331bF3", "transaction_hash": "0xf63d7493e1a4f61dc653103de7d80b1e3e96b61e986d972617f7d7e64db63a3d", "block_number": 4519203, "gas_cost": 842939, "constructor_arguments": ["0xee773Bd0910b0836D1Ee90028a4e942F1cAF26e0", 4]}}}