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

230 Commits

Author SHA1 Message Date
Pedro Gutiérrez
c632307646 Upgrade to Keeper 0.9.0 and Secret Store access way. 2019-04-01 17:41:43 +02:00
Pedro Gutiérrez
c5e78899f0 Upgrade to Keeper 0.8.7 2019-04-01 17:41:43 +02:00
Pedro Gutiérrez
a931fe5a42 Move helpers/utils that needs web3 or ocean instance to instantiable classes. 2019-04-01 10:33:38 +02:00
Pedro Gutiérrez
7a9cdf6966 Add metadata fields on files. 2019-03-29 11:35:24 +01:00
Pedro Gutiérrez
05ca0da57f Fix linter errors. 2019-03-25 15:21:23 +01:00
Pedro Gutiérrez
7a13ad8daa Be able to create different Ocean instances with different config. 2019-03-25 15:21:23 +01:00
Pedro Gutiérrez
ea16729d86 Replace the main Logger for a instantiable class. 2019-03-25 15:21:23 +01:00
Pedro Gutiérrez
5402d421c8 Remove default exports of Ocean modules. 2019-03-25 15:21:23 +01:00
Pedro Gutiérrez
780475b35f Remove OceanBase. 2019-03-25 15:21:23 +01:00
Pedro Gutiérrez
83973e63c0 Report complete coverage. 2019-03-19 12:20:26 +01:00
Pedro Gutiérrez
eaac2f4f68 Fix linter errors. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
f002e5d616 Fix on unit tests. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
e7b9f990b6 Add conversion helpers for did:op: prefixes. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
76c4b2b1fb Fix all broken tests. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
3a5fba6e21 Added tests on Conditions 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
ef20a2934d Deploy Keeper 0.8.x contracts. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
8a0679b2d4 added a helper to transform 0x prefixed values 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
0410793286 linter fixes 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
057714988a added some missed methods on Ocean.accounts module 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
8dcdf0a851 moved ID generator 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
3fd8f995f6 added Ocean.secretStore module 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
a6d2ce8fde using a SecretStore with custom config 2019-02-20 16:06:04 +01:00
Pedro Gutiérrez
f5ab0e6d05 improved way that is exported Service type 2019-02-20 16:06:04 +01:00
Pedro Gutiérrez
cfda1e6130 added all necessary methods of Ocean.agreements 2019-02-14 12:05:31 +01:00
Pedro Gutiérrez
14f3955ed0 added Search asset tests 2019-02-14 12:05:31 +01:00
Pedro Gutiérrez
c56989a710 using files intead of contentUrls on examples ocean#251 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
e88a40dac0 replaces contentUrls by files on DDO ocean#251 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
d51e3f3dbf updated registerAttribute method 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
f82b99792f linter fixes 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
d365650a7a implemented proof generator on DDO 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
494b9e7d1b added helpers to sign and verify the web3 personal signatures 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
518a784554 improved exportation of typings related to DDOs 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
5694ae29b5 changed some methods 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
dd2b672adb simulating zos on contract deployment 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
26e6c534a0 fixed part of the unit test 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
3364feb9dd removed Auth contract 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
fc46592fe9 replaced OceanMarket with Dispenser 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
95a98daa38 moved main methods to modules by scope 2019-01-25 21:23:37 +01:00
Pedro Gutiérrez
5e4a33f4e2 added better DID verification 2019-01-22 14:14:49 +01:00
Pedro Gutiérrez
b6713bfc81 use Barge to run integration tests 2019-01-15 16:09:31 +01:00
Sebastian Gerske
5e2662c624 make mocha exit at the end 2019-01-09 11:20:31 +01:00
Sebastian Gerske
3b8e424232 added test for failed service agreements 2018-12-19 12:34:07 +01:00
Sebastian Gerske
6ea480fd47 enhanced did handling 2018-12-17 15:54:58 +01:00
Sebastian Gerske
a0648b4b84 remove 0x prefix from serviceAgreementId 2018-12-17 14:29:09 +01:00
Sebastian Gerske
09191fab59 rollback did containing 0x 2018-12-17 14:17:35 +01:00
Sebastian Gerske
1724412dd7 adapted unit tets to the code 2018-12-14 15:30:23 +01:00
ssallam
233aede5f6 Generate assetId with 0x prefix, update all references to reflect this. This makes it similar to squid-py and fixes an issue in payAsset where the asset id in the condition param had double 0x prefix when paying a service agreement for an asset created in squid-py. 2018-12-14 13:40:08 +01:00
Sebastian Gerske
4e30056483 removed config of mocked service 2018-11-27 13:57:54 +01:00
Sebastian Gerske
12bd56e5f9 adapt unit tests 2018-11-26 11:04:05 +01:00
Sebastian Gerske
3bf09e63a1 added executeAgreement event listener 2018-11-23 16:09:31 +01:00
Sebastian Gerske
a904649c33 add event listener for lockPayment 2018-11-23 16:01:42 +01:00
Sebastian Gerske
695825c50b fix unsubscribe 2018-11-23 14:54:22 +01:00
Sebastian Gerske
17f1b3e53e fix listen once 2018-11-23 14:28:41 +01:00
Sebastian Gerske
0c3c21b4c5 fix listener, add eventing, moved generation of conditions to template structure 2018-11-23 14:14:35 +01:00
Sebastian Gerske
9503419b0e added more functionality to event listener 2018-11-23 12:40:49 +01:00
Sebastian Gerske
f37a1cc1c6 make event listener static 2018-11-23 11:47:39 +01:00
Sebastian Gerske
df475b6958 added event listener 2018-11-23 11:39:16 +01:00
Sebastian Gerske
dccd58802a added error messages 2018-11-23 11:39:08 +01:00
Sebastian Gerske
a6c09d0f88 fix lock Payment 2018-11-22 13:14:38 +01:00
Sebastian Gerske
920ae0dc35 added more logging 2018-11-22 10:56:06 +01:00
Sebastian Gerske
43fe8634d2 fix lockPayment 2018-11-22 09:22:27 +01:00
Sebastian Gerske
4d513d39e0 add logging 2018-11-21 12:31:08 +01:00
Sebastian Gerske
c5b0c76fbf move to local version of secret store 2018-11-21 10:44:23 +01:00
Sebastian Gerske
e327e1275b fixed unit tests on ci 2018-11-20 11:22:39 +01:00
Sebastian Gerske
cc91cdb054 map parameter values 2018-11-20 10:43:11 +01:00
Sebastian Gerske
dfff8fc228 added event wireup
added lock payment
added fulfilmentOperators
added declarative way to describe dependencies
added service agreement termination
2018-11-20 09:13:03 +01:00
Sebastian Gerske
a2bfe0a816 added connection to brizo 2018-11-19 12:16:11 +01:00
Sebastian Gerske
80c6e3d66f fix tests 2018-11-16 15:22:08 +01:00
Sebastian Gerske
7e6c431d85 fixed re-decode of json response from aquarius 2018-11-16 11:35:28 +01:00
Sebastian Gerske
ba4e2d4656 adapted changes from squid discussion 2018-11-14 15:44:25 +01:00
Sebastian Gerske
3983c83eb9 added support for POA network 2018-11-14 09:36:37 +01:00
Sebastian Gerske
0c46763095 encrypt contentUrls at once instead separate, move generation of serviceAgreementId outside of signAgreement and executeAgreement in ocean object, hardened sign and execute of service agreements, wrote unit tests 2018-11-12 12:09:42 +01:00
Sebastian Gerske
86d1621046 add get public key method to account 2018-11-12 10:06:24 +01:00
Sebastian Gerske
c425f03efd separate sign and execute agreement 2018-11-12 08:33:19 +01:00
Sebastian Gerske
2df3a68abf fix 500 on aquarius, hardened tests, avoided loading contracts more than once per chain and item 2018-11-09 11:16:22 +01:00
Sebastian Gerske
cbf0b55831 moved test code to test, added metadata, added endpoint generation to aquarius, removed unused code and tests, updated to latest keeper 2018-11-07 14:33:56 +01:00
Sebastian Gerske
20377f5aa3 get rid of order 2018-11-07 11:08:00 +01:00
Sebastian Gerske
2194ae59c3 adapt changes from keeper 0.3.18 2018-11-07 09:35:47 +01:00
Sebastian Gerske
78741e1117 fix tests 2018-11-07 08:49:47 +01:00
Sebastian Gerske
c3282a97c6 fix tests 2018-11-07 08:43:04 +01:00
Sebastian Gerske
6ab85631ca move template registration outside of asset registration again 2018-11-06 16:13:12 +01:00
Sebastian Gerske
86be0cc6d5 added search by text, added templates for fitchain and access 2018-11-05 17:50:56 +01:00
Sebastian Gerske
e1b4293125 use timeouts from template 2018-11-05 14:56:14 +01:00
Sebastian Gerske
1ad80dde3e adapt examples, fix lint 2018-11-05 10:08:06 +01:00
Sebastian Gerske
6e2b270a1f integrate DDO more 2018-11-05 10:01:58 +01:00
Sebastian Gerske
4632fa8586 increase test timeout 2018-11-01 13:41:14 +01:00
Sebastian Gerske
f18a5e0d7b fix tests 2018-11-01 13:36:56 +01:00
Sebastian Gerske
1d9754fba6 make lint more solid 2018-11-01 13:24:41 +01:00
Sebastian Gerske
093a6ea4af added ddo handling 2018-11-01 12:47:48 +01:00
Sebastian Gerske
787ed9dcf3 made ddo business object more versatile 2018-11-01 11:22:00 +01:00
Sebastian Gerske
63e8452d69 added ddo business objects 2018-11-01 11:04:59 +01:00
Sebastian Gerske
076c2eb788 make templates and service agreements configurable 2018-11-01 09:18:34 +01:00
Sebastian Gerske
cf86f5af0d first steps towards service agreements implementation 2018-11-01 08:31:21 +01:00
Sebastian Gerske
c8fa39b396 try to fix codacy problem 2018-10-30 08:37:30 +01:00
Sebastian Gerske
733d93cfba fix codacy issues 2018-10-30 08:30:05 +01:00
Sebastian Gerske
df56556e87 added serviceAgreementTemplates, wip 2018-10-29 17:28:40 +01:00
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
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
9b016afd4b fix asset test 2018-10-26 10:54:02 +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
192eecc3ae added searchAssets 2018-10-26 10:40:46 +02:00
Sebastian Gerske
b06cd5e303 rename provider -> aquarius 2018-10-25 17:26:26 +02:00
Sebastian Gerske
28fe11e671 adapt test config 2018-10-25 17:18:33 +02:00
Sebastian Gerske
baa4adf269 moved access token to json file 2018-10-23 11:49:32 +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
62e54032fb added reference to the secret store lib ultra-wip 2018-10-18 16:03:26 +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
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
0285c90d3c optimize 2018-10-17 10:12:40 +02:00
Sebastian Gerske
19201ef6e7 new squid design 2018-10-16 14:56:18 +02:00
Sebastian Gerske
78a8666176 fix tests 2018-10-11 14:21:09 +02:00
Sebastian Gerske
a3e55f7352 adapt code rules from codacy 2018-10-11 14:16:59 +02:00
Sebastian Gerske
ac18db1365 added order unit tests, refactoring 2018-10-10 11:02:00 +02:00
Sebastian Gerske
bac7c9e4f0 added unit tests, added code coverage 2018-10-09 15:24:36 +02:00
Sebastian Gerske
90a99e4dd3 added unit tests 2018-10-05 12:34:18 +02:00
Sebastian Gerske
5dbc868686 new linter styles 2018-10-02 10:06:26 +02:00
Sebastian Gerske
d63fc69dab moved purchase logic to squid, new structure, mockable contracts, first version of unit tests 2018-10-01 18:10:26 +02:00