@super-protocol/sdk-js 0.8.1-beta.4 → 0.9.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/build/BlockchainConnector.d.ts +4 -0
  2. package/build/BlockchainConnector.js +26 -5
  3. package/build/contracts/app.json +943 -293
  4. package/build/models/Ballot.js +2 -4
  5. package/build/models/Offer.js +2 -2
  6. package/build/models/Order.d.ts +12 -0
  7. package/build/models/Order.js +32 -1
  8. package/build/models/Provider.js +2 -2
  9. package/build/models/TCB.js +2 -2
  10. package/build/models/TeeOffer.js +2 -2
  11. package/build/staticModels/ActiveOffers.d.ts +1 -6
  12. package/build/staticModels/ActiveOffers.js +15 -27
  13. package/build/staticModels/ActiveOrders.d.ts +1 -6
  14. package/build/staticModels/ActiveOrders.js +9 -26
  15. package/build/staticModels/Consensus.d.ts +1 -7
  16. package/build/staticModels/Consensus.js +35 -36
  17. package/build/staticModels/Marks.d.ts +0 -5
  18. package/build/staticModels/Marks.js +10 -22
  19. package/build/staticModels/OffersFactory.d.ts +1 -6
  20. package/build/staticModels/OffersFactory.js +14 -28
  21. package/build/staticModels/OrdersFactory.d.ts +1 -7
  22. package/build/staticModels/OrdersFactory.js +39 -55
  23. package/build/staticModels/ProviderRegistry.d.ts +1 -7
  24. package/build/staticModels/ProviderRegistry.js +24 -48
  25. package/build/staticModels/Staking.d.ts +0 -6
  26. package/build/staticModels/Staking.js +8 -24
  27. package/build/staticModels/Superpro.d.ts +0 -6
  28. package/build/staticModels/Superpro.js +7 -19
  29. package/build/staticModels/SuperproToken.d.ts +4 -2
  30. package/build/staticModels/SuperproToken.js +15 -10
  31. package/build/staticModels/TeeOffersFactory.d.ts +1 -6
  32. package/build/staticModels/TeeOffersFactory.js +13 -27
  33. package/build/staticModels/Voting.d.ts +0 -6
  34. package/build/staticModels/Voting.js +0 -20
  35. package/package.json +1 -1
@@ -39,53 +39,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- var store_1 = __importDefault(require("../store"));
43
42
  var logger_1 = __importDefault(require("../logger"));
44
- var app_json_1 = __importDefault(require("../contracts/app.json"));
45
43
  var utils_1 = require("../utils");
46
44
  var Provider_1 = require("../types/Provider");
47
- var Superpro_1 = __importDefault(require("./Superpro"));
45
+ var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
48
46
  var TxManager_1 = __importDefault(require("../utils/TxManager"));
49
47
  var ProviderRegistry = /** @class */ (function () {
50
48
  function ProviderRegistry() {
51
49
  }
52
- /**
53
- * Checks if contract has been initialized, if not - initialize contract
54
- */
55
- ProviderRegistry.checkInitProviders = function (transactionOptions) {
56
- if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
57
- (0, utils_1.checkIfInitialized)();
58
- return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
59
- }
60
- if (this.contract)
61
- return this.contract;
62
- (0, utils_1.checkIfInitialized)();
63
- this.logger = logger_1.default.child({ className: "Providers" });
64
- return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
65
- };
66
- ProviderRegistry.checkInitProvidersOffers = function (transactionOptions) {
67
- if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
68
- (0, utils_1.checkIfInitialized)();
69
- return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
70
- }
71
- if (this.contract)
72
- return this.contract;
73
- (0, utils_1.checkIfInitialized)();
74
- this.logger = logger_1.default.child({ className: "ProvidersOffers" });
75
- return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
76
- };
77
50
  /**
78
51
  * Function for fetching list of all providers addresses
79
52
  */
