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

184 Commits

Author SHA1 Message Date
Pedro Gutiérrez
a80b4aee18 Fix linter issues manually. 2019-06-24 13:06:46 +02:00
b61822e30c format all the things 2019-06-24 13:06:46 +02:00
Pedro Gutiérrez
0ca5dae306 Improve version output. 2019-06-14 16:33:05 +02:00
Pedro Gutiérrez
0438beef2b Create Versions module. 2019-06-14 00:34:53 +02:00
34308e867f ts-node fix 2019-06-12 14:27:13 +02:00
Pedro Gutiérrez
172967c352 Fix integration tests. 2019-05-30 00:56:16 +02:00
Pedro Gutiérrez
6f57118ce9 Use price as string on some remaining parts. 2019-05-30 00:56:16 +02:00
Pedro Gutiérrez
6fe8430b08 Change the type of the price of an asset to string. 2019-05-30 00:56:16 +02:00
Pedro Gutiérrez
90fbc0b1d6 Expose the granted agreementIds for a consumer. 2019-05-29 12:18:04 +02:00
Pedro Gutiérrez
d7e572c646 Skip catching of Web3 instances. 2019-05-21 14:26:33 +02:00
Pedro Gutiérrez
46ff37c2eb Use provided Web3 provider on Web3 browsers. #225 2019-05-16 11:10:03 +02:00
Pedro Gutiérrez
a821e1f7ef Add Duero network on getNetworkName. 2019-05-14 14:01:08 +02:00
Pedro Gutiérrez
bb1a02a5d1 Fix differences between implementation on DDO generation. 2019-04-30 11:38:11 +02:00
Pedro Gutiérrez
c116cde4ca Allow create a Ocean instance in wrong network. #188 2019-04-23 12:46:52 +02:00
Pedro Gutiérrez
b36e3a4f06 Add consumerAssets method to assets module. 2019-04-17 13:54:33 +02:00
Pedro Gutiérrez
47ced8af1b Add ownerAssets method to assets module. 2019-04-17 13:54:33 +02:00
Pedro Gutiérrez
b6af27a523 Use only the agreementId on status method of agreements module. 2019-04-16 14:33:42 +02:00
Pedro Gutiérrez
398ec203c1 Add status method to agreements module. 2019-04-16 14:01:30 +02:00
Jernej Pregelj
304fda8820 lint fixes 2019-04-10 12:30:17 +02:00
Jernej Pregelj
26a721f754 await chaining to Promise.all 2019-04-10 12:28:51 +02:00
Pedro Gutiérrez
b5727bb8dc Fix lint errors. 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
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
f3599a5d7f Remove --no-acl-contractflag. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
cf99c9ff64 Fix all ignored tests. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
eaac2f4f68 Fix linter errors. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
01465dc164 Fix Reward condition pointing. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
c976d52378 Upgrade asset.create, asset.order and agreement related methods to work with Keeper 0.8.x. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
b1715be11a Fix agreement status generation. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
4f469b2ab5 Use condition contracts hash generation to generate the signature. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
f8b3d839eb Add a way to get the status of a agreement. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
51fbbc887e Fix dependencies references on Escrow template. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
0ffa0e4204 Add initial condition and agreement store managers. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
6a4df9768a Move signature values generation to template. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
ae070be011 Use the decimals of OceanToken to return the correct balance. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
136250b70c Move access service template used on the DDO to each agreement template. 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
51aa0fbf64 Clean and simplify template related typings. 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
c57121e45b checking the 0x prefix on all the interaction with contracts 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
86906b393f added OceanAgreementsConditions submodule 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
f7cd71ac33 complete Escrow template flow 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
c9b383223b fixed some typing issues 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
5ec624b2a5 initial implementation of templates and conditions 2019-03-18 13:37:49 +01:00
Pedro Gutiérrez
e61e7b8881 improved Logger allowing different log level 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
fce3a09285 added Ocean.tokens module 2019-02-26 00:18:07 +01:00
Pedro Gutiérrez
e1b9197746 added buy asset test 2019-02-14 12:05:31 +01:00
Pedro Gutiérrez
d51e3f3dbf updated registerAttribute method 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
0599ba67fa updated setupTemplate method 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
64921829f9 changed name of ServiceExecutionAgreement 2019-02-08 17:37:21 +01:00
Pedro Gutiérrez
86b406ad2e fixed linter issues 2019-01-24 10:58:05 +01:00
Pedro Gutiérrez
c1c3168c64 improved error detection on integration test #118 2019-01-24 10:48:48 +01:00
Pedro Gutiérrez
1ecbb69937 improved error detection on http requests #118 2019-01-24 10:48:48 +01:00
Pedro Gutiérrez
4074d95f1e added comments on some internal classes #79 2019-01-09 16:39:18 +01:00
Sebastian Gerske
dea6ea4770 fix/circular_dep 2018-12-17 17:37:36 +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
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
Sebastian Gerske
b2cebf7748 added verbose flag to config 2018-12-11 17:41:10 +01:00
Sebastian Gerske
83ce375588 remove dead code 2018-12-10 13:26:07 +01:00
Sebastian Gerske
7b0d34a420 hardened event listening 2018-12-07 17:19:53 +01:00
Sebastian Gerske
ce7027590e new access template 2018-12-07 15:19:16 +01:00
Sebastian Gerske
f65bb4e050 added support for poa mainnet (core) and testnet (sokol) 2018-11-29 08:44:58 +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
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
375f153b93 add detection for local poa 2018-11-23 09:57:37 +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
ssallam
1a3bb2f8b1 Generate fulfillmentIndices from service agreement conditions, set fulfillmentOperator to 1 (or operator), fix typo. 2018-11-21 15:58:59 +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
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
3983c83eb9 added support for POA network 2018-11-14 09:36:37 +01:00
Sebastian Gerske
ff8a904f09 hardened contract handler 2018-11-08 08:23:00 +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
2194ae59c3 adapt changes from keeper 0.3.18 2018-11-07 09:35:47 +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
e1b4293125 use timeouts from template 2018-11-05 14:56:14 +01:00
Sebastian Gerske
6e2b270a1f integrate DDO more 2018-11-05 10:01:58 +01:00
Sebastian Gerske
cf86f5af0d first steps towards service agreements implementation 2018-11-01 08:31:21 +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
fb5dcaf522 added secret store 2018-10-26 13:37:09 +02:00