1
0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Commit Graph

233 Commits

Author SHA1 Message Date
Sebastian Gerske
bb6de972eb added business objects form DIDRegistry and ServieAgreement, Added tests for DIDRegistry 2018-10-29 10:53:22 +01:00
Sebastian Gerske
4629c6f4cc added secret store mock 2018-10-26 13:53:57 +02:00
Sebastian Gerske
61d27e082e optimize import 2018-10-26 13:46:47 +02:00
Sebastian Gerske
522a4ff2e6 Merge remote-tracking branch 'origin/feature/search' into feature/secret_store
# Conflicts:
#	test/aquarius/Aquarius.test.ts
2018-10-26 13:41:17 +02:00
Sebastian Gerske
8c4ba81589 optimize test 2018-10-26 13:40:09 +02:00
Sebastian Gerske
fb5dcaf522 added secret store 2018-10-26 13:37:09 +02:00
Sebastian Gerske
dd227e74ed merge 2018-10-26 12:16:40 +02:00
Sebastian Gerske
ee1dd8e30b Merge remote-tracking branch 'origin/feature/search' into feature/secret_store
# Conflicts:
#	src/models/Config.ts
#	src/ocean/Ocean.ts
#	test/config.ts
#	test/keeper/ContractBase.test.ts
#	test/keeper/ContractHandler.test.ts
#	test/keeper/Keeper.test.ts
#	test/ocean/Account.test.ts
#	test/ocean/Asset.test.ts
#	test/ocean/Ocean.test.ts
#	test/ocean/Order.test.ts
2018-10-26 12:14:49 +02:00
Sebastian Gerske
43119ed606 added fetch mock 2018-10-26 11:57:26 +02:00
Sebastian Gerske
33b642c2c3 resolve merge conflicts 2018-10-26 10:57:40 +02:00
Sebastian Gerske
f7b88cf9f8 v0.1.0-beta.17 2018-10-26 10:55:38 +02:00
Sebastian Gerske
9b016afd4b fix asset test 2018-10-26 10:54:02 +02:00
Sebastian Gerske
300918e687 merge develop 2018-10-26 10:48:53 +02:00
Sebastian Gerske
2063530297 Merge remote-tracking branch 'origin/develop' into feature/secret_store
# Conflicts:
#	src/ocean/Ocean.ts
#	test/ocean/Asset.test.ts
2018-10-26 10:46:32 +02:00
Sebastian Gerske
126b7f40f4
Merge branch 'develop' into feature/search 2018-10-26 10:44:25 +02:00
Sebastian Gerske
192eecc3ae added searchAssets 2018-10-26 10:40:46 +02:00
Sebastian Gerske
bc08121a39
Merge pull request #33 from oceanprotocol/feature/rename_provider_aquarius
rename provider -> aquarius
2018-10-26 10:00:49 +02:00
Sebastian Gerske
b06cd5e303 rename provider -> aquarius 2018-10-25 17:26:26 +02:00
Sebastian Gerske
7eae00014e added secret store 2018-10-25 17:18:57 +02:00
Sebastian Gerske
28fe11e671 adapt test config 2018-10-25 17:18:33 +02:00
Sebastian Gerske
794b57ecd5 added config needed for the secret store 2018-10-25 17:17:24 +02:00
Sebastian Gerske
baa4adf269 moved access token to json file 2018-10-23 11:49:32 +02:00
Sebastian Gerske
e82a06410b secret-store 0.0.3 2018-10-23 10:37:36 +02:00
Sebastian Gerske
10d5f4bc68 updated packages 2018-10-22 14:39:52 +02:00
Sebastian Gerske
717ca1d07c moved secret store to secret-store-client-js 2018-10-22 13:39:31 +02:00
Sebastian Gerske
b172a245b1 added encrypt and decrypt document 2018-10-22 12:46:27 +02:00
Sebastian Gerske
da5386f490 added holder for parity document key storage, wip, added unit tests 2018-10-22 09:06:36 +02:00
Sebastian Gerske
2662a7795b added secret store connection 2018-10-19 13:42:24 +02:00
Sebastian Gerske
d777bd9030 moved before into describe to enable running of single unit tests 2018-10-19 12:27:46 +02:00
Sebastian Gerske
61d4f9f64d update readme 2018-10-18 17:36:55 +02:00
Sebastian Gerske
74db18679c
Merge branch 'develop' into feature/secret_store 2018-10-18 16:05:41 +02:00
Sebastian Gerske
56e4a74483
Merge pull request #20 from oceanprotocol/feature/new-ocean-interface
Squid v0.1.0
2018-10-18 16:04:41 +02:00
Sebastian Gerske
62e54032fb added reference to the secret store lib ultra-wip 2018-10-18 16:03:26 +02:00
Sebastian Gerske
7d4df0acc0 update doc on build 2018-10-18 15:00:58 +02:00
Sebastian Gerske
512678b69d bump version 2018-10-18 14:34:57 +02:00
Sebastian Gerske
43a9306132 refactoring 2018-10-18 13:12:23 +02:00
Sebastian Gerske
7f5f7606dc adapted changes from squid discussion, updated interface definition 2018-10-18 13:06:52 +02:00
Sebastian Gerske
4901c65079 update 2018-10-18 12:26:04 +02:00
Sebastian Gerske
6d792743d1 update packages 2018-10-18 12:02:52 +02:00
Sebastian Gerske
c26ff3e594 reflect changes for trilobite 2018-10-18 12:02:40 +02:00
Sebastian Gerske
1b8aa52c40 next iteration 2018-10-18 09:19:10 +02:00
Sebastian Gerske
5719a667ea added purchase functiuonality 2018-10-17 18:24:01 +02:00
Sebastian Gerske
9fb6f296f3 register returns string now instead of the asset again 2018-10-17 10:41:56 +02:00
Sebastian Gerske
c690cf3465 return string on register method because we dont need that asset back but the asset id. 2018-10-17 10:36:00 +02:00
Sebastian Gerske
0285c90d3c optimize 2018-10-17 10:12:40 +02:00
Sebastian Gerske
61bd56ba54 fixed imports 2018-10-16 15:08:04 +02:00
Sebastian Gerske
7b904dc9b3 fixed imports 2018-10-16 15:02:44 +02:00
Sebastian Gerske
19201ef6e7 new squid design 2018-10-16 14:56:18 +02:00
Sebastian Gerske
fe1472208f added test:watch script 2018-10-15 14:53:03 +02:00
Sebastian Gerske
d36e84cce8 exclude test, we have separate file for it 2018-10-11 14:24:22 +02:00