Skip to content
This repository has been archived by the owner on Jul 9, 2021. It is now read-only.

update ethereumjs-blockstream 6.0.0 -> ^7.0.0 #2089

Merged
merged 2 commits into from
Aug 22, 2019

Conversation

xianny
Copy link
Contributor

@xianny xianny commented Aug 21, 2019

Description

Updates ethereumjs-blockstream. 6.0.0 will be removed after we update coordinator-server deps in 0xProject/0x-coordinator-server#14

Relates to #1989

Testing instructions

Types of changes

Checklist:

  • Prefix PR title with [WIP] if necessary.
  • Add tests to cover changes as needed.
  • Update documentation as needed.
  • Add new entries to the relevant CHANGELOG.jsons.

@xianny xianny requested a review from dekz August 21, 2019 23:53
@buildsize
Copy link

buildsize bot commented Aug 21, 2019

File name Previous Size New Size Change
init.py 144.25 KB 144.25 KB 0 bytes (0%)
abi_gen_dummy.ts 145.2 KB [deleted]
lib_dummy.ts 4.82 KB [deleted]
test_lib_dummy.ts 12.7 KB [deleted]
environment.pickle 1.56 MB 1.56 MB 0 bytes (0%)
index.doctree 190.99 KB 190.99 KB 0 bytes (0%)
.buildinfo 230 bytes 230 bytes 0 bytes (0%)
genindex.html 5.6 KB 5.6 KB 0 bytes (0%)
index.html 2.52 KB 2.52 KB 0 bytes (0%)
objects.inv 375 bytes 375 bytes 0 bytes (0%)
py-modindex.html 3.07 KB 3.07 KB 0 bytes (0%)
search.html 2.84 KB 2.84 KB 0 bytes (0%)
searchindex.js 5.82 KB 5.82 KB 0 bytes (0%)
index.rst.txt 415 bytes 415 bytes 0 bytes (0%)
alabaster.css 10.92 KB 10.92 KB 0 bytes (0%)
basic.css 11.89 KB 11.89 KB 0 bytes (0%)
custom.css 42 bytes 42 bytes 0 bytes (0%)
doctools.js 9.05 KB 9.05 KB 0 bytes (0%)
documentation_options.js 303 bytes 303 bytes 0 bytes (0%)
file.png 286 bytes 286 bytes 0 bytes (0%)
jquery-[version].js 273.79 KB 273.79 KB 0 bytes (0%)
jquery.js 86.08 KB 86.08 KB 0 bytes (0%)
language_data.js 10.59 KB 10.59 KB 0 bytes (0%)
minus.png 90 bytes 90 bytes 0 bytes (0%)
plus.png 90 bytes 90 bytes 0 bytes (0%)
pygments.css 4.69 KB 4.69 KB 0 bytes (0%)
searchtools.js 15.61 KB 15.61 KB 0 bytes (0%)
underscore-[version].js 34.34 KB 34.34 KB 0 bytes (0%)
underscore.js 11.86 KB 11.86 KB 0 bytes (0%)
contract_addresses.html 17.89 KB 17.89 KB 0 bytes (0%)
contract_artifacts.html 8.24 KB 7.94 KB -310 bytes (4%)
_bootstrap.html 142.73 KB 142.73 KB 0 bytes (0%)
json_schemas.html 12.43 KB 12.43 KB 0 bytes (0%)
order_utils.html 44.83 KB 44.83 KB 0 bytes (0%)
erc20_token.html 88.14 KB 88.14 KB 0 bytes (0%)
exchange.html 506.16 KB 506.16 KB 0 bytes (0%)
tx_params.html 8.83 KB 8.83 KB 0 bytes (0%)
local_message_signer.html 15.07 KB 15.07 KB 0 bytes (0%)
asset_data_utils.html 22.65 KB 22.65 KB 0 bytes (0%)
default_api.html 118.49 KB 118.49 KB 0 bytes (0%)
globals.html 13.39 KB [deleted]
asset_proxy_owner.assetproxyownercontract.html 446.56 KB [deleted]
coordinator.coordinatorcontract.html 157.58 KB [deleted]
coordinator_registry.coordinatorregistrycontract.html 97.7 KB [deleted]
dummy_erc20_token.dummyerc20tokencontract.html 265.44 KB [deleted]
dummy_erc721_token.dummyerc721tokencontract.html 312.47 KB [deleted]
dutch_auction.dutchauctioncontract.html 150.53 KB [deleted]
erc20_proxy.erc20proxycontract.html 190.21 KB [deleted]
erc20_token.erc20tokencontract.html 160.91 KB [deleted]
erc721_proxy.erc721proxycontract.html 190.53 KB [deleted]
erc721_token.erc721tokencontract.html 221.79 KB [deleted]
eth_balance_checker.ethbalancecheckercontract.html 63.84 KB [deleted]
exchange.exchangecontract.html 773.67 KB [deleted]
forwarder.forwardercontract.html 180.32 KB [deleted]
i_asset_proxy.iassetproxycontract.html 179.55 KB [deleted]
i_validator.ivalidatorcontract.html 63.85 KB [deleted]
i_wallet.iwalletcontract.html 62.77 KB [deleted]
multi_asset_proxy.multiassetproxycontract.html 230.27 KB [deleted]
order_validator.ordervalidatorcontract.html 137.33 KB [deleted]
weth9.weth9contract.html 213.72 KB [deleted]
zrx_token.zrxtokencontract.html 178.78 KB [deleted]
asset_proxy_owner.assetproxyownerevents.html 26.64 KB [deleted]
coordinator_registry.coordinatorregistryevents.html 12.94 KB [deleted]
dummy_erc20_token.dummyerc20tokenevents.html 13.85 KB [deleted]
dummy_erc721_token.dummyerc721tokenevents.html 15.18 KB [deleted]
erc20_proxy.erc20proxyevents.html 14.06 KB [deleted]
erc20_token.erc20tokenevents.html 13.67 KB [deleted]
erc721_proxy.erc721proxyevents.html 14.09 KB [deleted]
erc721_token.erc721tokenevents.html 14.95 KB [deleted]
exchange.exchangeevents.html 17.26 KB [deleted]
multi_asset_proxy.multiassetproxyevents.html 15.62 KB [deleted]
weth9.weth9events.html 15.63 KB [deleted]
zrx_token.zrxtokenevents.html 13.58 KB [deleted]
asset_proxy_owner.assetproxyownerassetproxyregistrationeventargs.html 17.4 KB [deleted]
asset_proxy_owner.assetproxyownerconfirmationeventargs.html 17.2 KB [deleted]
asset_proxy_owner.assetproxyownerconfirmationtimeseteventargs.html 17.35 KB [deleted]
asset_proxy_owner.assetproxyownerdepositeventargs.html 17.08 KB [deleted]
asset_proxy_owner.assetproxyownerexecutioneventargs.html 16.24 KB [deleted]
asset_proxy_owner.assetproxyownerexecutionfailureeventargs.html 16.29 KB [deleted]
asset_proxy_owner.assetproxyownerowneradditioneventargs.html 16.19 KB [deleted]
asset_proxy_owner.assetproxyownerownerremovaleventargs.html 16.18 KB [deleted]
asset_proxy_owner.assetproxyownerrequirementchangeeventargs.html 16.24 KB [deleted]
asset_proxy_owner.assetproxyownerrevocationeventargs.html 17.18 KB [deleted]
asset_proxy_owner.assetproxyownersubmissioneventargs.html 16.25 KB [deleted]
asset_proxy_owner.assetproxyownertimelockchangeeventargs.html 16.32 KB [deleted]
coordinator_registry.coordinatorregistrycoordinatorendpointseteventargs.html 14.82 KB [deleted]
dummy_erc20_token.dummyerc20tokenapprovaleventargs.html 15.51 KB [deleted]
dummy_erc20_token.dummyerc20tokentransfereventargs.html 15.47 KB [deleted]
dummy_erc721_token.dummyerc721tokenapprovaleventargs.html 15.84 KB [deleted]
dummy_erc721_token.dummyerc721tokenapprovalforalleventargs.html 15.89 KB [deleted]
dummy_erc721_token.dummyerc721tokentransfereventargs.html 15.79 KB [deleted]
erc20_proxy.erc20proxyauthorizedaddressaddedeventargs.html 14.57 KB [deleted]
erc20_proxy.erc20proxyauthorizedaddressremovedeventargs.html 14.59 KB [deleted]
erc20_token.erc20tokenapprovaleventargs.html 15.29 KB [deleted]
erc20_token.erc20tokentransfereventargs.html 15.25 KB [deleted]
erc721_proxy.erc721proxyauthorizedaddressaddedeventargs.html 14.61 KB [deleted]
erc721_proxy.erc721proxyauthorizedaddressremovedeventargs.html 14.63 KB [deleted]
erc721_token.erc721tokenapprovaleventargs.html 15.61 KB [deleted]
erc721_token.erc721tokenapprovalforalleventargs.html 15.66 KB [deleted]
erc721_token.erc721tokentransfereventargs.html 15.56 KB [deleted]
exchange.exchangeassetproxyregisteredeventargs.html 15.07 KB [deleted]
exchange.exchangecanceleventargs.html 18.92 KB [deleted]
exchange.exchangecanceluptoeventargs.html 16.03 KB [deleted]
exchange.exchangefilleventargs.html 23.83 KB [deleted]
exchange.exchangesignaturevalidatorapprovaleventargs.html 16.19 KB [deleted]
multi_asset_proxy.multiassetproxyassetproxyregisteredeventargs.html 15.05 KB [deleted]
multi_asset_proxy.multiassetproxyauthorizedaddressaddedeventargs.html 15.05 KB [deleted]
multi_asset_proxy.multiassetproxyauthorizedaddressremovedeventargs.html 15.07 KB [deleted]
weth9.weth9approvaleventargs.html 15.43 KB [deleted]
weth9.weth9depositeventargs.html 14.54 KB [deleted]
weth9.weth9transfereventargs.html 15.39 KB [deleted]
weth9.weth9withdrawaleventargs.html 14.57 KB [deleted]
zrx_token.zrxtokenapprovaleventargs.html 15.18 KB [deleted]
zrx_token.zrxtokentransfereventargs.html 15.14 KB [deleted]
asset_proxy_owner.html 21.12 KB [deleted]
coordinator.html 10.65 KB [deleted]
coordinator_registry.html 13.46 KB [deleted]
dummy_erc20_token.html 13.89 KB [deleted]
dummy_erc721_token.html 14.66 KB [deleted]
dutch_auction.html 10.67 KB [deleted]
erc20_proxy.html 13.87 KB [deleted]
erc20_token.html 13.65 KB [deleted]
erc721_proxy.html 13.91 KB [deleted]
erc721_token.html 14.37 KB [deleted]
eth_balance_checker.html 10.74 KB [deleted]
exchange.html 15.43 KB [deleted]
forwarder.html 10.63 KB [deleted]
i_asset_proxy.html 10.67 KB [deleted]
i_validator.html 10.64 KB [deleted]
i_wallet.html 10.62 KB [deleted]
multi_asset_proxy.html 14.92 KB [deleted]
order_validator.html 10.69 KB [deleted]
weth9.html 14.47 KB [deleted]
zrx_token.html 13.5 KB [deleted]
main.css 69.04 KB [deleted]
main.css.map 30.1 KB [deleted]
icons.png 9.26 KB [deleted]
[email protected] 27.09 KB [deleted]
widgets.png 480 bytes [deleted]
[email protected] 855 bytes [deleted]
main.js 148.53 KB [deleted]
search.js 581.48 KB [deleted]
erc1155_proxy.erc1155proxycontract.html 206.79 KB [deleted]
static_call_proxy.staticcallproxycontract.html 71.08 KB [deleted]
erc1155_proxy.erc1155proxyevents.html 13.85 KB [deleted]
erc1155_proxy.erc1155proxyauthorizedaddressaddedeventargs.html 14.37 KB [deleted]
erc1155_proxy.erc1155proxyauthorizedaddressremovedeventargs.html 14.39 KB [deleted]
erc1155_proxy.html 13.82 KB [deleted]
static_call_proxy.html 10.72 KB [deleted]
asset_proxy_owner.html 341.77 KB 341.77 KB 0 bytes (0%)
coordinator.html 127.47 KB 127.47 KB 0 bytes (0%)
coordinator_registry.html 36.15 KB 36.15 KB 0 bytes (0%)
dutch_auction.html 54.84 KB 54.84 KB 0 bytes (0%)
erc20_proxy.html 105.63 KB 105.63 KB 0 bytes (0%)
erc721_proxy.html 105.72 KB 105.72 KB 0 bytes (0%)
erc721_token.html 141.96 KB 141.96 KB 0 bytes (0%)
eth_balance_checker.html 21.03 KB 21.03 KB 0 bytes (0%)
forwarder.html 107.42 KB 107.42 KB 0 bytes (0%)
i_asset_proxy.html 89.89 KB 89.89 KB 0 bytes (0%)
i_validator.html 26.24 KB 25.7 KB -561 bytes (2%)
i_wallet.html 23.61 KB 23.21 KB -418 bytes (2%)
multi_asset_proxy.html 141.39 KB 141.39 KB 0 bytes (0%)
order_validator.html 115.34 KB 115.34 KB 0 bytes (0%)
weth9.html 129.04 KB 129.04 KB 0 bytes (0%)
zrx_token.html 107.34 KB 107.34 KB 0 bytes (0%)
dev_utils.devutilscontract.html 293.36 KB [deleted]
dev_utils.html 10.63 KB [deleted]
dev_utils.html 339.53 KB 339.53 KB 0 bytes (0%)

