| 
							
							
								 Jacob Evans | 548089888d | Remove excess web3providernegine polling from contracts | 2019-03-21 11:50:19 +01:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 7ed3afe9f0 | Updated function signature for ERC1155 ProxyId - ERC1155Token -> ERC1155Assets | 2019-03-19 15:35:08 -07:00 |  | 
			
				
					| 
							
							
								 Greg Hysen | 98c6fa10e6 | Added 1explicit ERC1555Poxy testsfor cwhen receiver allback data is NULLL (0x) | 2019-03-19 09:37:16 -07:00 |  | 
			
				
					| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 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 | 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 | 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 | d35a053efd | Update remaining contract Solidity versions to 0.5.5 | 2019-03-07 15:17:51 -08:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | b47886416e | Unpin deps when unnecessary | 2019-02-26 13:29:18 -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 | 6943bbcacb | Temp | 2019-02-04 10:38:02 +01:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | 0758f231e2 | Split tokens package into erc20 and erc721 | 2019-01-21 21:41:21 -08:00 |  | 
			
				
					| 
							
							
								 Amir Bandeali | 4a4c26a2e3 | Split protocol package into exchange, asset-proxy, and multisig | 2019-01-21 21:41:21 -08:00 |  |