80
53
  ProviderRegistry.getAllProviders = function () {
81
54
  return __awaiter(this, void 0, void 0, function () {
82
- var _a;
55
+ var contract, _a;
83
56
  return __generator(this, function (_b) {
84
57
  switch (_b.label) {
85
58
  case 0:
86
- this.checkInitProviders();
59
+ contract = BlockchainConnector_1.default.getContractInstance();
87
60
  _a = this;
88
- return [4 /*yield*/, this.contract.methods.getProvidersAuths().call()];
61
+ return [4 /*yield*/, contract.methods.getProvidersAuths().call()];
89
62
  case 1:
90
63
  _a.providers = _b.sent();
91
64
  return [2 /*return*/, this.providers];
@@ -108,11 +81,12 @@ var ProviderRegistry = /** @class */ (function () {
108
81
  */
109
82
  ProviderRegistry.getSecurityDeposit = function (providerAuthority) {
110
83
  return __awaiter(this, void 0, void 0, function () {
84
+ var contract;
111
85
  return __generator(this, function (_a) {
112
86
  switch (_a.label) {
113
87
  case 0:
114
- this.checkInitProviders();
115
- return [4 /*yield*/, this.contract.methods.getProviderSecurityDeposit(providerAuthority).call()];
88
+ contract = BlockchainConnector_1.default.getContractInstance();
89
+ return [4 /*yield*/, contract.methods.getProviderSecurityDeposit(providerAuthority).call()];
116
90
  case 1: return [2 /*return*/, _a.sent()];
117
91
  }
118
92
  });
@@ -120,11 +94,12 @@ var ProviderRegistry = /** @class */ (function () {
120
94
  };
121
95
  ProviderRegistry.isProviderRegistered = function (providerAuthority) {
122
96
  return __awaiter(this, void 0, void 0, function () {
97
+ var contract;
123
98
  return __generator(this, function (_a) {
124
99
  switch (_a.label) {
125
100
  case 0:
126
- this.checkInitProviders();
127
- return [4 /*yield*/, this.contract.methods.isProviderRegistered(providerAuthority).call()];
101
+ contract = BlockchainConnector_1.default.getContractInstance();
102
+ return [4 /*yield*/, contract.methods.isProviderRegistered(providerAuthority).call()];
128
103
  case 1: return [2 /*return*/, _a.sent()];
129
104
  }
130
105
  });
@@ -142,7 +117,7 @@ var ProviderRegistry = /** @class */ (function () {
142
117
  return __generator(this, function (_a) {
143
118
  switch (_a.label) {
144
119
  case 0:
145
- contract = this.checkInitProviders(transactionOptions);
120
+ contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
146
121
  (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
147
122
  providerInfoParams = (0, utils_1.objectToTuple)(providerInfo, Provider_1.ProviderInfoStructure);
148
123
  return [4 /*yield*/, TxManager_1.default.execute(contract.methods.registerProvider, [providerInfoParams], transactionOptions)];
@@ -165,7 +140,7 @@ var ProviderRegistry = /** @class */ (function () {
165
140
  return __generator(this, function (_a) {
166
141
  switch (_a.label) {
167
142
  case 0:
168
- contract = this.checkInitProviders(transactionOptions);
143
+ contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
169
144
  (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
170
145
  return [4 /*yield*/, TxManager_1.default.execute(contract.methods.refillProviderSecurityDepo, [amount], transactionOptions)];
171
146
  case 1:
@@ -187,7 +162,7 @@ var ProviderRegistry = /** @class */ (function () {
187
162
  return __generator(this, function (_a) {
188
163
  switch (_a.label) {
189
164
  case 0:
190
- contract = this.checkInitProviders(transactionOptions);
165
+ contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
191
166
  (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
192
167
  return [4 /*yield*/, TxManager_1.default.execute(contract.methods.returnProviderSecurityDepo, [amount], transactionOptions)];
193
168
  case 1:
@@ -204,9 +179,9 @@ var ProviderRegistry = /** @class */ (function () {
204
179
  */
205
180
  ProviderRegistry.onProviderRegistered = function (callback) {
206
181
  var _this = this;
207
- this.checkInitProviders();
182
+ var contract = BlockchainConnector_1.default.getContractInstance();
208
183
  var logger = this.logger.child({ method: "onProviderRegistered" });
209
- var subscription = this.contract.events
184
+ var subscription = contract.events
210
185
  .ProviderRegistred()
211
186
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
212
187
  return __generator(this, function (_a) {
@@ -231,9 +206,9 @@ var ProviderRegistry = /** @class */ (function () {
231
206
  */
232
207
  ProviderRegistry.onProviderModified = function (callback) {
233
208
  var _this = this;
234
- this.checkInitProviders();
209
+ var contract = BlockchainConnector_1.default.getContractInstance();
235
210
  var logger = this.logger.child({ method: "onProviderModified" });
236
- var subscription = this.contract.events
211
+ var subscription = contract.events
237
212
  .ProviderModified()
238
213
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
239
214
  return __generator(this, function (_a) {
@@ -258,9 +233,9 @@ var ProviderRegistry = /** @class */ (function () {
258
233
  */
259
234
  ProviderRegistry.onProviderViolationRateIncremented = function (callback) {
260
235
  var _this = this;
261
- this.checkInitProviders();
236
+ var contract = BlockchainConnector_1.default.getContractInstance();
262
237
  var logger = this.logger.child({ method: "onProviderViolationRateIncremented" });
263
- var subscription = this.contract.events
238
+ var subscription = contract.events
264
239
  .ProviderViolationRateIncremented()
265
240
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
266
241
  return __generator(this, function (_a) {
@@ -285,9 +260,9 @@ var ProviderRegistry = /** @class */ (function () {
285
260
  */
286
261
  ProviderRegistry.onProviderSecurityDepoRefilled = function (callback) {
287
262
  var _this = this;
288
- this.checkInitProviders();
263
+ var contract = BlockchainConnector_1.default.getContractInstance();
289
264
  var logger = this.logger.child({ method: "onProviderSecurityDepoRefilled" });
290
- var subscription = this.contract.events
265
+ var subscription = contract.events
291
266
  .ProviderSecurityDepoRefilled()
292
267
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
293
268
  return __generator(this, function (_a) {
@@ -312,9 +287,9 @@ var ProviderRegistry = /** @class */ (function () {
312
287
  */
313
288
  ProviderRegistry.onProviderSecurityDepoUnlocked = function (callback) {
314
289
  var _this = this;
315
- this.checkInitProviders();
290
+ var contract = BlockchainConnector_1.default.getContractInstance();
316
291
  var logger = this.logger.child({ method: "onProviderSecurityDepoUnlocked" });
317
- var subscription = this.contract.events
292
+ var subscription = contract.events
318
293
  .ProviderSecurityDepoUnlocked()
319
294
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
320
295
  return __generator(this, function (_a) {
@@ -332,6 +307,7 @@ var ProviderRegistry = /** @class */ (function () {
332
307
  });
333
308
  return function () { return subscription.unsubscribe(); };
334
309
  };
310
+ ProviderRegistry.logger = logger_1.default.child({ className: "ProviderRegistry" });
335
311
  return ProviderRegistry;
336
312
  }());
337
313
  exports.default = ProviderRegistry;
@@ -1,13 +1,7 @@
1
1
  import { LockInfo, StakeInfo, Purpose } from "../types/Staking";
2
2
  import { TransactionOptions } from "../types/Web3";
3
3
  declare class Staking {
4
- private static contract;
5
- private static logger;
6
4
  static get address(): string;
7
- /**
8
- * Checks if contract has been initialized, if not - initialize contract
9
- */
10
- private static checkInit;
11
5
  /**
12
6
  * Fetching stake info by owner address from blockchain
13
7
  */
@@ -39,11 +39,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- var logger_1 = __importDefault(require("../logger"));
43
- var app_json_1 = __importDefault(require("../contracts/app.json"));
44
- var store_1 = __importDefault(require("../store"));
45
42
  var utils_1 = require("../utils");
46
43
  var Staking_1 = require("../types/Staking");
44
+ var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
47
45
  var Superpro_1 = __importDefault(require("./Superpro"));
48
46
  var TxManager_1 = __importDefault(require("../utils/TxManager"));
49
47
  var Staking = /** @class */ (function () {
@@ -56,31 +54,17 @@ var Staking = /** @class */ (function () {
56
54
  enumerable: false,
57
55
  configurable: true
58
56
  });
59
- /**
60
- * Checks if contract has been initialized, if not - initialize contract
61
- */
62
- Staking.checkInit = function (transactionOptions) {
63
- if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
64
- (0, utils_1.checkIfInitialized)();
65
- return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
66
- }
67
- if (this.contract)
68
- return this.contract;
69
- (0, utils_1.checkIfInitialized)();
70
- this.logger = logger_1.default.child({ className: "Staking" });
71
- return this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
72
- };
73
57
  /**
74
58
  * Fetching stake info by owner address from blockchain
75
59
  */
76
60
  Staking.getStakeInfo = function (ownerAddress) {
77
61
  return __awaiter(this, void 0, void 0, function () {
78
- var stakeInfoParams;
62
+ var contract, stakeInfoParams;
79
63
  return __generator(this, function (_a) {
80
64
  switch (_a.label) {
81
65
  case 0:
82
- this.checkInit();
83
- return [4 /*yield*/, this.contract.methods.getStakeInfo(ownerAddress).call()];
66
+ contract = BlockchainConnector_1.default.getContractInstance();
67
+ return [4 /*yield*/, contract.methods.getStakeInfo(ownerAddress).call()];
84
68
  case 1:
85
69
  stakeInfoParams = _a.sent();
86
70
  return [2 /*return*/, (0, utils_1.tupleToObject)(stakeInfoParams, Staking_1.StakeInfoStructure)];
@@ -93,12 +77,12 @@ var Staking = /** @class */ (function () {
93
77
  */
94
78
  Staking.getLockInfo = function (purpose, ownerAddress) {
95
79
  return __awaiter(this, void 0, void 0, function () {
96
- var lockInfoParams;
80
+ var contract, lockInfoParams;
97
81
  return __generator(this, function (_a) {
98
82
  switch (_a.label) {
99
83
  case 0:
100
- this.checkInit();
101
- return [4 /*yield*/, this.contract.methods.getLockedTokensInfo(purpose, ownerAddress).call()];
84
+ contract = BlockchainConnector_1.default.getContractInstance();
85
+ return [4 /*yield*/, contract.methods.getLockedTokensInfo(purpose, ownerAddress).call()];
102
86
  case 1:
103
87
  lockInfoParams = _a.sent();
104
88
  return [2 /*return*/, (0, utils_1.tupleToObject)(lockInfoParams, Staking_1.LockInfoStructure)];
@@ -117,7 +101,7 @@ var Staking = /** @class */ (function () {
117
101
  return __generator(this, function (_a) {
118
102
  switch (_a.label) {
119
103
  case 0:
120
- contract = this.checkInit(transactionOptions);
104
+ contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
121
105
  (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
122
106
  return [4 /*yield*/, TxManager_1.default.execute(contract.methods.stake, [amount], transactionOptions)];
123
107
  case 1:
@@ -1,12 +1,6 @@
1
1
  import { ContractName, ParamName } from "../types/Superpro";
2
2
  declare class Superpro {
3
3
  static address: string;
4
- private static contract;
5
- private static logger;
6
- /**
7
- * Checks if contract has been initialized, if not - initialize contract
8
- */
9
- private static checkInit;
10
4
  /**
11
5
  * Fetching address of contract by name
12
6
  */
@@ -39,41 +39,28 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- var logger_1 = __importDefault(require("../logger"));
43
- var app_json_1 = __importDefault(require("../contracts/app.json"));
44
- var store_1 = __importDefault(require("../store"));
42
+ var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
45
43
  var Superpro = /** @class */ (function () {
46
44
  function Superpro() {
47
45
  }
48
- /**
49
- * Checks if contract has been initialized, if not - initialize contract
50
- */
51
- Superpro.checkInit = function () {
52
- if (this.contract)
53
- return;
54
- if (!this.address || !store_1.default.web3)
55
- throw new Error("BlockchainConnector is not initialized, needs to run 'await BlockchainConnector.init(CONFIG)' first");
56
- this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, this.address);
57
- this.logger = logger_1.default.child({ className: "Superpro", address: this.address });
58
- };
59
46
  /**
60
47
  * Fetching address of contract by name
61
48
  */
62
49
  Superpro.getContractAddress = function (name) {
63
50
  return __awaiter(this, void 0, void 0, function () {
64
51
  return __generator(this, function (_a) {
65
- this.checkInit();
66
52
  return [2 /*return*/, this.address];
67
53
  });
68
54
  });
69
55
  };
70
56
  Superpro.getTokenAddress = function () {
71
57
  return __awaiter(this, void 0, void 0, function () {
58
+ var contract;
72
59
  return __generator(this, function (_a) {
73
60
  switch (_a.label) {
74
61
  case 0:
75
- this.checkInit();
76
- return [4 /*yield*/, this.contract.methods.getToken().call()];
62
+ contract = BlockchainConnector_1.default.getContractInstance();
63
+ return [4 /*yield*/, contract.methods.getToken().call()];
77
64
  case 1: return [2 /*return*/, _a.sent()];
78
65
  }
79
66
  });
@@ -84,11 +71,12 @@ var Superpro = /** @class */ (function () {
84
71
  */
85
72
  Superpro.getParam = function (name) {
86
73
  return __awaiter(this, void 0, void 0, function () {
74
+ var contract;
87
75
  return __generator(this, function (_a) {
88
76
  switch (_a.label) {
89
77
  case 0:
90
- this.checkInit();
91
- return [4 /*yield*/, this.contract.methods.getConfigParam(name).call()];
78
+ contract = BlockchainConnector_1.default.getContractInstance();
79
+ return [4 /*yield*/, contract.methods.getConfigParam(name).call()];
92
80
  case 1: return [2 /*return*/, _a.sent()];
93
81
  }
94
82
  });
@@ -1,9 +1,11 @@
1
1
  import { Transaction } from "web3-core";
2
2
  import { TransactionOptions, BlockInfo } from "../types/Web3";
3
3
  declare class SuperproToken {
4
- static address: string;
4
+ private static _address;
5
5
  private static contract;
6
- private static logger;
6
+ private static readonly logger;
7
+ static get address(): string;
8
+ static set address(newAddress: string);
7
9
  /**
8
10
  * Checks if contract has been initialized, if not - initialize contract
9
11
  */
@@ -47,22 +47,26 @@ var TxManager_1 = __importDefault(require("../utils/TxManager"));
47
47
  var SuperproToken = /** @class */ (function () {
48
48
  function SuperproToken() {
49
49
  }
50
+ Object.defineProperty(SuperproToken, "address", {
51
+ get: function () {
52
+ return SuperproToken._address;
53
+ },
54
+ set: function (newAddress) {
55
+ SuperproToken._address = newAddress;
56
+ SuperproToken.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, SuperproToken.address);
57
+ },
58
+ enumerable: false,
59
+ configurable: true
60
+ });
50
61
  /**
51
62
  * Checks if contract has been initialized, if not - initialize contract
52
63
  */
53
64
  SuperproToken.checkInit = function (transactionOptions) {
65
+ (0, utils_1.checkIfInitialized)();
54
66
  if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
55
- (0, utils_1.checkIfInitialized)();
56
- return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, this.address);
67
+ return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, SuperproToken.address);
57
68
  }
58
- if (this.contract)
59
- return this.contract;
60
- (0, utils_1.checkIfInitialized)();
61
- this.logger = logger_1.default.child({
62
- className: "SuperproToken",
63
- address: this.address,
64
- });
65
- return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, this.address));
69
+ return SuperproToken.contract;
66
70
  };
67
71
  /**
68
72
  * Fetching balance of SuperProtocol tokens on address
@@ -194,6 +198,7 @@ var SuperproToken = /** @class */ (function () {
194
198
  });
195
199
  return function () { return subscription.unsubscribe(); };
196
200
  };
201
+ SuperproToken.logger = logger_1.default.child({ className: "SuperproToken" });
197
202
  return SuperproToken;
198
203
  }());
199
204
  exports.default = SuperproToken;
@@ -3,14 +3,9 @@ import { TeeOfferInfo } from "../types/TeeOffer";
3
3
  import { OfferType } from "../types/Offer";
4
4
  import { OfferCreatedEvent } from "../types/Events";
5
5
  declare class TeeOffersFactory {
6
- private static contract;
7
- private static logger;
6
+ private static readonly logger;
8
7
  static teeOffers?: string[];
9
8
  static get address(): string;
10
- /**
11
- * Checks if contract has been initialized, if not - initialize contract
12
- */
13
- private static checkInit;
14
9
  /**
15
10
  * Function for fetching list of all TEE offers addresses
16
11
  */
@@ -39,13 +39,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
39
39
  return (mod && mod.__esModule) ? mod : { "default": mod };
40
40
  };
41
41
  Object.defineProperty(exports, "__esModule", { value: true });
42
- var store_1 = __importDefault(require("../store"));
43
42
  var logger_1 = __importDefault(require("../logger"));
44
- var app_json_1 = __importDefault(require("../contracts/app.json"));
45
43
  var utils_1 = require("../utils");
46
44
  var utils_2 = require("ethers/lib/utils");
47
45
  var TeeOffer_1 = require("../types/TeeOffer");
48
46
  var Offer_1 = require("../types/Offer");
47
+ var BlockchainConnector_1 = __importDefault(require("../BlockchainConnector"));
49
48
  var Superpro_1 = __importDefault(require("./Superpro"));
50
49
  var TxManager_1 = __importDefault(require("../utils/TxManager"));
51
50
  var TeeOffersFactory = /** @class */ (function () {
@@ -58,31 +57,17 @@ var TeeOffersFactory = /** @class */ (function () {
58
57
  enumerable: false,
59
58
  configurable: true
60
59
  });
61
- /**
62
- * Checks if contract has been initialized, if not - initialize contract
63
- */
64
- TeeOffersFactory.checkInit = function (transactionOptions) {
65
- if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
66
- (0, utils_1.checkIfInitialized)();
67
- return new transactionOptions.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address);
68
- }
69
- if (this.contract)
70
- return this.contract;
71
- (0, utils_1.checkIfInitialized)();
72
- this.logger = logger_1.default.child({ className: "TeeOffersFactory" });
73
- return (this.contract = new store_1.default.web3.eth.Contract(app_json_1.default.abi, Superpro_1.default.address));
74
- };
75
60
  /**
76
61
  * Function for fetching list of all TEE offers addresses
77
62
  */
78
63
  TeeOffersFactory.getAllTeeOffers = function () {
79
64
  return __awaiter(this, void 0, void 0, function () {
80
- var count, teeOfffersSet, offerId, offerType;
65
+ var contract, count, teeOfffersSet, offerId, offerType;
81
66
  return __generator(this, function (_a) {
82
67
  switch (_a.label) {
83
68
  case 0:
84
- this.checkInit();
85
- return [4 /*yield*/, this.contract.methods.getOffersTotalCount().call()];
69
+ contract = BlockchainConnector_1.default.getContractInstance();
70
+ return [4 /*yield*/, contract.methods.getOffersTotalCount().call()];
86
71
  case 1:
87
72
  count = _a.sent();
88
73
  this.teeOffers = this.teeOffers || [];
@@ -91,7 +76,7 @@ var TeeOffersFactory = /** @class */ (function () {
91
76
  _a.label = 2;
92
77
  case 2:
93
78
  if (!(offerId <= count)) return [3 /*break*/, 5];
94
- return [4 /*yield*/, this.contract.methods.getOfferType(offerId).call()];
79
+ return [4 /*yield*/, contract.methods.getOfferType(offerId).call()];
95
80
  case 3:
96
81
  offerType = (_a.sent());
97
82
  if (offerType === Offer_1.OfferType.TeeOffer) {
@@ -121,7 +106,7 @@ var TeeOffersFactory = /** @class */ (function () {
121
106
  return __generator(this, function (_a) {
122
107
  switch (_a.label) {
123
108
  case 0:
124
- contract = this.checkInit(transactionOptions);
109
+ contract = BlockchainConnector_1.default.getContractInstance(transactionOptions);
125
110
  (0, utils_1.checkIfActionAccountInitialized)(transactionOptions);
126
111
  teeOfferInfoParams = (0, utils_1.objectToTuple)(teeOfferInfo, TeeOffer_1.TeeOfferInfoStructure);
127
112
  formattedExternalId = (0, utils_2.formatBytes32String)(externalId);
@@ -139,7 +124,7 @@ var TeeOffersFactory = /** @class */ (function () {
139
124
  return __generator(this, function (_a) {
140
125
  switch (_a.label) {
141
126
  case 0:
142
- contract = this.checkInit();
127
+ contract = BlockchainConnector_1.default.getContractInstance();
143
128
  filter = {
144
129
  creator: creator,
145
130
  externalId: (0, utils_2.formatBytes32String)(externalId),
@@ -164,7 +149,7 @@ var TeeOffersFactory = /** @class */ (function () {
164
149
  * @return TEE offer id
165
150
  */
166
151
  TeeOffersFactory.getByDeviceId = function (deviceId) {
167
- var contract = this.checkInit();
152
+ var contract = BlockchainConnector_1.default.getContractInstance();
168
153
  return contract.methods.getTeeOfferByDeviceId(deviceId).call();
169
154
  };
170
155
  /**
@@ -174,9 +159,9 @@ var TeeOffersFactory = /** @class */ (function () {
174
159
  */
175
160
  TeeOffersFactory.onTeeOfferCreated = function (callback) {
176
161
  var _this = this;
177
- this.checkInit();
162
+ var contract = BlockchainConnector_1.default.getContractInstance();
178
163
  var logger = this.logger.child({ method: "onTeeOfferCreated" });
179
- var subscription = this.contract.events
164
+ var subscription = contract.events
180
165
  .OfferCreated()
181
166
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
182
167
  return __generator(this, function (_a) {
@@ -196,9 +181,9 @@ var TeeOffersFactory = /** @class */ (function () {
196
181
  };
197
182
  TeeOffersFactory.onTeeOfferViolationRateChanged = function (callback) {
198
183
  var _this = this;
199
- this.checkInit();
184
+ var contract = BlockchainConnector_1.default.getContractInstance();
200
185
  var logger = this.logger.child({ method: "onTeeOfferViolationRateChanged" });
201
- var subscription = this.contract.events
186
+ var subscription = contract.events
202
187
  .TeeOfferViolationRateChanged()
203
188
  .on("data", function (event) { return __awaiter(_this, void 0, void 0, function () {
204
189
  return __generator(this, function (_a) {
@@ -216,6 +201,7 @@ var TeeOffersFactory = /** @class */ (function () {
216
201
  });
217
202
  return function () { return subscription.unsubscribe(); };
218
203
  };
204
+ TeeOffersFactory.logger = logger_1.default.child({ className: "TeeOffersFactory" });
219
205
  return TeeOffersFactory;
220
206
  }());
221
207
  exports.default = TeeOffersFactory;
@@ -1,13 +1,7 @@
1
1
  import { ContractName, ParamName } from "../types/Superpro";
2
2
  import { TransactionOptions } from "../types/Web3";
3
3
  declare class Voting {
4
- private static contract;
5
- private static logger;
6
4
  static ballots?: string[];
7
- /**
8
- * Checks if contract has been initialized, if not - initialize contract
9
- */
10
- private static checkInit;
11
5
  /**
12
6
  * Creates ballot for replacing contract (updating address of contract in main config contract)
13
7
  * @param contractName - name of contract to replace
@@ -35,30 +35,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
35
35
  if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
36
36
  }
37
37
  };
38
- var __importDefault = (this && this.__importDefault) || function (mod) {
39
- return (mod && mod.__esModule) ? mod : { "default": mod };
40
- };
41
38
  Object.defineProperty(exports, "__esModule", { value: true });
42
- var logger_1 = __importDefault(require("../logger"));
43
- // import appJSON from "../contracts/app.json";
44
- var utils_1 = require("../utils");
45
39
  var Voting = /** @class */ (function () {
46
40
  function Voting() {
47
41
  }
48
- /**
49
- * Checks if contract has been initialized, if not - initialize contract
50
- */
51
- Voting.checkInit = function (transactionOptions) {
52
- if (transactionOptions === null || transactionOptions === void 0 ? void 0 : transactionOptions.web3) {
53
- (0, utils_1.checkIfInitialized)();
54
- // return new transactionOptions.web3.eth.Contract(<AbiItem[]>appJSON.abi, this.address);
55
- }
56
- if (this.contract)
57
- return this.contract;
58
- (0, utils_1.checkIfInitialized)();
59
- this.logger = logger_1.default.child({ className: "Voting" });
60
- // return this.contract = new store.web3!.eth.Contract(<AbiItem[]>appJSON.abi, this.address);
61
- };
62
42
  /**
63
43
  * Creates ballot for replacing contract (updating address of contract in main config contract)
64
44
  * @param contractName - name of contract to replace
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@super-protocol/sdk-js",
3
- "version": "0.8.1-beta.4",
3
+ "version": "0.9.0-beta.2",
4
4
  "main": "build/index.js",
5
5
  "license": "MIT",
6
6
  "files": [