This repository has been archived by the owner on Jul 9, 2021. It is now read-only.
DevUtils refactor into public libraries #2464
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dorothy-zbornak
force-pushed
the
feat/contracts/dev-utils/public-libraries-refactor
branch
from
1223e1a to
68241ca
Compare
|
dorothy-zbornak
force-pushed
the
feat/contracts/dev-utils/public-libraries-refactor
branch
2 times, most recently
from
a6d8043 to
3947d37
Compare
dorothy-zbornak
requested review from
abandeali1,
fabioberger,
feuGeneA and
hysz
as code owners
hysz
reviewed
Feb 5, 2020
| @@ -28,6 +32,18 @@ import { SupportedProvider, TxData } from 'ethereum-types'; | |||
| import { constants } from './utils/constants'; | |||
| import { erc20TokenInfo, erc721TokenInfo } from './utils/token_info'; | |||
|
|
|||
| const allArtifacts = { | |||
hysz
reviewed
Feb 5, 2020
| "zrxVault": "0x1941ff73d1154774d87521d2d0aaad5d19c8df60", | ||
| "staking": "0x0d8b0dd11f5d34ed41d556def5f841900d5b1c6b", | ||
| "stakingProxy": "0x38ef19fdf8e8415f18c307ed71967e19aac28ba1", | ||
| "zrxVault": "0xc4df27466183c0fe2a5924d6ea56e334deff146a", |
There was a problem hiding this comment.
Why did these need to be re-deployed?
There was a problem hiding this comment.
These are ganache snapshot addresses. Every public library in DevUtils is a separate deployment now, so it moves the deployer's nonce so we end up with different addresses.
hysz
reviewed
Feb 5, 2020
| @@ -0,0 +1,374 @@ | |||
| /* | |||
There was a problem hiding this comment.
Did any of the logic change between the code in contracts/src/LibAssetData.sol and this, or just refactored?
There was a problem hiding this comment.
Mostly refactored. _getConvertibleMakerBalanceAndAssetProxyAllowance() got added but it's just a no-op placeholder in this PR, so you'll see it again.
hysz
reviewed
Feb 5, 2020
| /// @param owner The owner of the tokens. | ||
| /// @param spender The address the spender. | ||
| /// @return allowance The allowance for a token, owner, and spender. | ||
| function allowance(address token, address owner, address spender) |
There was a problem hiding this comment.
Why do we return 0 instead of reverting if the call fails?
There was a problem hiding this comment.
This library is all about very permissive interactions. Plus I figured we really don't want to revert in DevUtils if we can help it.
hysz
approved these changes
Feb 5, 2020
dorothy-zbornak
force-pushed
the
feat/abi-gen/library-linking
branch
2 times, most recently
from
7da2d0b to
0b372a3
Compare
dorothy-zbornak
force-pushed
the
feat/contracts/dev-utils/public-libraries-refactor
branch
from
3947d37 to
ebbf2f0
Compare
dorothy-zbornak
force-pushed
the
feat/abi-gen/library-linking
branch
from
0b372a3 to
8635849
Compare
dorothy-zbornak
force-pushed
the
feat/contracts/dev-utils/public-libraries-refactor
branch
from
ebbf2f0 to
a08399d
Compare
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the third in a series of PRs that splits #2456 into more manageable pieces.
Description
Chill, most of these files are just regenerated artifacts/wrappers.
@0x/contracts-dev-utils:DevUtilscontract into public libraries, which get linked at deployment time.LibTransactionDecodercontract that was introduced in Fix regression in DevUtils #2449 and folds it back intoDevUtils.allowance()andbalanceOf()toLibERC20Token._getTransferableConvertedMakerAssetAmount(), which currently just wraps_getTransferableAssetAmount(), but will be used for dydx maker assets in the next PR. This is necessary because dydx validation depends on the taker asset as well as the maker asset.@0x/migrations:@0x/contract-wrappers, even for ganache migrations.Testing instructions
Types of changes
Checklist:
[WIP]if necessary.