From 80215ea1818874bcd3661259df6f2d3279cc59f2 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 23 May 2018 15:36:35 -0700 Subject: LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver --- packages/contracts/compiler.json | 2 ++ 1 file changed, 2 insertions(+) (limited to 'packages/contracts/compiler.json') diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index 48ba4ffcd..a11f2a2c0 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -22,6 +22,7 @@ "AssetProxyOwner", "DummyERC20Token", "DummyERC721Token", + "DummyERC721Receiver", "ERC20Proxy", "ERC721Proxy", "Exchange", @@ -30,6 +31,7 @@ "MultiSigWalletWithTimeLock", "TestAssetProxyDispatcher", "TestLibBytes", + "TestLibMem", "TestLibs", "TestSignatureValidator", "TokenRegistry", -- cgit v1.2.3 From 9b82e2df58cfd7f4dc9954fa93167450919f457f Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 24 May 2018 12:29:45 -0700 Subject: Foundation for TestLibAssetProxyDecoder --- packages/contracts/compiler.json | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/contracts/compiler.json') diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index a11f2a2c0..639849cd7 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -29,6 +29,7 @@ "MixinAuthorizable", "MultiSigWallet", "MultiSigWalletWithTimeLock", + "TestLibAssetProxyDecoder", "TestAssetProxyDispatcher", "TestLibBytes", "TestLibMem", -- cgit v1.2.3 From d9f9895b2bcd3cde09febbe0e1af31be5ddc80e2 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 24 May 2018 16:44:37 -0700 Subject: Test for onReceived erc721 callback --- packages/contracts/compiler.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/compiler.json') diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index 639849cd7..464137d9b 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -21,8 +21,8 @@ "contracts": [ "AssetProxyOwner", "DummyERC20Token", - "DummyERC721Token", "DummyERC721Receiver", + "DummyERC721Token", "ERC20Proxy", "ERC721Proxy", "Exchange", -- cgit v1.2.3 From 249a1e6d8d129d6b067a4ddadfb4b94733ddfc07 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Thu, 31 May 2018 16:31:00 -0700 Subject: Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would --- packages/contracts/compiler.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/contracts/compiler.json') diff --git a/packages/contracts/compiler.json b/packages/contracts/compiler.json index 464137d9b..6ef8e6a95 100644 --- a/packages/contracts/compiler.json +++ b/packages/contracts/compiler.json @@ -29,7 +29,7 @@ "MixinAuthorizable", "MultiSigWallet", "MultiSigWalletWithTimeLock", - "TestLibAssetProxyDecoder", + "TestAssetDataDecoders", "TestAssetProxyDispatcher", "TestLibBytes", "TestLibMem", -- cgit v1.2.3