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

Updated changelogs and documentation for erc1155 proxy

Browse Source
This commit is contained in:
Greg Hysen 2019-03-05 15:23:15 -08:00
parent ae51cfe8b9
commit 1e5648111e
8 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
contracts/asset-proxy/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[ [
{
"version": "2.1.0",
"changes": [
{
"note": "Add ERC1155Proxy",
"pr": 1661
}
]
},
{ {
"version": "2.0.0", "version": "2.0.0",
"changes": [ "changes": [

11
contracts/asset-proxy/DEPLOYS.json
View File

@ -1,15 +1,4 @@
[ [
{
"name": "ERC1155Proxy",
"version": "1.0.0",
"changes": [
{
"note": "Add ERC1155Proxy implementation",
"pr": 0,
"networks": {
}
}
]
{ {
"name": "MultiAssetProxy", "name": "MultiAssetProxy",
"version": "1.0.0", "version": "1.0.0",

10
contracts/asset-proxy/test/erc1155_proxy.ts
View File

@ -124,7 +124,7 @@ describe('ERC1155Proxy', () => {
}); });
it('should have an id of 0x9645780d', async () => { it('should have an id of 0x9645780d', async () => {
const proxyId = await erc1155Proxy.getProxyId.callAsync(); const proxyId = await erc1155Proxy.getProxyId.callAsync();
// proxy computed using -- bytes4(keccak256("erc1155Contract(address,uint256[],uint256[],bytes)")); // proxy computed using -- bytes4(keccak256("erc1155Token(address,uint256[],uint256[],bytes)"));
const expectedProxyId = '0x9645780d'; const expectedProxyId = '0x9645780d';
expect(proxyId).to.equal(expectedProxyId); expect(proxyId).to.equal(expectedProxyId);
}); });
@ -538,7 +538,7 @@ describe('ERC1155Proxy', () => {
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
RevertReason.nftNotOwnedByFromAddress, RevertReason.NFTNotOwnedByFromAddress,
); );
}); });
it('should revert if tansferring 0 amount of any token', async () => { it('should revert if tansferring 0 amount of any token', async () => {
@ -571,7 +571,7 @@ describe('ERC1155Proxy', () => {
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
RevertReason.transferGreaterThanZeroRequired, RevertReason.TransferGreaterThanZeroRequired,
); );
}); });
it('should revert if there is a multiplication overflow', async () => { it('should revert if there is a multiplication overflow', async () => {
@ -635,7 +635,7 @@ describe('ERC1155Proxy', () => {
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
RevertReason.amountEqualToOneRequired, RevertReason.AmountEqualToOneRequired,
); );
}); });
it('should revert if transferring > 1 instances of a non-fungible token (`valuesToTransfer` field >1)', async () => { it('should revert if transferring > 1 instances of a non-fungible token (`valuesToTransfer` field >1)', async () => {
@ -664,7 +664,7 @@ describe('ERC1155Proxy', () => {
receiverCallbackData, receiverCallbackData,
authorized, authorized,
), ),
RevertReason.amountEqualToOneRequired, RevertReason.AmountEqualToOneRequired,
); );
}); });
it('should revert if sender balance is insufficient', async () => { it('should revert if sender balance is insufficient', async () => {

2
contracts/asset-proxy/test/utils/erc1155_proxy_wrapper.ts
View File

@ -52,7 +52,7 @@ export class ERC1155ProxyWrapper {
*/ */
public async deployDummyContractsAsync(): Promise<Erc1155Wrapper[]> { public async deployDummyContractsAsync(): Promise<Erc1155Wrapper[]> {
// tslint:disable-next-line:no-unused-variable // tslint:disable-next-line:no-unused-variable
for (const i of _.times(constants.NUM_DUMMY_ERC1155_TO_DEPLOY)) { for (const i of _.times(constants.NUM_DUMMY_ERC1155_CONTRACTS_TO_DEPLOY)) {
const erc1155Contract = await ERC1155MintableContract.deployFrom0xArtifactAsync( const erc1155Contract = await ERC1155MintableContract.deployFrom0xArtifactAsync(
artifacts.ERC1155Mintable, artifacts.ERC1155Mintable,
this._provider, this._provider,

9
contracts/test-utils/CHANGELOG.json
View File

@ -1,4 +1,13 @@
[ [
{
"version": "3.1.0",
"changes": [
{
"note": "Added ERC1155Proxy test constants and interfaces",
"pr": 1661
}
]
},
{ {
"version": "3.0.9", "version": "3.0.9",
"changes": [ "changes": [

2
contracts/test-utils/src/constants.ts
View File

@ -38,7 +38,7 @@ export const constants = {
NUM_DUMMY_ERC20_TO_DEPLOY: 3, NUM_DUMMY_ERC20_TO_DEPLOY: 3,
NUM_DUMMY_ERC721_TO_DEPLOY: 2, NUM_DUMMY_ERC721_TO_DEPLOY: 2,
NUM_ERC721_TOKENS_TO_MINT: 2, NUM_ERC721_TOKENS_TO_MINT: 2,
NUM_DUMMY_ERC1155_TO_DEPLOY: 1, NUM_DUMMY_ERC1155_CONTRACTS_TO_DEPLOY: 1,
NUM_ERC1155_FUNGIBLE_TOKENS_MINT: 3, NUM_ERC1155_FUNGIBLE_TOKENS_MINT: 3,
NUM_ERC1155_NONFUNGIBLE_TOKENS_MINT: 3, NUM_ERC1155_NONFUNGIBLE_TOKENS_MINT: 3,
NULL_ADDRESS: '0x0000000000000000000000000000000000000000', NULL_ADDRESS: '0x0000000000000000000000000000000000000000',

2
packages/order-utils/CHANGELOG.json
View File

@ -3,7 +3,7 @@
"version": "7.1.0", "version": "7.1.0",
"changes": [ "changes": [
{ {
"note": "Added `encodeERC721AssetData` and `decodeERC721AssetData`", "note": "Added encoding/decoding fdor ERC1155 asset data",
"pr": 1661 "pr": 1661
} }
] ]

2
packages/types/src/index.ts
View File

@ -310,7 +310,7 @@ export enum RevertReason {
TransferRejected = 'TRANSFER_REJECTED', TransferRejected = 'TRANSFER_REJECTED',
Uint256Underflow = 'UINT256_UNDERFLOW', Uint256Underflow = 'UINT256_UNDERFLOW',
// ERC1155 Proxy // ERC1155 Proxy
transferGreaterThanZeroRequired = 'TRANSFER_GREATER_THAN_ZERO_REQUIRED', TransferGreaterThanZeroRequired = 'TRANSFER_GREATER_THAN_ZERO_REQUIRED',
} }
export enum StatusCodes { export enum StatusCodes {