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

Update OrderValidator and create DevUtils contract #1835

Merged
merged 10 commits into from
Jun 1, 2019
Merged

Update OrderValidator and create DevUtils contract #1835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2cd4d90
Create LibAssetProxyIds
abandeali1 May 26, 2019
c9bf1ed
Small readability and efficiency improvements
abandeali1 May 26, 2019
7f94ebe
Add signature validation checks to OrderValidator contract
abandeali1 May 15, 2019
4d9f258
Remove redundant code, add signature checks to order validations, and…
abandeali1 May 26, 2019
543011c
Modify batch allowances to take an array of spenders
abandeali1 May 27, 2019
24249bc
Add LibTransactionDecoder to DevUtils
abandeali1 May 27, 2019
3e59029
Modify dev utils tests to pass
abandeali1 May 27, 2019
7809cad
Fix linting errors and warnings
abandeali1 May 27, 2019
3c08f5b
Update CHANGELOGs
abandeali1 May 27, 2019
066f3bb
Return MAX_UINT256 for unlimited allowances in all token standards
abandeali1 May 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions contracts/asset-proxy/CHANGELOG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
[
{
"version": "2.2.0",
"changes": [
{
"note": "Add `LibAssetProxyIds` and `LibAssetData` contracts",
"pr": 1835
}
]
},
{
"timestamp": 1558712885,
"version": "2.1.5",
Expand Down
1 change: 1 addition & 0 deletions contracts/asset-proxy/contracts/src/ERC1155Proxy.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ contract ERC1155Proxy is
// Id of this proxy.
bytes4 constant internal PROXY_ID = bytes4(keccak256("ERC1155Assets(address,uint256[],uint256[],bytes)"));

// solhint-disable-next-line payable-fallback
function ()
external
{
Expand Down
12 changes: 10 additions & 2 deletions contracts/asset-proxy/contracts/src/interfaces/IAssetData.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,23 @@ pragma experimental ABIEncoderV2;
// This argument is ABI encoded as one of the methods of this interface.
interface IAssetData {

function ERC20Token(address tokenContract)
function ERC20Token(address tokenAddress)
external;

function ERC721Token(
address tokenContract,
address tokenAddress,
uint256 tokenId
)
external;

function ERC1155Assets(
address tokenAddress,
uint256[] calldata tokenIds,
uint256[] calldata tokenValues,
bytes calldata callbackData
)
external;

function MultiAsset(
uint256[] calldata amounts,
bytes[] calldata nestedAssetData
Expand Down
Loading