dev updates
* switch to Babel 7 * consistent npm start command * mention production build * correct license and author in package.json * important emoji change * simplify travis.yml
This commit is contained in:
parent
4145e1ba75
commit
e87b6fc421
GPG Key ID:
606EEEF3C479A91F
13
.babelrc
13
.babelrc
|
|
@ -1,18 +1,13 @@
|
|||
{
|
||||
"presets": [
|
||||
"es2015",
|
||||
[
|
||||
"env", { "useBuiltIns": true }
|
||||
],
|
||||
"stage-2"
|
||||
["@babel/preset-env", { "useBuiltIns": "entry" }]
|
||||
],
|
||||
"plugins": [
|
||||
[
|
||||
"transform-runtime",
|
||||
["@babel/plugin-transform-runtime",
|
||||
{
|
||||
"polyfill": false,
|
||||
"regenerator": true
|
||||
}
|
||||
]
|
||||
],
|
||||
["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": true }]
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,3 @@
|
|||
dist: trusty
|
||||
sudo: required
|
||||
group: beta
|
||||
language: node_js
|
||||
node_js:
|
||||
- "8"
|
||||
|
|
|
|||
15
README.md
15
README.md
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# squid-js
|
||||
|
||||
> 🐋 JavaScript implementation of ocean protocol keeper
|
||||
> 🦑 JavaScript implementation of Ocean Protocol Keeper
|
||||
> [oceanprotocol.com](https://oceanprotocol.com)
|
||||
|
||||
[](https://travis-ci.com/oceanprotocol/squid-js)
|
||||
|
|
@ -17,15 +17,24 @@
|
|||
## Table of Contents
|
||||
|
||||
- [Get Started](#get-started)
|
||||
- [Production Build](#production-build)
|
||||
- [License](#license)
|
||||
|
||||
---
|
||||
|
||||
|
||||
## Get Started
|
||||
|
||||
To start develppment you need to:
|
||||
|
||||
```batch
|
||||
npm i
|
||||
npm run start:dev
|
||||
npm start
|
||||
```
|
||||
|
||||
## Production Build
|
||||
|
||||
```bash
|
||||
npm run build
|
||||
```
|
||||
|
||||
This will start a watcher for changes of the code.
|
||||
|
|
|
|||
|
|
@ -1,81 +1,74 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
|
||||
var _regenerator = require('babel-runtime/regenerator');
|
||||
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
||||
|
||||
var _regenerator2 = _interopRequireDefault(_regenerator);
|
||||
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
||||
|
||||
var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
|
||||
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
||||
|
||||
var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
|
||||
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
||||
|
||||
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
|
||||
|
||||
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
|
||||
|
||||
var _createClass2 = require('babel-runtime/helpers/createClass');
|
||||
|
||||
var _createClass3 = _interopRequireDefault(_createClass2);
|
||||
|
||||
var _truffleContract = require('truffle-contract');
|
||||
|
||||
var _truffleContract2 = _interopRequireDefault(_truffleContract);
|
||||
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
var _truffleContract = _interopRequireDefault(require("truffle-contract"));
|
||||
|
||||
var contracts = [];
|
||||
|
||||
var ContractLoader = function () {
|
||||
function ContractLoader() {
|
||||
(0, _classCallCheck3.default)(this, ContractLoader);
|
||||
}
|
||||
var ContractLoader =
|
||||
/*#__PURE__*/
|
||||
function () {
|
||||
function ContractLoader() {
|
||||
(0, _classCallCheck2.default)(this, ContractLoader);
|
||||
}
|
||||
|
||||
(0, _createClass3.default)(ContractLoader, null, [{
|
||||
key: '_doLoad',
|
||||
value: function () {
|
||||
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee(what, where, provider) {
|
||||
var artifact, contract;
|
||||
return _regenerator2.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
// console.log("Loading", what, "from", where)
|
||||
/* eslint-disable-next-line */
|
||||
artifact = require('@oceanprotocol/keeper-contracts/artifacts/' + what + '.' + where);
|
||||
contract = (0, _truffleContract2.default)(artifact);
|
||||
(0, _createClass2.default)(ContractLoader, null, [{
|
||||
key: "_doLoad",
|
||||
value: function () {
|
||||
var _doLoad2 = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee(what, where, provider) {
|
||||
var artifact, contract;
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
// console.log("Loading", what, "from", where)
|
||||
|
||||
contract.setProvider(provider);
|
||||
_context.next = 5;
|
||||
return contract.at(artifact.address);
|
||||
/* eslint-disable-next-line */
|
||||
artifact = require("@oceanprotocol/keeper-contracts/artifacts/".concat(what, ".").concat(where));
|
||||
contract = (0, _truffleContract.default)(artifact);
|
||||
contract.setProvider(provider);
|
||||
_context.next = 5;
|
||||
return contract.at(artifact.address);
|
||||
|
||||
case 5:
|
||||
contracts[what] = _context.sent;
|
||||
return _context.abrupt('return', contracts[what]);
|
||||
case 5:
|
||||
contracts[what] = _context.sent;
|
||||
return _context.abrupt("return", contracts[what]);
|
||||
|
||||
case 7:
|
||||
case 'end':
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee, this);
|
||||
}));
|
||||
|
||||
function _doLoad(_x, _x2, _x3) {
|
||||
return _ref.apply(this, arguments);
|
||||
case 7:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee, this);
|
||||
}));
|
||||
|
||||
return _doLoad;
|
||||
}()
|
||||
}, {
|
||||
key: 'load',
|
||||
value: function load(what, where, provider) {
|
||||
return contracts[what] || ContractLoader._doLoad(what, where, provider);
|
||||
}
|
||||
}]);
|
||||
return ContractLoader;
|
||||
return function _doLoad(_x, _x2, _x3) {
|
||||
return _doLoad2.apply(this, arguments);
|
||||
};
|
||||
}()
|
||||
}, {
|
||||
key: "load",
|
||||
value: function load(what, where, provider) {
|
||||
return contracts[what] || ContractLoader._doLoad(what, where, provider);
|
||||
}
|
||||
}]);
|
||||
return ContractLoader;
|
||||
}();
|
||||
|
||||
exports.default = ContractLoader;
|
||||
|
|
@ -1,60 +1,62 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
|
||||
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
|
||||
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
||||
|
||||
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
|
||||
|
||||
var _createClass2 = require('babel-runtime/helpers/createClass');
|
||||
|
||||
var _createClass3 = _interopRequireDefault(_createClass2);
|
||||
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
||||
|
||||
/* global fetch */
|
||||
var OceanAgent =
|
||||
/*#__PURE__*/
|
||||
function () {
|
||||
function OceanAgent(connectionUrl) {
|
||||
(0, _classCallCheck2.default)(this, OceanAgent);
|
||||
this.assetsUrl = connectionUrl + '/assets';
|
||||
}
|
||||
|
||||
var OceanAgent = function () {
|
||||
function OceanAgent(connectionUrl) {
|
||||
(0, _classCallCheck3.default)(this, OceanAgent);
|
||||
|
||||
this.assetsUrl = connectionUrl + '/assets';
|
||||
(0, _createClass2.default)(OceanAgent, [{
|
||||
key: "getAssetsMetadata",
|
||||
value: function getAssetsMetadata() {
|
||||
return fetch(this.assetsUrl + '/metadata', {
|
||||
method: 'GET'
|
||||
}).then(function (res) {
|
||||
return res.json();
|
||||
}).then(function (data) {
|
||||
return JSON.parse(data);
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "publishDataAsset",
|
||||
value: function publishDataAsset(asset) {
|
||||
return fetch(this.assetsUrl + '/metadata', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(asset),
|
||||
headers: {
|
||||
'Content-type': 'application/json'
|
||||
}
|
||||
}).then(function (response) {
|
||||
console.log('Success:', response);
|
||||
|
||||
(0, _createClass3.default)(OceanAgent, [{
|
||||
key: 'getAssetsMetadata',
|
||||
value: function getAssetsMetadata() {
|
||||
return fetch(this.assetsUrl + '/metadata', { method: 'GET' }).then(function (res) {
|
||||
return res.json();
|
||||
}).then(function (data) {
|
||||
return JSON.parse(data);
|
||||
});
|
||||
if (response.ok) {
|
||||
console.log('Success:', response);
|
||||
return true;
|
||||
}
|
||||
}, {
|
||||
key: 'publishDataAsset',
|
||||
value: function publishDataAsset(asset) {
|
||||
return fetch(this.assetsUrl + '/metadata', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify(asset),
|
||||
headers: { 'Content-type': 'application/json' }
|
||||
}).then(function (response) {
|
||||
console.log('Success:', response);
|
||||
if (response.ok) {
|
||||
console.log('Success:', response);
|
||||
return true;
|
||||
}
|
||||
console.log('Failed: ', response.status, response.statusText);
|
||||
return false;
|
||||
// throw new Error(response.statusText ? response.statusText : `publish asset failed with status ${response.status}`)
|
||||
}).catch(function (error) {
|
||||
console.log('Publish asset to ocean database could not be completed: ' + error.message());
|
||||
return false;
|
||||
});
|
||||
}
|
||||
}]);
|
||||
return OceanAgent;
|
||||
|
||||
console.log('Failed: ', response.status, response.statusText);
|
||||
return false; // throw new Error(response.statusText ? response.statusText : `publish asset failed with status ${response.status}`)
|
||||
}).catch(function (error) {
|
||||
console.log("Publish asset to ocean database could not be completed: ".concat(error.message()));
|
||||
return false;
|
||||
});
|
||||
}
|
||||
}]);
|
||||
return OceanAgent;
|
||||
}();
|
||||
|
||||
exports.default = OceanAgent;
|
||||
|
|
@ -1,383 +1,390 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
value: true
|
||||
});
|
||||
exports.default = void 0;
|
||||
|
||||
var _extends2 = require('babel-runtime/helpers/extends');
|
||||
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread"));
|
||||
|
||||
var _extends3 = _interopRequireDefault(_extends2);
|
||||
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
||||
|
||||
var _regenerator = require('babel-runtime/regenerator');
|
||||
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
||||
|
||||
var _regenerator2 = _interopRequireDefault(_regenerator);
|
||||
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
||||
|
||||
var _asyncToGenerator2 = require('babel-runtime/helpers/asyncToGenerator');
|
||||
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
||||
|
||||
var _asyncToGenerator3 = _interopRequireDefault(_asyncToGenerator2);
|
||||
var _web = _interopRequireDefault(require("web3"));
|
||||
|
||||
var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
|
||||
|
||||
var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
|
||||
|
||||
var _createClass2 = require('babel-runtime/helpers/createClass');
|
||||
|
||||
var _createClass3 = _interopRequireDefault(_createClass2);
|
||||
|
||||
var _web = require('web3');
|
||||
|
||||
var _web2 = _interopRequireDefault(_web);
|
||||
|
||||
var _contractLoader = require('./contractLoader');
|
||||
|
||||
var _contractLoader2 = _interopRequireDefault(_contractLoader);
|
||||
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
var _contractLoader = _interopRequireDefault(require("./contractLoader"));
|
||||
|
||||
var DEFAULT_GAS = 300000;
|
||||
|
||||
var OceanKeeper = function () {
|
||||
function OceanKeeper(uri, network) {
|
||||
(0, _classCallCheck3.default)(this, OceanKeeper);
|
||||
var OceanKeeper =
|
||||
/*#__PURE__*/
|
||||
function () {
|
||||
function OceanKeeper(uri, network) {
|
||||
(0, _classCallCheck2.default)(this, OceanKeeper);
|
||||
var web3Provider = new _web.default.providers.HttpProvider(uri);
|
||||
this.web3 = new _web.default(web3Provider);
|
||||
this.defaultGas = DEFAULT_GAS;
|
||||
this.network = network || 'development';
|
||||
}
|
||||
|
||||
var web3Provider = new _web2.default.providers.HttpProvider(uri);
|
||||
this.web3 = new _web2.default(web3Provider);
|
||||
this.defaultGas = DEFAULT_GAS;
|
||||
this.network = network || 'development';
|
||||
(0, _createClass2.default)(OceanKeeper, [{
|
||||
key: "initContracts",
|
||||
value: function () {
|
||||
var _initContracts = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee() {
|
||||
return _regenerator.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
_context.next = 2;
|
||||
return _contractLoader.default.load('OceanToken', this.network, this.web3.currentProvider);
|
||||
|
||||
case 2:
|
||||
this.oceanToken = _context.sent;
|
||||
_context.next = 5;
|
||||
return _contractLoader.default.load('OceanMarket', this.network, this.web3.currentProvider);
|
||||
|
||||
case 5:
|
||||
this.oceanMarket = _context.sent;
|
||||
_context.next = 8;
|
||||
return _contractLoader.default.load('OceanAuth', this.network, this.web3.currentProvider);
|
||||
|
||||
case 8:
|
||||
this.oceanAuth = _context.sent;
|
||||
return _context.abrupt("return", {
|
||||
oceanToken: this.oceanToken,
|
||||
oceanMarket: this.oceanMarket,
|
||||
oceanAuth: this.oceanAuth
|
||||
});
|
||||
|
||||
case 10:
|
||||
case "end":
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee, this);
|
||||
}));
|
||||
|
||||
return function initContracts() {
|
||||
return _initContracts.apply(this, arguments);
|
||||
};
|
||||
}() // web3 wrappers
|
||||
|
||||
}, {
|
||||
key: "sign",
|
||||
value: function sign(accountAddress, message) {
|
||||
return this.web3.eth.sign(accountAddress, message);
|
||||
}
|
||||
}, {
|
||||
key: "getMessageHash",
|
||||
value: function getMessageHash(message) {
|
||||
return this.web3.sha3("\x19Ethereum Signed Message:\n".concat(message.length).concat(message));
|
||||
} // call functions (costs no gas)
|
||||
|
||||
(0, _createClass3.default)(OceanKeeper, [{
|
||||
key: 'initContracts',
|
||||
value: function () {
|
||||
var _ref = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee() {
|
||||
return _regenerator2.default.wrap(function _callee$(_context) {
|
||||
while (1) {
|
||||
switch (_context.prev = _context.next) {
|
||||
case 0:
|
||||
_context.next = 2;
|
||||
return _contractLoader2.default.load('OceanToken', this.network, this.web3.currentProvider);
|
||||
}, {
|
||||
key: "checkAsset",
|
||||
value: function checkAsset(assetId) {
|
||||
return this.oceanMarket.checkAsset(assetId);
|
||||
}
|
||||
}, {
|
||||
key: "getBalance",
|
||||
value: function getBalance(accountAddress) {
|
||||
return this.oceanToken.balanceOf.call(accountAddress);
|
||||
}
|
||||
}, {
|
||||
key: "getAssetPrice",
|
||||
value: function getAssetPrice(assetId) {
|
||||
return this.oceanMarket.getAssetPrice(assetId).then(function (price) {
|
||||
return price.toNumber();
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getOrderStatus",
|
||||
value: function getOrderStatus(orderId) {
|
||||
return this.oceanAuth.statusOfAccessRequest(orderId);
|
||||
}
|
||||
}, {
|
||||
key: "verifyOrderPayment",
|
||||
value: function verifyOrderPayment(orderId) {
|
||||
return this.oceanMarket.verifyPaymentReceived(orderId);
|
||||
}
|
||||
}, {
|
||||
key: "getEncryptedAccessToken",
|
||||
value: function getEncryptedAccessToken(orderId, senderAddress) {
|
||||
return this.oceanAuth.getEncryptedAccessToken(orderId, {
|
||||
from: senderAddress
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "getConsumerOrders",
|
||||
value: function () {
|
||||
var _getConsumerOrders = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee3(consumerAddress) {
|
||||
var _this = this;
|
||||
|
||||
case 2:
|
||||
this.oceanToken = _context.sent;
|
||||
_context.next = 5;
|
||||
return _contractLoader2.default.load('OceanMarket', this.network, this.web3.currentProvider);
|
||||
var accessConsentEvent, _resolve, _reject, promise, getEvents, events, orders;
|
||||
|
||||
case 5:
|
||||
this.oceanMarket = _context.sent;
|
||||
_context.next = 8;
|
||||
return _contractLoader2.default.load('OceanAuth', this.network, this.web3.currentProvider);
|
||||
|
||||
case 8:
|
||||
this.oceanAuth = _context.sent;
|
||||
return _context.abrupt('return', {
|
||||
oceanToken: this.oceanToken,
|
||||
oceanMarket: this.oceanMarket,
|
||||
oceanAuth: this.oceanAuth
|
||||
});
|
||||
|
||||
case 10:
|
||||
case 'end':
|
||||
return _context.stop();
|
||||
}
|
||||
}
|
||||
}, _callee, this);
|
||||
}));
|
||||
|
||||
function initContracts() {
|
||||
return _ref.apply(this, arguments);
|
||||
}
|
||||
|
||||
return initContracts;
|
||||
}()
|
||||
|
||||
// web3 wrappers
|
||||
|
||||
}, {
|
||||
key: 'sign',
|
||||
value: function sign(accountAddress, message) {
|
||||
return this.web3.eth.sign(accountAddress, message);
|
||||
}
|
||||
}, {
|
||||
key: 'getMessageHash',
|
||||
value: function getMessageHash(message) {
|
||||
return this.web3.sha3('\x19Ethereum Signed Message:\n' + message.length + message);
|
||||
}
|
||||
|
||||
// call functions (costs no gas)
|
||||
|
||||
}, {
|
||||
key: 'checkAsset',
|
||||
value: function checkAsset(assetId) {
|
||||
return this.oceanMarket.checkAsset(assetId);
|
||||
}
|
||||
}, {
|
||||
key: 'getBalance',
|
||||
value: function getBalance(accountAddress) {
|
||||
return this.oceanToken.balanceOf.call(accountAddress);
|
||||
}
|
||||
}, {
|
||||
key: 'getAssetPrice',
|
||||
value: function getAssetPrice(assetId) {
|
||||
return this.oceanMarket.getAssetPrice(assetId).then(function (price) {
|
||||
return price.toNumber();
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: 'getOrderStatus',
|
||||
value: function getOrderStatus(orderId) {
|
||||
return this.oceanAuth.statusOfAccessRequest(orderId);
|
||||
}
|
||||
}, {
|
||||
key: 'verifyOrderPayment',
|
||||
value: function verifyOrderPayment(orderId) {
|
||||
return this.oceanMarket.verifyPaymentReceived(orderId);
|
||||
}
|
||||
}, {
|
||||
key: 'getEncryptedAccessToken',
|
||||
value: function getEncryptedAccessToken(orderId, senderAddress) {
|
||||
return this.oceanAuth.getEncryptedAccessToken(orderId, { from: senderAddress });
|
||||
}
|
||||
}, {
|
||||
key: 'getConsumerOrders',
|
||||
value: function () {
|
||||
var _ref2 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(consumerAddress) {
|
||||
var _this = this;
|
||||
|
||||
var accessConsentEvent, _resolve, _reject, promise, getEvents, events, orders;
|
||||
|
||||
return _regenerator2.default.wrap(function _callee3$(_context3) {
|
||||
while (1) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
accessConsentEvent = this.oceanAuth.AccessConsentRequested({ _consumer: consumerAddress }, {
|
||||
fromBlock: 0,
|
||||
toBlock: 'latest'
|
||||
});
|
||||
_resolve = null;
|
||||
_reject = null;
|
||||
promise = new Promise(function (resolve, reject) {
|
||||
_resolve = resolve;
|
||||
_reject = reject;
|
||||
});
|
||||
|
||||
getEvents = function getEvents() {
|
||||
accessConsentEvent.get(function (error, logs) {
|
||||
if (error) {
|
||||
_reject(error);
|
||||
throw new Error(error);
|
||||
} else {
|
||||
_resolve(logs);
|
||||
}
|
||||
});
|
||||
return promise;
|
||||
};
|
||||
|
||||
_context3.next = 7;
|
||||
return getEvents().then(function (events) {
|
||||
return events;
|
||||
});
|
||||
|
||||
case 7:
|
||||
events = _context3.sent;
|
||||
|
||||
// let orders = await this.buildOrdersFromEvents(events, consumerAddress).then((result) => result)
|
||||
orders = events.filter(function (obj) {
|
||||
return obj.args._consumer === consumerAddress;
|
||||
}).map(function () {
|
||||
var _ref3 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee2(event) {
|
||||
return _regenerator2.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
_context2.t0 = _extends3.default;
|
||||
_context2.t1 = {};
|
||||
_context2.t2 = event.args;
|
||||
_context2.t3 = event.args._timeout.toNumber();
|
||||
_context2.next = 6;
|
||||
return _this.getOrderStatus(event.args._id).then(function (status) {
|
||||
return status.toNumber();
|
||||
});
|
||||
|
||||
case 6:
|
||||
_context2.t4 = _context2.sent;
|
||||
_context2.next = 9;
|
||||
return _this.verifyOrderPayment(event.args._id).then(function (received) {
|
||||
return received;
|
||||
});
|
||||
|
||||
case 9:
|
||||
_context2.t5 = _context2.sent;
|
||||
_context2.t6 = {
|
||||
timeout: _context2.t3,
|
||||
status: _context2.t4,
|
||||
paid: _context2.t5,
|
||||
key: null
|
||||
};
|
||||
return _context2.abrupt('return', (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t6));
|
||||
|
||||
case 12:
|
||||
case 'end':
|
||||
return _context2.stop();
|
||||
}
|
||||
}
|
||||
}, _callee2, _this);
|
||||
}));
|
||||
|
||||
return function (_x2) {
|
||||
return _ref3.apply(this, arguments);
|
||||
};
|
||||
}());
|
||||
|
||||
console.debug('got orders: ', orders);
|
||||
return _context3.abrupt('return', orders);
|
||||
|
||||
case 11:
|
||||
case 'end':
|
||||
return _context3.stop();
|
||||
}
|
||||
}
|
||||
}, _callee3, this);
|
||||
}));
|
||||
|
||||
function getConsumerOrders(_x) {
|
||||
return _ref2.apply(this, arguments);
|
||||
}
|
||||
|
||||
return getConsumerOrders;
|
||||
}()
|
||||
|
||||
// Transactions with gas cost
|
||||
|
||||
}, {
|
||||
key: 'requestTokens',
|
||||
value: function requestTokens(senderAddress, numTokens) {
|
||||
return this.oceanMarket.requestTokens(numTokens, { from: senderAddress });
|
||||
}
|
||||
}, {
|
||||
key: 'registerDataAsset',
|
||||
value: function () {
|
||||
var _ref4 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee4(name, description, price, publisherAddress) {
|
||||
var assetId, result;
|
||||
return _regenerator2.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
_context4.next = 2;
|
||||
return this.oceanMarket.generateId(name + description);
|
||||
|
||||
case 2:
|
||||
assetId = _context4.sent;
|
||||
_context4.next = 5;
|
||||
return this.oceanMarket.register(assetId, price, { from: publisherAddress, gas: this.defaultGas });
|
||||
|
||||
case 5:
|
||||
result = _context4.sent;
|
||||
|
||||
console.log('registered: ', result);
|
||||
return _context4.abrupt('return', assetId);
|
||||
|
||||
case 8:
|
||||
case 'end':
|
||||
return _context4.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4, this);
|
||||
}));
|
||||
|
||||
function registerDataAsset(_x3, _x4, _x5, _x6) {
|
||||
return _ref4.apply(this, arguments);
|
||||
}
|
||||
|
||||
return registerDataAsset;
|
||||
}()
|
||||
}, {
|
||||
key: 'sendPayment',
|
||||
value: function () {
|
||||
var _ref5 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee5(assetId, order, publisherAddress, senderAddress) {
|
||||
var assetPrice;
|
||||
return _regenerator2.default.wrap(function _callee5$(_context5) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
case 0:
|
||||
_context5.next = 2;
|
||||
return this.oceanMarket.getAssetPrice(assetId).then(function (price) {
|
||||
return price.toNumber();
|
||||
});
|
||||
|
||||
case 2:
|
||||
assetPrice = _context5.sent;
|
||||
|
||||
this.oceanMarket.sendPayment(order.id, publisherAddress, assetPrice, order.timeout, {
|
||||
from: senderAddress,
|
||||
gas: 2000000
|
||||
});
|
||||
|
||||
case 4:
|
||||
case 'end':
|
||||
return _context5.stop();
|
||||
}
|
||||
}
|
||||
}, _callee5, this);
|
||||
}));
|
||||
|
||||
function sendPayment(_x7, _x8, _x9, _x10) {
|
||||
return _ref5.apply(this, arguments);
|
||||
}
|
||||
|
||||
return sendPayment;
|
||||
}()
|
||||
}, {
|
||||
key: 'cancelAccessRequest',
|
||||
value: function cancelAccessRequest(orderId, senderAddress) {
|
||||
return this.oceanAuth.cancelAccessRequest(orderId, { from: senderAddress });
|
||||
}
|
||||
}, {
|
||||
key: 'orchestrateResourcePurchase',
|
||||
value: function orchestrateResourcePurchase(assetId, publisherId, price, privateKey, publicKey, timeout, senderAddress, initialRequestEventHandler, accessCommittedEventHandler, tokenPublishedEventHandler) {
|
||||
var _this2 = this;
|
||||
|
||||
var oceanToken = this.oceanToken,
|
||||
oceanMarket = this.oceanMarket,
|
||||
oceanAuth = this.oceanAuth;
|
||||
// Allow OceanMarket contract to transfer funds on the consumer's behalf
|
||||
|
||||
oceanToken.approve(oceanMarket.address, price, { from: senderAddress, gas: 2000000 });
|
||||
// Submit the access request
|
||||
oceanAuth.initiateAccessRequest(assetId, publisherId, publicKey, timeout, { from: senderAddress, gas: 1000000 });
|
||||
|
||||
var resourceFilter = { _resourceId: assetId, _consumer: senderAddress };
|
||||
var initRequestEvent = oceanAuth.AccessConsentRequested(resourceFilter);
|
||||
var order = {};
|
||||
this._listenOnce(initRequestEvent, 'AccessConsentRequested', function (result, error) {
|
||||
order = initialRequestEventHandler(result, error);
|
||||
var requestIdFilter = { _id: order.id };
|
||||
var accessCommittedEvent = oceanAuth.AccessRequestCommitted(requestIdFilter);
|
||||
var tokenPublishedEvent = oceanAuth.EncryptedTokenPublished(requestIdFilter);
|
||||
_this2._listenOnce(accessCommittedEvent, 'AccessRequestCommitted', function (result, error) {
|
||||
accessCommittedEventHandler(result, order, error);
|
||||
return _regenerator.default.wrap(function _callee3$(_context3) {
|
||||
while (1) {
|
||||
switch (_context3.prev = _context3.next) {
|
||||
case 0:
|
||||
accessConsentEvent = this.oceanAuth.AccessConsentRequested({
|
||||
_consumer: consumerAddress
|
||||
}, {
|
||||
fromBlock: 0,
|
||||
toBlock: 'latest'
|
||||
});
|
||||
_this2._listenOnce(tokenPublishedEvent, 'EncryptedTokenPublished', function (result, error) {
|
||||
tokenPublishedEventHandler(result, order, error);
|
||||
_resolve = null;
|
||||
_reject = null;
|
||||
promise = new Promise(function (resolve, reject) {
|
||||
_resolve = resolve;
|
||||
_reject = reject;
|
||||
});
|
||||
});
|
||||
return order;
|
||||
|
||||
getEvents = function getEvents() {
|
||||
accessConsentEvent.get(function (error, logs) {
|
||||
if (error) {
|
||||
_reject(error);
|
||||
|
||||
throw new Error(error);
|
||||
} else {
|
||||
_resolve(logs);
|
||||
}
|
||||
});
|
||||
return promise;
|
||||
};
|
||||
|
||||
_context3.next = 7;
|
||||
return getEvents().then(function (events) {
|
||||
return events;
|
||||
});
|
||||
|
||||
case 7:
|
||||
events = _context3.sent;
|
||||
// let orders = await this.buildOrdersFromEvents(events, consumerAddress).then((result) => result)
|
||||
orders = events.filter(function (obj) {
|
||||
return obj.args._consumer === consumerAddress;
|
||||
}).map(
|
||||
/*#__PURE__*/
|
||||
function () {
|
||||
var _ref = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee2(event) {
|
||||
return _regenerator.default.wrap(function _callee2$(_context2) {
|
||||
while (1) {
|
||||
switch (_context2.prev = _context2.next) {
|
||||
case 0:
|
||||
_context2.t0 = _objectSpread2.default;
|
||||
_context2.t1 = {};
|
||||
_context2.t2 = event.args;
|
||||
_context2.t3 = event.args._timeout.toNumber();
|
||||
_context2.next = 6;
|
||||
return _this.getOrderStatus(event.args._id).then(function (status) {
|
||||
return status.toNumber();
|
||||
});
|
||||
|
||||
case 6:
|
||||
_context2.t4 = _context2.sent;
|
||||
_context2.next = 9;
|
||||
return _this.verifyOrderPayment(event.args._id).then(function (received) {
|
||||
return received;
|
||||
});
|
||||
|
||||
case 9:
|
||||
_context2.t5 = _context2.sent;
|
||||
_context2.t6 = {
|
||||
timeout: _context2.t3,
|
||||
status: _context2.t4,
|
||||
paid: _context2.t5,
|
||||
key: null
|
||||
};
|
||||
return _context2.abrupt("return", (0, _context2.t0)(_context2.t1, _context2.t2, _context2.t6));
|
||||
|
||||
case 12:
|
||||
case "end":
|
||||
return _context2.stop();
|
||||
}
|
||||
}
|
||||
}, _callee2, this);
|
||||
}));
|
||||
|
||||
return function (_x2) {
|
||||
return _ref.apply(this, arguments);
|
||||
};
|
||||
}());
|
||||
console.debug('got orders: ', orders);
|
||||
return _context3.abrupt("return", orders);
|
||||
|
||||
case 11:
|
||||
case "end":
|
||||
return _context3.stop();
|
||||
}
|
||||
}
|
||||
}, _callee3, this);
|
||||
}));
|
||||
|
||||
return function getConsumerOrders(_x) {
|
||||
return _getConsumerOrders.apply(this, arguments);
|
||||
};
|
||||
}() // Transactions with gas cost
|
||||
|
||||
}, {
|
||||
key: "requestTokens",
|
||||
value: function requestTokens(senderAddress, numTokens) {
|
||||
return this.oceanMarket.requestTokens(numTokens, {
|
||||
from: senderAddress
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "registerDataAsset",
|
||||
value: function () {
|
||||
var _registerDataAsset = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee4(name, description, price, publisherAddress) {
|
||||
var assetId, result;
|
||||
return _regenerator.default.wrap(function _callee4$(_context4) {
|
||||
while (1) {
|
||||
switch (_context4.prev = _context4.next) {
|
||||
case 0:
|
||||
_context4.next = 2;
|
||||
return this.oceanMarket.generateId(name + description);
|
||||
|
||||
case 2:
|
||||
assetId = _context4.sent;
|
||||
_context4.next = 5;
|
||||
return this.oceanMarket.register(assetId, price, {
|
||||
from: publisherAddress,
|
||||
gas: this.defaultGas
|
||||
});
|
||||
|
||||
case 5:
|
||||
result = _context4.sent;
|
||||
console.log('registered: ', result);
|
||||
return _context4.abrupt("return", assetId);
|
||||
|
||||
case 8:
|
||||
case "end":
|
||||
return _context4.stop();
|
||||
}
|
||||
}
|
||||
}, _callee4, this);
|
||||
}));
|
||||
|
||||
return function registerDataAsset(_x3, _x4, _x5, _x6) {
|
||||
return _registerDataAsset.apply(this, arguments);
|
||||
};
|
||||
}()
|
||||
}, {
|
||||
key: "sendPayment",
|
||||
value: function () {
|
||||
var _sendPayment = (0, _asyncToGenerator2.default)(
|
||||
/*#__PURE__*/
|
||||
_regenerator.default.mark(function _callee5(assetId, order, publisherAddress, senderAddress) {
|
||||
var assetPrice;
|
||||
return _regenerator.default.wrap(function _callee5$(_context5) {
|
||||
while (1) {
|
||||
switch (_context5.prev = _context5.next) {
|
||||
case 0:
|
||||
_context5.next = 2;
|
||||
return this.oceanMarket.getAssetPrice(assetId).then(function (price) {
|
||||
return price.toNumber();
|
||||
});
|
||||
|
||||
case 2:
|
||||
assetPrice = _context5.sent;
|
||||
this.oceanMarket.sendPayment(order.id, publisherAddress, assetPrice, order.timeout, {
|
||||
from: senderAddress,
|
||||
gas: 2000000
|
||||
});
|
||||
|
||||
case 4:
|
||||
case "end":
|
||||
return _context5.stop();
|
||||
}
|
||||
}
|
||||
}, _callee5, this);
|
||||
}));
|
||||
|
||||
return function sendPayment(_x7, _x8, _x9, _x10) {
|
||||
return _sendPayment.apply(this, arguments);
|
||||
};
|
||||
}()
|
||||
}, {
|
||||
key: "cancelAccessRequest",
|
||||
value: function cancelAccessRequest(orderId, senderAddress) {
|
||||
return this.oceanAuth.cancelAccessRequest(orderId, {
|
||||
from: senderAddress
|
||||
});
|
||||
}
|
||||
}, {
|
||||
key: "orchestrateResourcePurchase",
|
||||
value: function orchestrateResourcePurchase(assetId, publisherId, price, privateKey, publicKey, timeout, senderAddress, initialRequestEventHandler, accessCommittedEventHandler, tokenPublishedEventHandler) {
|
||||
var _this2 = this;
|
||||
|
||||
var oceanToken = this.oceanToken,
|
||||
oceanMarket = this.oceanMarket,
|
||||
oceanAuth = this.oceanAuth; // Allow OceanMarket contract to transfer funds on the consumer's behalf
|
||||
|
||||
oceanToken.approve(oceanMarket.address, price, {
|
||||
from: senderAddress,
|
||||
gas: 2000000
|
||||
}); // Submit the access request
|
||||
|
||||
oceanAuth.initiateAccessRequest(assetId, publisherId, publicKey, timeout, {
|
||||
from: senderAddress,
|
||||
gas: 1000000
|
||||
});
|
||||
var resourceFilter = {
|
||||
_resourceId: assetId,
|
||||
_consumer: senderAddress
|
||||
};
|
||||
var initRequestEvent = oceanAuth.AccessConsentRequested(resourceFilter);
|
||||
var order = {};
|
||||
|
||||
this._listenOnce(initRequestEvent, 'AccessConsentRequested', function (result, error) {
|
||||
order = initialRequestEventHandler(result, error);
|
||||
var requestIdFilter = {
|
||||
_id: order.id
|
||||
};
|
||||
var accessCommittedEvent = oceanAuth.AccessRequestCommitted(requestIdFilter);
|
||||
var tokenPublishedEvent = oceanAuth.EncryptedTokenPublished(requestIdFilter);
|
||||
|
||||
_this2._listenOnce(accessCommittedEvent, 'AccessRequestCommitted', function (result, error) {
|
||||
accessCommittedEventHandler(result, order, error);
|
||||
});
|
||||
|
||||
_this2._listenOnce(tokenPublishedEvent, 'EncryptedTokenPublished', function (result, error) {
|
||||
tokenPublishedEventHandler(result, order, error);
|
||||
});
|
||||
});
|
||||
|
||||
return order;
|
||||
} // Helper functions (private)
|
||||
|
||||
}, {
|
||||
key: "_listenOnce",
|
||||
value: function _listenOnce(event, eventName, callback) {
|
||||
event.watch(function (error, result) {
|
||||
event.stopWatching();
|
||||
|
||||
if (error) {
|
||||
console.log("Error in keeper ".concat(eventName, " event: "), error);
|
||||
}
|
||||
|
||||
// Helper functions (private)
|
||||
|
||||
}, {
|
||||
key: '_listenOnce',
|
||||
value: function _listenOnce(event, eventName, callback) {
|
||||
event.watch(function (error, result) {
|
||||
event.stopWatching();
|
||||
if (error) {
|
||||
console.log('Error in keeper ' + eventName + ' event: ', error);
|
||||
}
|
||||
callback(result, error);
|
||||
});
|
||||
}
|
||||
}]);
|
||||
return OceanKeeper;
|
||||
callback(result, error);
|
||||
});
|
||||
}
|
||||
}]);
|
||||
return OceanKeeper;
|
||||
}();
|
||||
|
||||
exports.default = OceanKeeper;
|
||||
|
|
@ -1,19 +1,23 @@
|
|||
'use strict';
|
||||
"use strict";
|
||||
|
||||
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
value: true
|
||||
});
|
||||
Object.defineProperty(exports, "OceanAgent", {
|
||||
enumerable: true,
|
||||
get: function get() {
|
||||
return _oceanAgent.default;
|
||||
}
|
||||
});
|
||||
Object.defineProperty(exports, "OceanKeeper", {
|
||||
enumerable: true,
|
||||
get: function get() {
|
||||
return _oceanKeeper.default;
|
||||
}
|
||||
});
|
||||
exports.OceanKeeper = exports.OceanAgent = undefined;
|
||||
|
||||
var _oceanAgent = require('./ocean-agent');
|
||||
var _oceanAgent = _interopRequireDefault(require("./ocean-agent"));
|
||||
|
||||
var _oceanAgent2 = _interopRequireDefault(_oceanAgent);
|
||||
|
||||
var _oceanKeeper = require('./ocean-keeper');
|
||||
|
||||
var _oceanKeeper2 = _interopRequireDefault(_oceanKeeper);
|
||||
|
||||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
||||
|
||||
exports.OceanAgent = _oceanAgent2.default;
|
||||
exports.OceanKeeper = _oceanKeeper2.default;
|
||||
var _oceanKeeper = _interopRequireDefault(require("./ocean-keeper"));
|
||||
File diff suppressed because it is too large
Load Diff
22
package.json
22
package.json
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "@oceanprotocol/squid",
|
||||
"version": "0.0.4",
|
||||
"description": "Ocean JavaScript Library",
|
||||
"description": "Ocean Protocol JavaScript Library",
|
||||
"main": "dist/squid.js",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"start:dev": "babel src --watch --out-dir dist",
|
||||
"start": "babel src --watch --out-dir dist",
|
||||
"build": "babel src --out-dir dist"
|
||||
},
|
||||
"repository": {
|
||||
|
|
@ -13,22 +13,26 @@
|
|||
"url": "git+https://github.com/oceanprotocol/squid-js.git"
|
||||
},
|
||||
"keywords": [],
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"author": "Ocean Protocol <devops@oceanproocol.com>",
|
||||
"license": "Apache-2.0",
|
||||
"bugs": {
|
||||
"url": "https://github.com/oceanprotocol/squid-js/issues"
|
||||
},
|
||||
"homepage": "https://github.com/oceanprotocol/squid-js#readme",
|
||||
"dependencies": {
|
||||
"@babel/runtime": "^7.0.0",
|
||||
"@oceanprotocol/keeper-contracts": "^0.1.0",
|
||||
"truffle-contract": "^3.0.6",
|
||||
"web3": "0.20.6"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "^6.26.0",
|
||||
"babel-core": "^6.26.3",
|
||||
"babel-plugin-transform-runtime": "^6.23.0",
|
||||
"babel-preset-es2015": "^6.24.1",
|
||||
"babel-preset-stage-2": "^6.24.1"
|
||||
"@babel/cli": "^7.0.0",
|
||||
"@babel/core": "^7.0.0",
|
||||
"@babel/plugin-proposal-object-rest-spread": "^7.0.0",
|
||||
"@babel/plugin-transform-runtime": "^7.0.0",
|
||||
"@babel/preset-env": "^7.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8 <10"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue