oceanprotocol/squid-js
1
0
Fork 0
mirror of https://github.com/oceanprotocol-archive/squid-js.git synced 2024-02-02 15:31:51 +01:00
Code Releases Activity
790 Commits 13 Branches 117 Tags 7.1 MiB
b61822e30c
Commit Graph

377 Commits

Author SHA1 Message Date
Pedro Gutiérrez
1ecbb69937 improved error detection on http requests #118 2019-01-24 10:48:48 +01:00
Pedro Gutiérrez
f71e7e345a linter fixes 2019-01-22 14:18:58 +01:00
Pedro Gutiérrez
5e4a33f4e2 added better DID verification 2019-01-22 14:14:49 +01:00
Pedro Gutiérrez
ff7dc04d28 using a random account (of a list) to run the integration test #107 2019-01-16 13:55:02 +01:00
Pedro Gutiérrez
b6713bfc81 use Barge to run integration tests 2019-01-15 16:09:31 +01:00
Pedro Gutiérrez
21b38402ca changed some methods names and marking as deprectated #65 2019-01-15 11:34:45 +01:00
Pedro Gutiérrez
89dbc10532 added comments to main Ocean class #79 2019-01-09 16:39:18 +01:00
Pedro Gutiérrez
4074d95f1e added comments on some internal classes #79 2019-01-09 16:39:18 +01:00
Pedro Gutiérrez
b2d2271e50 added comment documentation on DDO related classes #79 2019-01-09 16:39:18 +01:00
Sebastian Gerske
b1df2513e2 cleaned packages 
updated to web3 1.0 beta 37
 2018-12-19 09:00:35 +01:00
Sebastian Gerske
724a29ee80 add detection for meta mask 2018-12-18 15:50:37 +01:00
diminator
800850e288
expose DID and IdGenerator 2018-12-17 22:41:47 +01:00
diminator
e9e1266712 Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop 2018-12-17 18:55:33 +01:00
diminator
53610ed599 Merge branch 'develop' of github.com:oceanprotocol/squid-js into develop 2018-12-17 18:54:34 +01:00
diminator
487d259d1e
merge 2018-12-17 18:46:29 +01:00
Dimitri De Jonghe
3bd8c75db8
Merge branch 'develop' into fix/circular_dep 2018-12-17 18:44:05 +01:00
Jernej Pregelj
e953180700 lint fixes 2018-12-17 17:43:45 +01:00
Sebastian Gerske
dea6ea4770 fix/circular_dep 2018-12-17 17:37:36 +01:00
Jernej Pregelj
81a282af28 return file urls 2018-12-17 16:46:19 +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
62c3e77b44
Merge branch 'develop' into feature/export-eventlistener 2018-12-17 11:23:56 +01:00
diminator
d73df95563
export EventListener 2018-12-15 15:25:57 +01:00
Sebastian Gerske
d6495036d7
Merge branch 'develop' into fix/file_download 2018-12-14 16:15:36 +01:00
Sebastian Gerske
77a410c607 removed file-saver and added a callback with the content 2018-12-14 16:12:23 +01:00
Sebastian Gerske
85496f7002 added the check for the status of the template that is used to sign the service agreement 2018-12-14 16:11:26 +01:00
ssallam
c2f77295ce Fix tests. 2018-12-14 14:07:41 +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
ssallam
968583e2dd Fix brizo purchaseEndpoint. 2018-12-12 20:52:11 +01:00
Sebastian Gerske
b2cebf7748 added verbose flag to config 2018-12-11 17:41:10 +01:00
Sebastian Gerske
ce009dcd94 remove fs because it does not work in the browser 2018-12-10 13:26:33 +01:00
Sebastian Gerske
83ce375588 remove dead code 2018-12-10 13:26:07 +01:00
Sebastian Gerske
8c4813b908 added hdwallet support to examples 2018-12-10 10:11:36 +01:00
ssallam
4f05e3f455 fix saving downloaded file. 2018-12-10 00:15:40 +01:00
Sebastian Gerske
5a1016d1fb
fixed codacy 2018-12-08 21:51:37 +01:00
ssallam
1756903005 Handle the access granted event. Invoke the consume endpoint. Fix issue in the generated serviceEndpoint. 2018-12-08 00:46:18 +01:00
Sebastian Gerske
d221b14931 fix pay asset 2018-12-07 17:20:20 +01:00
Sebastian Gerske
7b0d34a420 hardened event listening 2018-12-07 17:19:53 +01:00
Sebastian Gerske
8ab5f7408b remove logging 2018-12-07 17:19:16 +01:00
Sebastian Gerske
2310c7103e increase timeout 2018-12-07 16:55:32 +01:00
Sebastian Gerske
0f262f5f03 map events properly 2018-12-07 16:00:33 +01:00
Sebastian Gerske
2c85460285 fix timeout 2018-12-07 15:30:54 +01:00
Sebastian Gerske
382207b904 fix registering 2018-12-07 15:23:17 +01:00
Sebastian Gerske
ce7027590e new access template 2018-12-07 15:19:16 +01:00
Sebastian Gerske
d4b6366a4a latest adoption 2018-12-05 12:40:38 +01:00
ssallam
04c8a7feda Fix aquarius url and the keeper registered url type. 2018-12-04 21:21:13 +01:00
Sebastian Gerske
9ebe43510f added logging of brizo args 2018-11-29 08:45:10 +01:00
Sebastian Gerske
f65bb4e050 added support for poa mainnet (core) and testnet (sokol) 2018-11-29 08:44:58 +01:00
Sebastian Gerske
9cd134052c example for adding hdwallet 2018-11-28 13:54:37 +01:00
Sebastian Gerske
8d2b9c62f2 fix fire lazers 2018-11-27 13:38:18 +01:00
Sebastian Gerske
0981289745 changed formatting 2018-11-27 12:27:15 +01:00
Sebastian Gerske
79281c4f98 Merge remote-tracking branch 'origin/develop' into feature/trilobite_countdown 
# Conflicts:
#	package.json
 2018-11-27 09:02:08 +01:00
Jernej Pregelj
7f3b4b1f48 webpack package builder 2018-11-26 15:55:09 +01:00
Sebastian Gerske
43a5e53d57 fix brizo connection 2018-11-26 15:24:59 +01:00
Sebastian Gerske
2201ebb997 fix samples 2018-11-23 17:05:44 +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
07455e84a9
Merge branch 'develop' into feature/trilobite_countdown 2018-11-23 15:53:34 +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
diminator
faf974d03b Merge remote-tracking branch 'remotes/origin/develop' into deploy/es-cjs-umd-min-builds 2018-11-23 12:57:07 +01:00
Sebastian Gerske
9503419b0e added more functionality to event listener 2018-11-23 12:40:49 +01:00
Sebastian Gerske
1b967896df small ddo adoptions 2018-11-23 12:40:18 +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
375f153b93 add detection for local poa 2018-11-23 09:57:37 +01:00
Sebastian Gerske
43db4412ee add events to template 2018-11-23 09:57:26 +01:00
Sebastian Gerske
8d018633a9 added buy asset and grant access samples, prepare for consumption 2018-11-23 09:17:30 +01:00
Sebastian Gerske
a6c09d0f88 fix lock Payment 2018-11-22 13:14:38 +01:00
Sebastian Gerske
2d41535bab remove logs 2018-11-22 11:39:20 +01:00
Sebastian Gerske
42959d8fc7 fix compressed deps 2018-11-22 11:38:00 +01:00
Sebastian Gerske
8a68715fce getting closer to compressed deps 2018-11-22 11:32:06 +01:00
Sebastian Gerske
8390c12599 fix shifting 2018-11-22 10:58:24 +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
e4bd6ea84f refactor api path 2018-11-21 16:47:24 +01:00
diminator
b07058b062
added build strategies 
removed namespace import
 2018-11-21 16:46:03 +01:00