@@ -171,8 +171,8 @@ export class SubscriptionManager<ContractEventArgs, ContractEvents extends strin
if (this._blockAndLogStreamerIfExists === undefined) {
throw new Error(SubscriptionErrors.SubscriptionNotFound);
}
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogAdded(this._onLogAddedSubscriptionToken as string);
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogRemoved(this._onLogRemovedSubscriptionToken as string);
this._blockAndLogStreamerIfExists.unsubscribeFromOnLogsAdded(this._onLogAddedSubscriptionToken as string);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like 7.0.0 now calls back with an Array of logs rather than calling back with a single log. This type casting should result in a test failure.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice catch @dekz . Looks like subscribeToOnLogsAdded/Removed still returns a string, so the subscriptionTokens are still strings. But the callbacks take an array of logs instead of a single log. I think I fixed it in ec2ca78

Thanks for calling my attention to this, wouldn't have noticed it otherwise :/

@coveralls
Copy link

coveralls commented Aug 22, 2019

Coverage Status

Coverage remained the same at 80.256% when pulling d987fec on fix/update-ethereumjs-blockstream into d3c714b on development.

@xianny xianny force-pushed the fix/update-ethereumjs-blockstream branch from ec2ca78 to d987fec Compare August 22, 2019 00:59
@xianny xianny merged commit 0fe4f58 into development Aug 22, 2019
@xianny xianny deleted the fix/update-ethereumjs-blockstream branch August 22, 2019 01:39
@xianny xianny added this to the Multilang cleanup milestone Aug 22, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants