| 
							
							
								 Greg Hysen | c0260bc44a | rebased against development | 2019-03-19 09:36:11 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 6992bff0e0 | Ran prettier & linter | 2019-03-19 09:36:11 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 6957e6e8f7 | ERC1155 integration tests with MultiAssetProxy | 2019-03-19 09:36:11 -07:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | b008fabdac | Change petersburg to constantinople | 2019-03-18 13:07:34 -07:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | caf286b8cb | Update CHANGELOGs | 2019-03-18 13:07:34 -07:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | aea278c022 | Update evmVersion to petersburg | 2019-03-18 13:07:34 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | e1cfbcd4f6 | Copied MixinAssetProxyDispatcher from exchange | 2019-03-15 21:16:21 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | d88af4dfa6 | Bumped version of ERC1155Proxy to 0.5.5 + merged ERC20Proxy/ERC721Proxy/MultiAssetProxy dependencies into base contract files | 2019-03-15 19:02:24 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 22bc1fb21e | additional zero outcome tests | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 63ba764de8 | renamed perUnitValue to valueMultiplier | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 6a7530d741 | added test for amount=0 | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | eb9bf7c4f9 | Adjusted changelog version since nothing has been published during this PR | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | b6571d0ca3 | Added calldatacopy comment | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 9207d1c680 | Do not revert if value or amount are zero. Only if amount is non-zero and there is an overflow. | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | f783c9bb25 | updated comment for calldatacopy | 2019-03-15 15:05:52 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 2a6ed0c96e | Renamed tokenIds -> ids, tokenValues -> values, callbackData -> data to be consistent with the ERC1155 reference implementation. | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 9ec380777a | Rebased against development | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 8916d0d367 | Ran prettier | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 1e5648111e | Updated changelogs and documentation for erc1155 proxy | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | ae51cfe8b9 | Added method descriptions to erc1155 proxy wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 05ef250ab4 | Ran prettier & linter | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 38e4871f32 | Moved transferFrom with/without logs into ERC1155 Proxy Wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | a86ba7af2e | moved transferFrom into ERC1155 Proxy Wrapper | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 55c4fc9aca | Ran prettier / linter | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 888c17353b | Renamed erc1155token to erc1155Contract in proxy tests | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 054c0e91a3 | removed erc1155 proxy tests from general proxy test file | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 4dfb610eba | updated erc1155 proxy tests and moved to their own test file | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 008eb8dd8b | cleaning up erc1155 proxy tests | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 2882c4bb89 | test with several tokens erc1155 proxy | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 4473851f5b | Remaining tests for erc1155 proxy | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 15d9e2d3d5 | Split ERC1155 Asset Proxy from ERC1155 POC implementation - squashed | 2019-03-15 15:05:02 -07:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | 22af796302 | Cleanup | 2019-03-07 19:36:26 -08:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | 2f7dd177c1 | Update CHANGELOGs | 2019-03-07 15:17:56 -08:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | d35a053efd | Update remaining contract Solidity versions to 0.5.5 | 2019-03-07 15:17:51 -08:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | ac8f4ae2f9 | updated changelogs of contracts packages | 2019-03-06 15:45:18 -08:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 1ff49188b1 | Set evm version to byzantium to avoid using unsupported opcodes in solidity  0.5.5 | 2019-03-06 15:10:11 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | 397496aff0 | Publish - 0x.js@6.0.3
 - @0x/abi-gen@2.0.6
 - @0x/abi-gen-wrappers@4.0.2
 - @0x/assert@2.0.6
 - @0x/asset-buyer@6.0.3
 - @0x/base-contract@5.0.2
 - @0x/connect@5.0.2
 - @0x/contract-wrappers@8.0.3
 - @0x/contracts-gen@1.0.5
 - @0x/dev-tools-pages@0.0.22
 - @0x/dev-utils@2.1.3
 - @0x/fill-scenarios@3.0.2
 - @0x/instant@1.0.17
 - @0x/json-schemas@3.0.6
 - @0x/metacoin@0.0.44
 - @0x/migrations@4.0.3
 - @0x/monorepo-scripts@1.0.27
 - @0x/order-utils@7.0.2
 - @0x/order-watcher@4.0.3
 - @0x/pipeline@1.0.14
 - @0x/react-docs@2.0.7
 - @0x/react-shared@2.0.7
 - @0x/sol-compiler@3.1.3
 - @0x/sol-coverage@3.0.0
 - @0x/sol-doc@2.0.7
 - @0x/sol-profiler@3.1.2
 - @0x/sol-trace@2.0.8
 - @0x/sol-tracing-utils@6.0.7
 - @0x/sra-spec@2.0.6
 - @0x/subproviders@4.0.2
 - @0x/testnet-faucets@1.0.73
 - @0x/utils@4.2.2
 - @0x/web3-wrapper@6.0.2
 - @0x/website@0.0.76
 - @0x/contracts-asset-proxy@1.0.9
 - @0x/contracts-erc20@1.0.9
 - @0x/contracts-erc721@1.0.9
 - @0x/contracts-exchange@1.0.9
 - @0x/contracts-exchange-forwarder@1.0.9
 - @0x/contracts-exchange-libs@1.1.3
 - @0x/contracts-extensions@2.0.8
 - @0x/contracts-multisig@2.0.8
 - @0x/contracts-tec@0.0.4
 - @0x/contracts-test-utils@3.0.8
 - @0x/contracts-utils@2.0.8 | 2019-03-01 14:34:26 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | 7458fe0d81 | Updated CHANGELOGS | 2019-03-01 14:34:15 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | e81ae05df9 | Publish - 0x.js@6.0.2
 - @0x/asset-buyer@6.0.2
 - @0x/contract-wrappers@8.0.2
 - @0x/instant@1.0.16
 - @0x/metacoin@0.0.43
 - @0x/migrations@4.0.2
 - @0x/order-watcher@4.0.2
 - @0x/pipeline@1.0.13
 - @0x/sol-compiler@3.1.2
 - @0x/sol-coverage@2.0.6
 - @0x/sol-doc@2.0.6
 - @0x/sol-profiler@3.1.1
 - @0x/sol-trace@2.0.7
 - @0x/sol-tracing-utils@6.0.6
 - @0x/testnet-faucets@1.0.72
 - @0x/website@0.0.75
 - @0x/contracts-asset-proxy@1.0.8
 - @0x/contracts-erc20@1.0.8
 - @0x/contracts-erc721@1.0.8
 - @0x/contracts-exchange@1.0.8
 - @0x/contracts-exchange-forwarder@1.0.8
 - @0x/contracts-exchange-libs@1.1.2
 - @0x/contracts-extensions@2.0.7
 - @0x/contracts-multisig@2.0.7
 - @0x/contracts-tec@0.0.3
 - @0x/contracts-test-utils@3.0.7
 - @0x/contracts-utils@2.0.7 | 2019-02-27 12:45:19 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | cb394f3a1c | Updated CHANGELOGS | 2019-02-27 12:45:09 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | ec24c79da1 | Publish - 0x.js@6.0.1
 - @0x/abi-gen@2.0.5
 - @0x/abi-gen-wrappers@4.0.1
 - @0x/assert@2.0.5
 - @0x/asset-buyer@6.0.1
 - @0x/base-contract@5.0.1
 - @0x/connect@5.0.1
 - @0x/contract-wrappers@8.0.1
 - @0x/contracts-gen@1.0.4
 - @0x/dev-tools-pages@0.0.21
 - @0x/dev-utils@2.1.2
 - @0x/fill-scenarios@3.0.1
 - @0x/instant@1.0.15
 - @0x/json-schemas@3.0.5
 - @0x/metacoin@0.0.42
 - @0x/migrations@4.0.1
 - @0x/monorepo-scripts@1.0.26
 - @0x/order-utils@7.0.1
 - @0x/order-watcher@4.0.1
 - @0x/pipeline@1.0.12
 - @0x/react-docs@2.0.6
 - @0x/react-shared@2.0.6
 - @0x/sol-compiler@3.1.1
 - @0x/sol-coverage@2.0.5
 - @0x/sol-doc@2.0.5
 - @0x/sol-profiler@3.1.0
 - @0x/sol-resolver@2.0.4
 - @0x/sol-trace@2.0.6
 - @0x/sol-tracing-utils@6.0.5
 - @0x/sra-spec@2.0.5
 - @0x/subproviders@4.0.1
 - @0x/testnet-faucets@1.0.71
 - @0x/types@2.1.1
 - @0x/utils@4.2.1
 - @0x/web3-wrapper@6.0.1
 - @0x/website@0.0.74
 - @0x/contracts-asset-proxy@1.0.7
 - @0x/contracts-erc20@1.0.7
 - @0x/contracts-erc721@1.0.7
 - @0x/contracts-exchange@1.0.7
 - @0x/contracts-exchange-forwarder@1.0.7
 - @0x/contracts-exchange-libs@1.1.1
 - @0x/contracts-extensions@2.0.6
 - @0x/contracts-multisig@2.0.6
 - @0x/contracts-tec@0.0.2
 - @0x/contracts-test-utils@3.0.6
 - @0x/contracts-utils@2.0.6 | 2019-02-26 14:45:52 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | f5fffbea04 | Updated CHANGELOGS | 2019-02-26 14:45:42 -08:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | b47886416e | Unpin deps when unnecessary | 2019-02-26 13:29:18 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | 5934eb0559 | Publish - 0x.js@6.0.0
 - @0x/abi-gen@2.0.4
 - @0x/abi-gen-templates@2.0.1
 - @0x/abi-gen-wrappers@4.0.0
 - @0x/assert@2.0.4
 - @0x/asset-buyer@6.0.0
 - @0x/base-contract@5.0.0
 - @0x/connect@5.0.0
 - @0x/contract-addresses@2.2.2
 - @0x/contract-wrappers@8.0.0
 - @0x/contracts-gen@1.0.3
 - @0x/dev-tools-pages@0.0.20
 - @0x/dev-utils@2.1.1
 - ethereum-types@2.1.0
 - @0x/fill-scenarios@3.0.0
 - @0x/instant@1.0.14
 - @0x/json-schemas@3.0.4
 - @0x/metacoin@0.0.41
 - @0x/migrations@4.0.0
 - @0x/monorepo-scripts@1.0.25
 - @0x/order-utils@7.0.0
 - @0x/order-watcher@4.0.0
 - @0x/pipeline@1.0.11
 - @0x/react-docs@2.0.5
 - @0x/react-shared@2.0.5
 - @0x/sol-compiler@3.1.0
 - @0x/sol-coverage@2.0.4
 - @0x/sol-doc@2.0.4
 - @0x/sol-profiler@3.0.0
 - @0x/sol-resolver@2.0.3
 - @0x/sol-trace@2.0.5
 - @0x/sol-tracing-utils@6.0.4
 - @0x/sra-spec@2.0.4
 - @0x/subproviders@4.0.0
 - @0x/testnet-faucets@1.0.70
 - @0x/types@2.1.0
 - @0x/typescript-typings@4.1.0
 - @0x/utils@4.2.0
 - @0x/web3-wrapper@6.0.0
 - @0x/website@0.0.73
 - @0x/contracts-asset-proxy@1.0.6
 - @0x/contracts-erc20@1.0.6
 - @0x/contracts-erc721@1.0.6
 - @0x/contracts-exchange@1.0.6
 - @0x/contracts-exchange-forwarder@1.0.6
 - @0x/contracts-exchange-libs@1.1.0
 - @0x/contracts-extensions@2.0.5
 - @0x/contracts-multisig@2.0.5
 - @0x/contracts-test-utils@3.0.5
 - @0x/contracts-utils@2.0.5 | 2019-02-25 13:35:29 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | b998d719a6 | Updated CHANGELOGS | 2019-02-25 13:35:17 -08:00 |  | 
			
				
					| 
							
							
								 Fabio Berger | 6b775628d5 | Prettier fixes | 2019-02-19 22:48:09 -08:00 |  | 
			
				
					| 
							
							
								 Fabio Berger | 1fa82c1077 | Fix up missing Provider interfaces and refactor providerUtils.standardizeOrThrow() | 2019-02-19 22:34:31 -08:00 |  | 
			
				
					| 
							
							
								 Leonid Logvinov | 6fa7d90f1f | Define offlineMode as false in all smart contracts packages | 2019-02-19 10:38:24 -08:00 |  | 
			
				
					| 
							
							
								 Fabio Berger | e909faa3ef | Publish - 0x.js@5.0.0
 - @0x/abi-gen@2.0.3
 - @0x/abi-gen-wrappers@3.0.3
 - @0x/assert@2.0.3
 - @0x/asset-buyer@5.0.4
 - @0x/base-contract@4.0.3
 - @0x/connect@4.0.4
 - @0x/contract-wrappers@7.1.0
 - @0x/contracts-gen@1.0.2
 - @0x/dev-tools-pages@0.0.19
 - @0x/dev-utils@2.1.0
 - @0x/fill-scenarios@2.0.4
 - @0x/instant@1.0.13
 - @0x/json-schemas@3.0.3
 - @0x/metacoin@0.0.40
 - @0x/migrations@3.0.4
 - @0x/monorepo-scripts@1.0.24
 - @0x/order-utils@6.1.0
 - @0x/order-watcher@3.0.4
 - @0x/pipeline@1.0.10
 - @0x/react-docs@2.0.4
 - @0x/react-shared@2.0.4
 - @0x/sol-compiler@3.0.3
 - @0x/sol-coverage@2.0.3
 - @0x/sol-doc@2.0.3
 - @0x/sol-profiler@2.0.4
 - @0x/sol-trace@2.0.4
 - @0x/sol-tracing-utils@6.0.3
 - @0x/sra-spec@2.0.3
 - @0x/subproviders@3.0.3
 - @0x/testnet-faucets@1.0.69
 - @0x/utils@4.1.0
 - @0x/web3-wrapper@5.0.0
 - @0x/website@0.0.72
 - @0x/contracts-asset-proxy@1.0.5
 - @0x/contracts-erc20@1.0.5
 - @0x/contracts-erc721@1.0.5
 - @0x/contracts-exchange@1.0.5
 - @0x/contracts-exchange-forwarder@1.0.5
 - @0x/contracts-exchange-libs@1.0.5
 - @0x/contracts-extensions@2.0.4
 - @0x/contracts-multisig@2.0.4
 - @0x/contracts-test-utils@3.0.4
 - @0x/contracts-utils@2.0.4 | 2019-02-09 18:44:40 +00:00 |  | 
			
				
					| 
							
							
								 Fabio Berger | 28d9fdf798 | Updated CHANGELOGS | 2019-02-09 18:44:28 +00:00 |  |