Sebastian Gerske
18f0dd7040 shortened find() 2018-11-21 16:38:48 +01:00
Sebastian Gerske
17e6540031
Merge pull request #53 from oceanprotocol/feature/generate-fulfillment-indices 
Generate fulfillmentIndices from service agreement conditions, set fu…
 2018-11-21 16:32:19 +01:00
ssallam
1a3bb2f8b1 Generate fulfillmentIndices from service agreement conditions, set fulfillmentOperator to 1 (or operator), fix typo. 2018-11-21 15:58:59 +01:00
diminator
f14ca2b0a5
pass tslint 2018-11-21 15:26:46 +01:00
Sebastian Gerske
efeb0fa11f fixed lint 2018-11-21 15:10:09 +01:00
diminator
eef46c7a1c
some style changes for readability 2018-11-21 14:59:22 +01:00
Sebastian Gerske
c5b0c76fbf move to local version of secret store 2018-11-21 10:44:23 +01:00
Sebastian Gerske
2cfb32199a added logging, reworked consumer account on execute agreement 2018-11-20 11:25:10 +01:00
Sebastian Gerske
baeddd98a7 made error logging easier to recap on method send failure 2018-11-20 11:23:39 +01:00
Sebastian Gerske
0afbb8453d typed lockPayments 2018-11-20 11:23:11 +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
58cd2810ed adapt changes to ddo condition structure 2018-11-16 15:15:45 +01:00
Sebastian Gerske
02c36d12ad fix issue with generating public key, adapt interface changes of aquarius 2018-11-16 14:26:58 +01:00
Sebastian Gerske
9a90ec80d6 added checksum 2018-11-16 14:26:31 +01:00
Sebastian Gerske
70c0b5eaf0 adapt to interface changes 2018-11-16 14:26:26 +01:00
Sebastian Gerske
48ef4cff5f adapted examples to interface changes 2018-11-16 14:26:06 +01:00
Sebastian Gerske
0b55e108d7 changed error messages 2018-11-16 14:25:55 +01:00
Sebastian Gerske
469088ec79 made squid fire lazers 2018-11-16 14:24:47 +01:00
Sebastian Gerske
7a79bd3883 fix retrieveDDO and storeDDO 2018-11-16 13:34:52 +01:00
Sebastian Gerske
7e6c431d85 fixed re-decode of json response from aquarius 2018-11-16 11:35:28 +01:00
Sebastian Gerske
750d240f1c added headers again 2018-11-16 10:03:16 +01:00
Sebastian Gerske
91326591fa revert 2018-11-16 09:51:30 +01:00
Sebastian Gerske
3c23c49827 maybe fix cors preflight 2018-11-16 09:46:42 +01:00
Sebastian Gerske
3a392eb4fe fix lint 2018-11-14 15:56:12 +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
8d71844902 fix doc generation 2018-11-12 12:36:31 +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
6df097ea8f added brizo 2018-11-09 10:43:29 +01:00
Sebastian Gerske
ff8a904f09 hardened contract handler 2018-11-08 08:23:00 +01:00
Sebastian Gerske
77213a44e1 update registerasset flow 2018-11-07 15:05:16 +01:00
Sebastian Gerske
7a8ae3929a fix lint 2018-11-07 14:35:49 +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
8e3a30990b channel all the contract trough the keeper 2018-11-07 11:21:17 +01:00
Sebastian Gerske
20377f5aa3 get rid of order 2018-11-07 11:08:00 +01:00
Sebastian Gerske
45fb69e5f4 switch to url polyfill 2018-11-07 09:53:43 +01:00
Sebastian Gerske
2194ae59c3 adapt changes from keeper 0.3.18 2018-11-07 09:35:47 +01:00
Sebastian Gerske
edb2d43d99 stop register asset in market on register 2018-11-06 16:23:48 +01:00
Sebastian Gerske
6ab85631ca move template registration outside of asset registration again 2018-11-06 16:13:12 +01:00
Sebastian Gerske
c722ccf587 keeper contracts v0.3.16 2018-11-06 12:10:02 +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
1874e24b61 expose both search methods 2018-11-05 14:58:58 +01:00
Sebastian Gerske
e1b4293125 use timeouts from template 2018-11-05 14:56:14 +01:00
Sebastian Gerske
7a3cc1e473 refactor value loading, added valuepair business object 2018-11-05 13:15:33 +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
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
56fc8e6f23 fixed lint error 2018-11-01 11:05:29 +01:00
Sebastian Gerske
63e8452d69 added ddo business objects 2018-11-01 11:04:59 +01:00
Sebastian Gerske
db910aaaa2 optimize 2018-11-01 09:28:17 +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
8b83b29c82 ignore line with bitwise operator 2018-10-30 08:10:04 +01:00
Sebastian Gerske
0860b5ebd7 Merge remote-tracking branch 'origin/develop' into feature/secret_store 2018-10-29 17:41:56 +01:00
Sebastian Gerske
df56556e87 added serviceAgreementTemplates, wip 2018-10-29 17:28:40 +01:00
Jernej Pregelj
4e52e10a4b url fix 2018-10-29 16:55:32 +01:00
Jernej Pregelj
af376eb7ee changes in search paths & type 2018-10-29 16:38:23 +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
61d27e082e optimize import 2018-10-26 13:46:47 +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
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
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
7eae00014e added secret store 2018-10-25 17:18:57 +02:00
Sebastian Gerske
794b57ecd5 added config needed for the secret store 2018-10-25 17:17:24 +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
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
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
a3e55f7352 adapt code rules from codacy 2018-10-11 14:16:59 +02:00
Sebastian Gerske
1cc9e2bcbf removed obsolete config 2018-10-10 14:12:39 +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
df0e6b57a6 tried to fix caseing 2018-10-09 11:12:37 +02:00
Sebastian Gerske
8c95036d99 tried to fix caseing 2018-10-09 11:12:08 +02:00
Sebastian Gerske
fbeae84eda reworked event handling 2018-10-09 10:55:53 +02:00
Sebastian Gerske
d8b9248bad migrate to web3 2018-10-05 16:16:48 +02:00
Sebastian Gerske
06fd240e56 fixed unit test 2018-10-05 16:12:54 +02:00
Sebastian Gerske
bd06445b82 interface changes, web3 migration 2018-10-05 12:34:31 +02:00
Sebastian Gerske
543af59cf3 use promise function of getId 2018-10-05 10:59:48 +02:00
Sebastian Gerske
b8ae411835 fixed web3 version evaluation 2018-10-04 16:17:32 +02:00
Sebastian Gerske
5db73589ee added logging 2018-10-04 16:11:57 +02:00
Sebastian Gerske
f4f32ab402 reword event handling 2018-10-04 13:14:03 +02:00
Sebastian Gerske
02079ad012 fix codacy finding 2018-10-02 10:37:02 +02:00
Sebastian Gerske
5dbc868686 new linter styles 2018-10-02 10:06:26 +02:00
Sebastian Gerske
163ac95681 fixed caseing again 2018-10-02 09:53:06 +02:00
Sebastian Gerske
2f437d2097
Delete logger.ts 2018-10-02 09:46:43 +02:00
Sebastian Gerske
ff386703d7 rollback init methods on contracts 2018-10-02 08:27:10 +02:00
Sebastian Gerske
c7244ef6c9 caseing 2018-10-01 18:32:03 +02:00
Sebastian Gerske
829ca5af74 caseing 2018-10-01 18:31:44 +02:00
Sebastian Gerske
d2474796e0 caseing 2018-10-01 18:30:53 +02:00
Sebastian Gerske
426dc4c959 caseing 2018-10-01 18:29:17 +02:00
Sebastian Gerske
78311773ca caseing 2018-10-01 18:28:34 +02:00
Sebastian Gerske
a43db07334 removed old stuff 2018-10-01 18:19:00 +02:00
Sebastian Gerske
4038697a4b new structure 2018-10-01 18:10:57 +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
Sebastian Gerske
d4c746ccd0 Merge remote-tracking branch 'origin/feature/new-ocean-interface' into feature/new-ocean-interface 
# Conflicts:
#	src/metadata.js
#	src/ocean.js
 2018-10-01 12:24:47 +02:00