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

@0x/contracts-zero-ex: Make TokenSpender's puppet contract a distinct contract type and rename getTokenSpenderPuppet() to getAllowanceTarget()

Browse Source
This commit is contained in:
Lawrence Forman 2020-05-05 21:41:14 -04:00
parent 654abbac25
commit c911c3352c
4 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contracts/zero-ex/contracts/src/puppets/ITokenSpenderPuppet.sol Normal file
View File

@ -0,0 +1,30 @@
/*
Copyright 2020 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.6.5;
pragma experimental ABIEncoderV2;
import "./IPuppet.sol";
/// @dev An alias for IPuppet, to differentiate from puppets used by PuppetPool.
interface ITokenSpenderPuppet is
IPuppet
{
// solhint-disable no-empty-blocks
}

33
contracts/zero-ex/contracts/src/puppets/TokenSpenderPuppet.sol Normal file
View File

@ -0,0 +1,33 @@
/*
Copyright 2020 ZeroEx Intl.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
pragma solidity ^0.6.5;
pragma experimental ABIEncoderV2;
import "./ITokenSpenderPuppet.sol";
import "./Puppet.sol";
/// @dev A specialized puppet for use exclusively by the TokenSpender.
/// Essentially an alias to differentiate from puppets in PuppetPool.
contract TokenSpenderPuppet is
ITokenSpenderPuppet,
Puppet
{
// solhint-disable no-empty-blocks
}

2
contracts/zero-ex/test/wrappers.ts
View File

@ -17,6 +17,7 @@ export * from '../test/generated-wrappers/i_ownable';
export * from '../test/generated-wrappers/i_simple_function_registry';
export * from '../test/generated-wrappers/i_test_simple_function_registry_feature';
export * from '../test/generated-wrappers/i_token_spender';
export * from '../test/generated-wrappers/i_token_spender_puppet';
export * from '../test/generated-wrappers/i_transform_erc20';
export * from '../test/generated-wrappers/initial_migration';
export * from '../test/generated-wrappers/lib_bootstrap';
@ -50,5 +51,6 @@ export * from '../test/generated-wrappers/test_token_spender_erc20_token';
export * from '../test/generated-wrappers/test_transform_erc20';
export * from '../test/generated-wrappers/test_zero_ex_feature';
export * from '../test/generated-wrappers/token_spender';
export * from '../test/generated-wrappers/token_spender_puppet';
export * from '../test/generated-wrappers/transform_erc20';
export * from '../test/generated-wrappers/zero_ex';

2
contracts/zero-ex/tsconfig.json
View File

@ -27,6 +27,7 @@
"test/generated-artifacts/ISimpleFunctionRegistry.json",
"test/generated-artifacts/ITestSimpleFunctionRegistryFeature.json",
"test/generated-artifacts/ITokenSpender.json",
"test/generated-artifacts/ITokenSpenderPuppet.json",
"test/generated-artifacts/ITransformERC20.json",
"test/generated-artifacts/InitialMigration.json",
"test/generated-artifacts/LibBootstrap.json",
@ -60,6 +61,7 @@
"test/generated-artifacts/TestTransformERC20.json",
"test/generated-artifacts/TestZeroExFeature.json",
"test/generated-artifacts/TokenSpender.json",
"test/generated-artifacts/TokenSpenderPuppet.json",
"test/generated-artifacts/TransformERC20.json",
"test/generated-artifacts/ZeroEx.json"
],