crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address spot check feedback (#251)

Browse Source 
* UniswapV3 VIP (#237)

* `@0x/contracts-zero-ex`: Add UniswapV3Feature

* `@0x/contracts-zero-ex`: Add UniswapV3 VIP
`@0x/contract-artifacts`: Regenerate.
`@0x/contract-wrappers`: Regenerate.
`@0x/asset-swapper`: Add UniswapV3 VIP support.

* address review comments and appease linter

* `@0x/contracts-zero-ex`: Add UniswapV3Feature tests

* Multiplex UniswapV3 (#241)

* Add UniswapV3 support to Multiplex batchFill

* Add AssetSwapper support for Multiplex UniswapV3

* fix repo scripts that use PKG= env var (#242)

Co-authored-by: Lawrence Forman <me@merklejerk.com>

* `@0x/asset-swapper`: Adjust uniswap gas overhead

Co-authored-by: Lawrence Forman <me@merklejerk.com>
Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com>

* OTC orders feature (#244)

* Add OTC orders feature contracts

* Address PR feedback

* Remove partial fills for takerSigned variant

* Add function to query the min valid nonce

* Add ETH support

* Tightly pack expiry, nonceBucket, and nonce

* Address PR feedback

* OTC orders unit tests

* Bump prettier version

* Skip unnecessary math if takerTokenFillAmount == order.takerAmount

* appease CI

* Update contract-artifacts and contract-wrappers and CHANGELOGs

* `@0x/contracts-zero-ex`: Address spot check feedback

* `regen wrappers

* prettier

* `@0x/asset-swapper`: prettier and tweak gas schedule slightly for uni3

Co-authored-by: Lawrence Forman <me@merklejerk.com>
Co-authored-by: mzhu25 <mchl.zhu.96@gmail.com>
This commit is contained in:
Lawrence Forman
2021-06-02 00:21:14 -04:00
committed by GitHub
parent 289474e2ce
commit 901d400d62
112 changed files with 6392 additions and 794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contracts/zero-ex/scripts/rollback.ts
View File

@@ -215,9 +215,7 @@ async function deploymentHistoryAsync(deployments: Deployment[], proxyFunctions:
logUtils.log(`\t[${update.selector}] ${update.signature || '(function signature not found)'}`);
logUtils.log(`\t${update.previousImpl} => ${update.newImpl}`);
logUtils.log(
`Cannot find ${
update.previousImpl
} in the selector's rollback history. It itself may have been previously rolled back.`,
`Cannot find ${update.previousImpl} in the selector's rollback history. It itself may have been previously rolled back.`,
);
return;
}
@@ -283,16 +281,19 @@ async function generateRollbackAsync(proxyFunctions: ProxyFunctionEntity[]): Pro
type: 'autocompleteMultiselect',
name: 'selected',
message: 'Select the functions to rollback:',
choices: _.flatMap(proxyFunctions.filter(fn => fn.currentImpl !== constants.NULL_ADDRESS), fn => [
{
title: [
`[${fn.id}]`,
`Implemented @ ${fn.currentImpl}`,
selectorToSignature[fn.id] || '(function signature not found)',
].join('\n\t\t\t\t'),
value: fn.id,
},
]),
choices: _.flatMap(
proxyFunctions.filter(fn => fn.currentImpl !== constants.NULL_ADDRESS),
fn => [
{
title: [
`[${fn.id}]`,
`Implemented @ ${fn.currentImpl}`,
selectorToSignature[fn.id] || '(function signature not found)',
].join('\n\t\t\t\t'),
value: fn.id,
},
],
),
});
const rollbackTargets: { [selector: string]: string } = {};
for (const selector of selected) {