From 22392e11d628d43d7af8f7a149eecef08a63db73 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 15 Mar 2018 16:02:21 +0530 Subject: [PATCH 001/115] Added multi cache management --- app/models/user_airdrop_detail.js | 10 +- lib/airdrop_management/batch_allocator.js | 2 +- lib/airdrop_management/user_balance.js | 2 +- lib/cache_multi_management/base.js | 189 ++++++++++++++++++ .../user_airdrop_detail.js | 2 +- lib/transaction_helper.js | 2 +- 6 files changed, 198 insertions(+), 9 deletions(-) create mode 100644 lib/cache_multi_management/base.js rename lib/{cache_management => cache_multi_management}/user_airdrop_detail.js (97%) diff --git a/app/models/user_airdrop_detail.js b/app/models/user_airdrop_detail.js index b01f59f..bdda74b 100644 --- a/app/models/user_airdrop_detail.js +++ b/app/models/user_airdrop_detail.js @@ -39,8 +39,8 @@ const UserAirdropDetailKlassPrototype = { */ getByUserAddresses: async function (airdropId, userAddresses) { var oThis = this; - logger.info("========user_airdrop_detail.getByUserAddresses().userAddresses========="); - logger.info(userAddresses); + logger.debug("========user_airdrop_detail.getByUserAddresses().userAddresses========="); + logger.debug(userAddresses); return new Promise(async function (onResolve, onReject) { var result = {} , userAirdropDetail = {} @@ -58,7 +58,7 @@ const UserAirdropDetailKlassPrototype = { for (var i in userAddresses) { userAddressesMap[userAddresses[i].toLowerCase()] = userAddresses[i]; } - logger.info("userAddressesMap ", userAddressesMap); + logger.debug("userAddressesMap ", userAddressesMap); for (var uadIndex in userAirdropDetailResultArray) { userAirdropDetail = userAirdropDetailResultArray[uadIndex]; @@ -73,8 +73,8 @@ const UserAirdropDetailKlassPrototype = { balanceAirdropAmount: balanceAirdropAmount.toString(10) }; } - logger.info("========user_airdrop_detail.getByUserAddresses().result========="); - logger.info(result); + logger.debug("========user_airdrop_detail.getByUserAddresses().result========="); + logger.debug(result); return onResolve(responseHelper.successWithData(result)); } catch (error) { return onResolve(responseHelper.error('a_m_uad_1', 'error:' + error)); diff --git a/lib/airdrop_management/batch_allocator.js b/lib/airdrop_management/batch_allocator.js index 55c376a..1862470 100644 --- a/lib/airdrop_management/batch_allocator.js +++ b/lib/airdrop_management/batch_allocator.js @@ -15,7 +15,7 @@ const rootPrefix = '../..' , BigNumber = require('bignumber.js') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') - , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_management/user_airdrop_detail') + , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') ; /** diff --git a/lib/airdrop_management/user_balance.js b/lib/airdrop_management/user_balance.js index 132e33d..1836de2 100644 --- a/lib/airdrop_management/user_balance.js +++ b/lib/airdrop_management/user_balance.js @@ -11,7 +11,7 @@ const rootPrefix = '../..' , airdropKlass = require(rootPrefix + '/app/models/airdrop') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') - , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_management/user_airdrop_detail') + , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') ; /** diff --git a/lib/cache_multi_management/base.js b/lib/cache_multi_management/base.js new file mode 100644 index 0000000..ba63e25 --- /dev/null +++ b/lib/cache_multi_management/base.js @@ -0,0 +1,189 @@ +"use strict"; + +const rootPrefix = '../..' + , coreConstants = require(rootPrefix + '/config/core_constants') + , openStCache = require('@openstfoundation/openst-cache') + , cacheImplementer = new openStCache.cache(coreConstants.CACHING_ENGINE, true) + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , logger = require(rootPrefix+'/helpers/custom_console_logger') + , utils = require(rootPrefix + '/lib/utils') +; + +/** + * constructor + * + * @param {Object} params - cache key generation & expiry related params + * + * @constructor + */ +const baseCacheMultiManagementKlass = function(params) { + + const oThis = this; + + if (!params) { + params = {}; + } + + oThis.params = params; + + oThis.cacheKeys = {}; + + // call sub class method to set cache keys using params provided + oThis.setCacheKeys(); + +}; + +baseCacheMultiManagementKlass.prototype = { + + /** + * Fetch data from cache, in case of cache miss calls sub class method to fetch data from source + * + * @return {Promise} - On success, data.value has value. On failure, error details returned. + */ + fetch: async function () { + + const oThis = this; + + var data = await oThis._fetchFromCache() + , fetchDataRsp = null; + + // if there are any cache misses then fetch that data from source. + if (data['cacheMiss'].length > 0) { + + fetchDataRsp = await oThis.fetchDataFromSource(data['cacheMiss']); + + // if fetch from source failed do not set cache and return error response + if (fetchDataRsp.isFailure()) { + logger.notify('l_cm_b_1', 'Something Went Wrong', fetchDataRsp); + return Promise.resolve(fetchDataRsp); + } else { + // DO NOT WAIT for cache being set + var cacheKeys = Object.keys(fetchDataRsp.data); + for (var i=0; i} + */ + clear: function () { + + const oThis = this; + + for (var i=0; iError while getting from cache: ", JSON.stringify(cacheFetchResponse)); + for (var i = 0; i < cacheKeys.length; i++) { + var cacheKey = cacheKeys[i]; + cacheMiss.push(oThis.cacheKeys[cacheKey]); + } + } + + return {cacheMiss: cacheMiss, cachedData: cachedResponse}; + }, + + /** + * set data in cache. + * + * @param {Object} dataToSet - data to set in cache + * + * @return {Result} + */ + _setCache: function (key, dataToSet) { + + const oThis = this; + + var setCacheFunction = function(k, v) { + var cacheKey = utils.invert(oThis.cacheKeys)[k]; + return cacheImplementer.set(cacheKey, JSON.stringify(v), oThis.cacheExpiry); + }; + + setCacheFunction(key, dataToSet).then(function(cacheSetResponse) { + + if (cacheSetResponse.isFailure()) { + logger.error('cmm_b_2', 'Something Went Wrong', cacheSetResponse); + } + }); + + } + +}; + +module.exports = baseCacheMultiManagementKlass; diff --git a/lib/cache_management/user_airdrop_detail.js b/lib/cache_multi_management/user_airdrop_detail.js similarity index 97% rename from lib/cache_management/user_airdrop_detail.js rename to lib/cache_multi_management/user_airdrop_detail.js index b64fcb8..1041a75 100644 --- a/lib/cache_management/user_airdrop_detail.js +++ b/lib/cache_multi_management/user_airdrop_detail.js @@ -1,7 +1,7 @@ "use strict"; const rootPrefix = '../..' - , baseCache = require(rootPrefix + '/lib/cache_management/base') + , baseCache = require(rootPrefix + '/lib/cache_multi_management/base') , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') , responseHelper = require(rootPrefix + '/lib/formatter/response') , logger = require(rootPrefix + '/helpers/custom_console_logger') diff --git a/lib/transaction_helper.js b/lib/transaction_helper.js index c4e66b0..e918636 100644 --- a/lib/transaction_helper.js +++ b/lib/transaction_helper.js @@ -13,7 +13,7 @@ const BigNumber = require('bignumber.js') const rootPrefix = '..' , responseHelper = require(rootPrefix + '/lib/formatter/response') , Token = require(rootPrefix + '/lib/contract_interact/branded_token') - , UserAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_management/user_airdrop_detail') + , UserAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') , AdjustAirdropAmountKlass = require(rootPrefix + '/lib/airdrop_management/adjust_airdrop_amount') , web3EventsDecoder = require(rootPrefix + '/lib/web3/events/decoder') , logger = require(rootPrefix + '/helpers/custom_console_logger') From 80fd60943f0b71cd6ef0fc40ffd81702ad624373 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 15 Mar 2018 17:47:05 +0530 Subject: [PATCH 002/115] Cache airdrops table --- app/models/airdrop.js | 14 ++ .../adjust_airdrop_amount.js | 16 +- lib/airdrop_management/approve.js | 9 +- lib/airdrop_management/batch_allocator.js | 10 +- lib/airdrop_management/register.js | 10 +- lib/airdrop_management/transfer.js | 10 +- lib/airdrop_management/user_balance.js | 9 +- lib/cache_management/airdrop_model.js | 91 +++++++++++ lib/cache_management/base.js | 141 ++++++++++-------- lib/transaction_helper.js | 8 +- mocha_test/services/airdrop/pay_1.js | 9 +- 11 files changed, 227 insertions(+), 100 deletions(-) create mode 100644 lib/cache_management/airdrop_model.js diff --git a/app/models/airdrop.js b/app/models/airdrop.js index 528ff33..e645186 100644 --- a/app/models/airdrop.js +++ b/app/models/airdrop.js @@ -47,6 +47,19 @@ const AirdropKlassPrototype = { */ tableName: 'airdrops', + /** + * Select all airdrop contracts + * + * @return {Promise} + * + */ + getAll: function() { + const oThis = this + ; + + return oThis.select().fire(); + }, + /** * get airdrop AR by contract Address * @@ -62,6 +75,7 @@ const AirdropKlassPrototype = { return oThis.select().where(["contract_address=?", airdropContractAddress]). limit(1).fire(); } + }; Object.assign(AirdropKlass.prototype, AirdropKlassPrototype); diff --git a/lib/airdrop_management/adjust_airdrop_amount.js b/lib/airdrop_management/adjust_airdrop_amount.js index 60abf33..8f95efa 100644 --- a/lib/airdrop_management/adjust_airdrop_amount.js +++ b/lib/airdrop_management/adjust_airdrop_amount.js @@ -8,7 +8,7 @@ const rootPrefix = '../..' , responseHelper = require(rootPrefix + '/lib/formatter/response') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') , logger = require(rootPrefix + '/helpers/custom_console_logger') , userAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') , BigNumber = require('bignumber.js') @@ -48,9 +48,10 @@ AdjustAirdropAmountKlass.prototype = { return new Promise(async function (onResolve, onReject) { var amountAdjustedLog = {}; try { - const airdropModel = new airdropKlass(); - const airdropModelResult = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - const airdropRecord = airdropModelResult[0]; + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress] + ; var totalRemainingAmountToAdjust = new BigNumber(oThis.airdropAmountUsed); // Zero airdrop amount is possible if (totalRemainingAmountToAdjust.equals(0)) { @@ -138,9 +139,10 @@ AdjustAirdropAmountKlass.prototype = { return new Promise(async function (onResolve, onReject) { var amountAdjustedLog = {}; try { - const airdropModel = new airdropKlass(); - const airdropModelResult = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - const airdropRecord = airdropModelResult[0]; + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress] + ; var totalRemainingAmountToAdjust = new BigNumber(oThis.airdropAmountUsed); // Zero airdrop amount is possible if (totalRemainingAmountToAdjust.equals(0)) { diff --git a/lib/airdrop_management/approve.js b/lib/airdrop_management/approve.js index 8480d79..8960f2c 100644 --- a/lib/airdrop_management/approve.js +++ b/lib/airdrop_management/approve.js @@ -13,7 +13,7 @@ const rootPrefix = '../..' , BigNumber = require('bignumber.js') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -87,9 +87,10 @@ approve.prototype = { } // Check if airdropContractAddress is registered or not - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - oThis.airdropRecord = result[0]; + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + ; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_2', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/batch_allocator.js b/lib/airdrop_management/batch_allocator.js index 1862470..ac7e073 100644 --- a/lib/airdrop_management/batch_allocator.js +++ b/lib/airdrop_management/batch_allocator.js @@ -8,7 +8,6 @@ const rootPrefix = '../..' , responseHelper = require(rootPrefix + '/lib/formatter/response') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') , userAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') , airdropConstants = require(rootPrefix + '/lib/global_constant/airdrop') @@ -16,6 +15,7 @@ const rootPrefix = '../..' , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -92,9 +92,11 @@ batchAllocator.prototype = { return onResolve(responseHelper.error('l_am_ba_vp_2', 'transaction hash is invalid')); } - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - oThis.airdropRecord = result[0]; + // Check if airdropContractAddress is registered or not + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + ; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord) { return onResolve(responseHelper.error('l_am_ba_vp_3', 'given airdrop record is not present in DB')); } diff --git a/lib/airdrop_management/register.js b/lib/airdrop_management/register.js index fd1ac3b..c35e30f 100644 --- a/lib/airdrop_management/register.js +++ b/lib/airdrop_management/register.js @@ -12,6 +12,7 @@ const rootPrefix = '../..' , airdropContractInteract = require(rootPrefix + '/lib/contract_interact/airdrop') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -85,10 +86,11 @@ register.prototype = { return onResolve(responseHelper.error('l_am_r_validateParams_3', 'airdrop contract is invalid')); } - // if address already present - var airdropModel = new airdropKlass(); - result = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - const airdropRecord = result[0]; + // Check if airdropContractAddress is registered or not + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + ; if (airdropRecord) { return onResolve(responseHelper.error('l_am_r_validateParams_4', 'airdrop contract address is already registered')); } diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index 6987d27..a2195d3 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -14,7 +14,7 @@ const rootPrefix = '../..' , BigNumber = require('bignumber.js') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -95,9 +95,11 @@ transfer.prototype = { } // Check if airdropContractAddress is registered or not - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - oThis.airdropRecord = result[0]; + + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + ; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/user_balance.js b/lib/airdrop_management/user_balance.js index 1836de2..9346e7f 100644 --- a/lib/airdrop_management/user_balance.js +++ b/lib/airdrop_management/user_balance.js @@ -8,10 +8,10 @@ const rootPrefix = '../..' , responseHelper = require(rootPrefix + '/lib/formatter/response') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') , userAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -83,9 +83,10 @@ AirdropUserBalanceKlass.prototype = { } // if address already present - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(oThis.airdropContractAddress); - oThis.airdropRecord = result[0]; + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + ; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/cache_management/airdrop_model.js b/lib/cache_management/airdrop_model.js new file mode 100644 index 0000000..9ba0719 --- /dev/null +++ b/lib/cache_management/airdrop_model.js @@ -0,0 +1,91 @@ +"use strict"; + +const rootPrefix = '../..' + , baseCache = require(rootPrefix + '/lib/cache_management/base') + , AirdropModelKlass = require(rootPrefix + '/app/models/airdrop') + , responseHelper = require(rootPrefix + '/lib/formatter/response') +; + +/** + * constructor + * + * @param {object} cache get/set related arguments + * @constructor + * + */ +const AirdropModelCacheKlass = function(params) { + + const oThis = this; + + baseCache.call(oThis, params); + + oThis.useObject = true; + +}; + +AirdropModelCacheKlass.prototype = Object.create(baseCache.prototype); + +const AirdropModelCacheKlassPrototype = { + + /** + * set cache key + * + * @return {String} + */ + setCacheKey: function() { + + const oThis = this; + + oThis.cacheKey = oThis._cacheKeyPrefix() + "all_airdrop"; + + return oThis.cacheKey; + + }, + + /** + * set cache expiry in oThis.cacheExpiry and return it + * + * @return {Number} + */ + setCacheExpiry: function() { + + const oThis = this; + + oThis.cacheExpiry = 86400; // 24 hours ; + + return oThis.cacheExpiry; + + }, + + /** + * Fetch data from source + * + * @return {Result} + */ + fetchDataFromSource: function() { + + const oThis = this; + + return new Promise(async function(onResolve, onReject){ + + const airdropModelObject = new AirdropModelKlass() + , allAirdropResponse = await airdropModelObject.getAll() + ; + + var formattedAirdropDetails = {}; + for (var index in allAirdropResponse) { + const airdropRecord = allAirdropResponse[index]; + formattedAirdropDetails[airdropRecord.contract_address] = {id: airdropRecord.id}; + } + + return onResolve(responseHelper.successWithData(formattedAirdropDetails)); + + }); + + } + +}; + +Object.assign(AirdropModelCacheKlass.prototype, AirdropModelCacheKlassPrototype); + +module.exports = AirdropModelCacheKlass; \ No newline at end of file diff --git a/lib/cache_management/base.js b/lib/cache_management/base.js index 7b0e7d8..52d8214 100644 --- a/lib/cache_management/base.js +++ b/lib/cache_management/base.js @@ -1,13 +1,10 @@ "use strict"; const rootPrefix = '../..' - , coreConstants = require(rootPrefix + '/config/core_constants') - , openStCache = require('@openstfoundation/openst-cache') - , openStCacheKeys = openStCache.OpenSTCacheKeys - , cacheImplementer = new openStCache.cache(coreConstants.CACHING_ENGINE, true) - , responseHelper = require(rootPrefix + '/lib/formatter/response') - , logger = require(rootPrefix+'/helpers/custom_console_logger') - , utils = require(rootPrefix + '/lib/utils') + , openStCache = require('@openstfoundation/openst-cache') + , coreConstants = require(rootPrefix + '/config/core_constants') + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , logger = require(rootPrefix+'/helpers/custom_console_logger') ; /** @@ -17,24 +14,33 @@ const rootPrefix = '../..' * * @constructor */ -const baseCacheMultiManagementKlass = function(params) { +const baseCacheManagementKlass = function(params) { const oThis = this; - if (!params) { + if(!params){ params = {}; } oThis.params = params; - oThis.cacheKeys = {}; + oThis.useObject = params['useObject'] === true; - // call sub class method to set cache keys using params provided - oThis.setCacheKeys(); + oThis.cacheKey = null; + + oThis.cacheExpiry = null; + + // Set cacheImplementer to perform caching operations + oThis.cacheImplementer = new openStCache.cache(coreConstants.CACHING_ENGINE, true); + // call sub class method to set cache key using params provided + oThis.setCacheKey(); + + // call sub class method to set cache expiry using params provided + oThis.setCacheExpiry(); }; -baseCacheMultiManagementKlass.prototype = { +baseCacheManagementKlass.prototype = { /** * Fetch data from cache, in case of cache miss calls sub class method to fetch data from source @@ -46,31 +52,26 @@ baseCacheMultiManagementKlass.prototype = { const oThis = this; var data = await oThis._fetchFromCache() - , fetchDataRsp = null; + , fetchDataRsp = null; - // if there are any cache misses then fetch that data from source. - if (data['cacheMiss'].length > 0) { + // if cache miss call sub class method to fetch data from source and set cache + if (!data) { - fetchDataRsp = await oThis.fetchDataFromSource(data['cacheMiss']); + fetchDataRsp = await oThis.fetchDataFromSource(); // if fetch from source failed do not set cache and return error response if (fetchDataRsp.isFailure()) { - logger.notify('l_cm_b_1', 'Something Went Wrong', fetchDataRsp); - return Promise.resolve(fetchDataRsp); + logger.error('cm_b_1', 'Something Went Wrong', fetchDataRsp); + return fetchDataRsp; } else { - // DO NOT WAIT for cache being set - var cacheKeys = Object.keys(fetchDataRsp.data); - for (var i=0; iError while getting from cache: ", JSON.stringify(cacheFetchResponse)); - for (var i = 0; i < cacheKeys.length; i++) { - var cacheKey = cacheKeys[i]; - cacheMiss.push(oThis.cacheKeys[cacheKey]); - } + cacheFetchResponse = await oThis.cacheImplementer.get(oThis.cacheKey); + } + + if (cacheFetchResponse.isSuccess()) { + cacheData = cacheFetchResponse.data.response; } - return {cacheMiss: cacheMiss, cachedData: cachedResponse}; + return cacheData; + }, /** * set data in cache. * - * @param {Object} dataToSet - data to set in cache + * @param {Object} dataToSet - data to se tin cache * * @return {Result} */ - _setCache: function (key, dataToSet) { + _setCache: function (dataToSet) { const oThis = this; - var setCacheFunction = function(k, v) { - var cacheKey = utils.invert(oThis.cacheKeys)[k]; - return cacheImplementer.set(cacheKey, JSON.stringify(v), oThis.cacheExpiry); + var setCacheFunction = function() { + if(oThis.useObject) { + return oThis.cacheImplementer.setObject(oThis.cacheKey, dataToSet, oThis.cacheExpiry); + } else { + return oThis.cacheImplementer.set(oThis.cacheKey, dataToSet, oThis.cacheExpiry); + } + }; - setCacheFunction(key, dataToSet).then(function(cacheSetResponse) { + setCacheFunction().then(function(cacheSetResponse){ if (cacheSetResponse.isFailure()) { - logger.notify('cmm_b_2', 'Something Went Wrong', cacheSetResponse); + logger.notify('cm_b_2', 'Something Went Wrong', cacheSetResponse); } }); + }, + + /** + * cache key prefix + * + * @return {String} + */ + _cacheKeyPrefix: function () { + return 'ost_payment_'; + }, + + /** + * Shared cache key prefix + * This cache is shared between company api and saas + * Cache keys with these prefixes can be flushed via company api or saas. + * + * @return {String} + */ + _sharedCacheKeyPrefix: function () { + return 'ost_payment__shared_'; } -}; +} -module.exports = baseCacheMultiManagementKlass; +module.exports = baseCacheManagementKlass; diff --git a/lib/transaction_helper.js b/lib/transaction_helper.js index e918636..cc5dc5c 100644 --- a/lib/transaction_helper.js +++ b/lib/transaction_helper.js @@ -18,8 +18,8 @@ const rootPrefix = '..' , web3EventsDecoder = require(rootPrefix + '/lib/web3/events/decoder') , logger = require(rootPrefix + '/helpers/custom_console_logger') , eventGlobalConstants = require(rootPrefix+'/lib/global_constant/events') - , airdropKlass = require(rootPrefix + '/app/models/airdrop') , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') ; /** @@ -201,9 +201,9 @@ TransactionHelper.prototype = { */ clearUserDetailCache: async function(airdropContractAddress, owner) { const oThis = this - , airdropModel = new airdropKlass() - , airdropModelResult = await airdropModel.getByContractAddress(airdropContractAddress) - , airdropRecord = airdropModelResult[0] + , airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[airdropContractAddress] ; const userAirdropDetailCache = new UserAirdropDetailCacheKlass({ diff --git a/mocha_test/services/airdrop/pay_1.js b/mocha_test/services/airdrop/pay_1.js index c487eec..7ec0542 100644 --- a/mocha_test/services/airdrop/pay_1.js +++ b/mocha_test/services/airdrop/pay_1.js @@ -22,7 +22,7 @@ const workersContract = new workers(constants.workersContractAddress, constants. ; -const airdropKlass = require(rootPrefix + '/app/models/airdrop') +const AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') , airdropManager = require(rootPrefix + '/lib/airdrop_management/base') , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') @@ -149,9 +149,10 @@ async function setBalance(token, address, amount) { */ async function getAirdropIdFromAirdropAddress(airdropAddress) { - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(airdropAddress); - const airdropRecord = result[0]; + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[airdropAddress] + ; if (airdropRecord) { return responseHelper.successWithData({airdropId: airdropRecord.id}); } From cd36f6a240aceed922d6fe3f92afece22d2f2f8b Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 15 Mar 2018 17:50:02 +0530 Subject: [PATCH 003/115] clear airdrop model cache during registration --- lib/airdrop_management/register.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/airdrop_management/register.js b/lib/airdrop_management/register.js index c35e30f..02b4be6 100644 --- a/lib/airdrop_management/register.js +++ b/lib/airdrop_management/register.js @@ -120,6 +120,8 @@ register.prototype = { const insertedRecord = await airdropModel.create(airdropModelObject); logger.debug("========register.runRegister.insertedRecord======="); logger.debug(insertedRecord); + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}); + await airdropModelCacheObject.clear(); return onResolve(responseHelper.successWithData({insertId: insertedRecord.insertId})); } catch (err) { return onResolve(responseHelper.error('l_am_s_rs_1', 'Error creating airdrop record. ' + err)); From a2df0216374b79d98dd43889745f9ff2de04021a Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 15 Mar 2018 18:56:23 +0530 Subject: [PATCH 004/115] cache key per contract address --- lib/airdrop_management/adjust_airdrop_amount.js | 4 ++-- lib/airdrop_management/approve.js | 4 ++-- lib/airdrop_management/batch_allocator.js | 4 ++-- lib/airdrop_management/register.js | 6 +++--- lib/airdrop_management/transfer.js | 4 ++-- lib/airdrop_management/user_balance.js | 4 ++-- lib/cache_management/airdrop_model.js | 16 ++++++++++------ lib/transaction_helper.js | 4 ++-- mocha_test/services/airdrop/pay_1.js | 4 ++-- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/lib/airdrop_management/adjust_airdrop_amount.js b/lib/airdrop_management/adjust_airdrop_amount.js index 8f95efa..67af6b2 100644 --- a/lib/airdrop_management/adjust_airdrop_amount.js +++ b/lib/airdrop_management/adjust_airdrop_amount.js @@ -48,9 +48,9 @@ AdjustAirdropAmountKlass.prototype = { return new Promise(async function (onResolve, onReject) { var amountAdjustedLog = {}; try { - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress] + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()] ; var totalRemainingAmountToAdjust = new BigNumber(oThis.airdropAmountUsed); // Zero airdrop amount is possible diff --git a/lib/airdrop_management/approve.js b/lib/airdrop_management/approve.js index 8960f2c..051af08 100644 --- a/lib/airdrop_management/approve.js +++ b/lib/airdrop_management/approve.js @@ -87,10 +87,10 @@ approve.prototype = { } // Check if airdropContractAddress is registered or not - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_2', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/batch_allocator.js b/lib/airdrop_management/batch_allocator.js index ac7e073..eec57ed 100644 --- a/lib/airdrop_management/batch_allocator.js +++ b/lib/airdrop_management/batch_allocator.js @@ -93,10 +93,10 @@ batchAllocator.prototype = { } // Check if airdropContractAddress is registered or not - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; if (!oThis.airdropRecord) { return onResolve(responseHelper.error('l_am_ba_vp_3', 'given airdrop record is not present in DB')); } diff --git a/lib/airdrop_management/register.js b/lib/airdrop_management/register.js index 02b4be6..ef8d3bd 100644 --- a/lib/airdrop_management/register.js +++ b/lib/airdrop_management/register.js @@ -87,9 +87,9 @@ register.prototype = { } // Check if airdropContractAddress is registered or not - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; ; if (airdropRecord) { return onResolve(responseHelper.error('l_am_r_validateParams_4', 'airdrop contract address is already registered')); @@ -120,7 +120,7 @@ register.prototype = { const insertedRecord = await airdropModel.create(airdropModelObject); logger.debug("========register.runRegister.insertedRecord======="); logger.debug(insertedRecord); - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}); + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}); await airdropModelCacheObject.clear(); return onResolve(responseHelper.successWithData({insertId: insertedRecord.insertId})); } catch (err) { diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index a2195d3..4963026 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -96,10 +96,10 @@ transfer.prototype = { // Check if airdropContractAddress is registered or not - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/user_balance.js b/lib/airdrop_management/user_balance.js index 9346e7f..e2cf138 100644 --- a/lib/airdrop_management/user_balance.js +++ b/lib/airdrop_management/user_balance.js @@ -83,10 +83,10 @@ AirdropUserBalanceKlass.prototype = { } // if address already present - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/cache_management/airdrop_model.js b/lib/cache_management/airdrop_model.js index 9ba0719..f43d4a4 100644 --- a/lib/cache_management/airdrop_model.js +++ b/lib/cache_management/airdrop_model.js @@ -17,6 +17,7 @@ const AirdropModelCacheKlass = function(params) { const oThis = this; + oThis.contractAddress = params.contractAddress; baseCache.call(oThis, params); oThis.useObject = true; @@ -36,7 +37,7 @@ const AirdropModelCacheKlassPrototype = { const oThis = this; - oThis.cacheKey = oThis._cacheKeyPrefix() + "all_airdrop"; + oThis.cacheKey = oThis._cacheKeyPrefix() + "airdrop_"+oThis.contractAddress; return oThis.cacheKey; @@ -69,15 +70,18 @@ const AirdropModelCacheKlassPrototype = { return new Promise(async function(onResolve, onReject){ const airdropModelObject = new AirdropModelKlass() - , allAirdropResponse = await airdropModelObject.getAll() + , airdropResponse = await airdropModelObject.getByContractAddress(oThis.contractAddress) + , airdropRecord = airdropResponse[0] ; - var formattedAirdropDetails = {}; - for (var index in allAirdropResponse) { - const airdropRecord = allAirdropResponse[index]; - formattedAirdropDetails[airdropRecord.contract_address] = {id: airdropRecord.id}; + // return null if airdrop record not found + if (!airdropRecord){ + return onResolve(responseHelper.successWithData(null)); } + var formattedAirdropDetails = {}; + formattedAirdropDetails[airdropRecord.contract_address.toLowerCase()] = {id: airdropRecord.id}; + return onResolve(responseHelper.successWithData(formattedAirdropDetails)); }); diff --git a/lib/transaction_helper.js b/lib/transaction_helper.js index cc5dc5c..aca935e 100644 --- a/lib/transaction_helper.js +++ b/lib/transaction_helper.js @@ -201,9 +201,9 @@ TransactionHelper.prototype = { */ clearUserDetailCache: async function(airdropContractAddress, owner) { const oThis = this - , airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + , airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[airdropContractAddress] + , airdropRecord = airdropModelCacheResponse.data[airdropContractAddress.toLowerCase()] ; const userAirdropDetailCache = new UserAirdropDetailCacheKlass({ diff --git a/mocha_test/services/airdrop/pay_1.js b/mocha_test/services/airdrop/pay_1.js index 7ec0542..12309a9 100644 --- a/mocha_test/services/airdrop/pay_1.js +++ b/mocha_test/services/airdrop/pay_1.js @@ -149,9 +149,9 @@ async function setBalance(token, address, amount) { */ async function getAirdropIdFromAirdropAddress(airdropAddress) { - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: airdropAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[airdropAddress] + , airdropRecord = airdropModelCacheResponse.data[airdropAddress.toLowerCase()] ; if (airdropRecord) { return responseHelper.successWithData({airdropId: airdropRecord.id}); From 2a623e1addb4cbe5b1a26e27330e7f8a93fcc867 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 15 Mar 2018 19:41:56 +0530 Subject: [PATCH 005/115] Caching of airdrop table per airdrop contract address --- .../adjust_airdrop_amount.js | 4 +- lib/airdrop_management/approve.js | 2 +- lib/airdrop_management/batch_allocator.js | 2 +- lib/airdrop_management/register.js | 2 +- lib/airdrop_management/transfer.js | 2 +- lib/airdrop_management/user_balance.js | 2 +- lib/cache_management/airdrop_model.js | 4 +- lib/cache_management/base.js | 4 +- lib/transaction_helper.js | 2 +- mocha_test/services/airdrop/pay.js | 1198 +++++++++++++---- mocha_test/services/airdrop/pay_1.js | 1126 ---------------- 11 files changed, 951 insertions(+), 1397 deletions(-) delete mode 100644 mocha_test/services/airdrop/pay_1.js diff --git a/lib/airdrop_management/adjust_airdrop_amount.js b/lib/airdrop_management/adjust_airdrop_amount.js index 67af6b2..2f20a0f 100644 --- a/lib/airdrop_management/adjust_airdrop_amount.js +++ b/lib/airdrop_management/adjust_airdrop_amount.js @@ -50,7 +50,7 @@ AdjustAirdropAmountKlass.prototype = { try { const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()] + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress] ; var totalRemainingAmountToAdjust = new BigNumber(oThis.airdropAmountUsed); // Zero airdrop amount is possible @@ -139,7 +139,7 @@ AdjustAirdropAmountKlass.prototype = { return new Promise(async function (onResolve, onReject) { var amountAdjustedLog = {}; try { - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true}) + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress] ; diff --git a/lib/airdrop_management/approve.js b/lib/airdrop_management/approve.js index 051af08..e2de9c0 100644 --- a/lib/airdrop_management/approve.js +++ b/lib/airdrop_management/approve.js @@ -90,7 +90,7 @@ approve.prototype = { const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_2', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/batch_allocator.js b/lib/airdrop_management/batch_allocator.js index eec57ed..cda0165 100644 --- a/lib/airdrop_management/batch_allocator.js +++ b/lib/airdrop_management/batch_allocator.js @@ -96,7 +96,7 @@ batchAllocator.prototype = { const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord) { return onResolve(responseHelper.error('l_am_ba_vp_3', 'given airdrop record is not present in DB')); } diff --git a/lib/airdrop_management/register.js b/lib/airdrop_management/register.js index ef8d3bd..e2414f8 100644 --- a/lib/airdrop_management/register.js +++ b/lib/airdrop_management/register.js @@ -89,7 +89,7 @@ register.prototype = { // Check if airdropContractAddress is registered or not const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; + , airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; ; if (airdropRecord) { return onResolve(responseHelper.error('l_am_r_validateParams_4', 'airdrop contract address is already registered')); diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index 4963026..aea672e 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -99,7 +99,7 @@ transfer.prototype = { const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/airdrop_management/user_balance.js b/lib/airdrop_management/user_balance.js index e2cf138..0320a5a 100644 --- a/lib/airdrop_management/user_balance.js +++ b/lib/airdrop_management/user_balance.js @@ -86,7 +86,7 @@ AirdropUserBalanceKlass.prototype = { const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: oThis.airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() ; - oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress.toLowerCase()]; + oThis.airdropRecord = airdropModelCacheResponse.data[oThis.airdropContractAddress]; if (!oThis.airdropRecord){ return onResolve(responseHelper.error('l_am_ub_vp_3', 'Given airdrop contract is not registered')); } diff --git a/lib/cache_management/airdrop_model.js b/lib/cache_management/airdrop_model.js index f43d4a4..9a48a6f 100644 --- a/lib/cache_management/airdrop_model.js +++ b/lib/cache_management/airdrop_model.js @@ -37,7 +37,7 @@ const AirdropModelCacheKlassPrototype = { const oThis = this; - oThis.cacheKey = oThis._cacheKeyPrefix() + "airdrop_"+oThis.contractAddress; + oThis.cacheKey = oThis._cacheKeyPrefix() + "airdrop_"+oThis.contractAddress.toLowerCase(); return oThis.cacheKey; @@ -80,7 +80,7 @@ const AirdropModelCacheKlassPrototype = { } var formattedAirdropDetails = {}; - formattedAirdropDetails[airdropRecord.contract_address.toLowerCase()] = {id: airdropRecord.id}; + formattedAirdropDetails[airdropRecord.contract_address] = {id: airdropRecord.id}; return onResolve(responseHelper.successWithData(formattedAirdropDetails)); diff --git a/lib/cache_management/base.js b/lib/cache_management/base.js index 52d8214..e86b905 100644 --- a/lib/cache_management/base.js +++ b/lib/cache_management/base.js @@ -61,7 +61,7 @@ baseCacheManagementKlass.prototype = { // if fetch from source failed do not set cache and return error response if (fetchDataRsp.isFailure()) { - logger.error('cm_b_1', 'Something Went Wrong', fetchDataRsp); + logger.error('l_cm_b_fetch_1', 'Something Went Wrong', fetchDataRsp); return fetchDataRsp; } else { data = fetchDataRsp.data; @@ -170,7 +170,7 @@ baseCacheManagementKlass.prototype = { setCacheFunction().then(function(cacheSetResponse){ if (cacheSetResponse.isFailure()) { - logger.notify('cm_b_2', 'Something Went Wrong', cacheSetResponse); + logger.notify('l_cm_b_setCache_1', 'Something Went Wrong', cacheSetResponse); } }); diff --git a/lib/transaction_helper.js b/lib/transaction_helper.js index aca935e..b5d1e9e 100644 --- a/lib/transaction_helper.js +++ b/lib/transaction_helper.js @@ -203,7 +203,7 @@ TransactionHelper.prototype = { const oThis = this , airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: airdropContractAddress}) , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[airdropContractAddress.toLowerCase()] + , airdropRecord = airdropModelCacheResponse.data[airdropContractAddress] ; const userAirdropDetailCache = new UserAirdropDetailCacheKlass({ diff --git a/mocha_test/services/airdrop/pay.js b/mocha_test/services/airdrop/pay.js index 63163e4..82c8119 100644 --- a/mocha_test/services/airdrop/pay.js +++ b/mocha_test/services/airdrop/pay.js @@ -1,5 +1,5 @@ /* global describe, it */ -/* + const chai = require('chai') , assert = chai.assert; @@ -9,292 +9,900 @@ const rootPrefix = "../../.." , utils = require(rootPrefix+'/mocha_test/lib/utils') , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') , workers = require(rootPrefix + '/lib/contract_interact/workers') - , workersContract = new workers(constants.workersContractAddress, constants.chainId) - , airdropOstUsd = new airdrop(constants.airdropOstUsdAddress, constants.chainId) , mockToken = require(rootPrefix + '/lib/contract_interact/EIP20TokenMock') - , TC5 = new mockToken(constants.TC5Address) , BrandedTokenKlass = require(rootPrefix + '/lib/contract_interact/branded_token') - , brandedTokenObject = new BrandedTokenKlass(constants.TC5Address, constants.chainId) , web3RpcProvider = require(rootPrefix + '/lib/web3/providers/rpc') , logger = require(rootPrefix + '/helpers/custom_console_logger') ; +const workersContract = new workers(constants.workersContractAddress, constants.chainId) + , airdropOstUsd = new airdrop(constants.airdropOstUsdAddress, constants.chainId) + , TC5 = new mockToken(constants.TC5Address) + , brandedTokenObject = new BrandedTokenKlass(constants.TC5Address, constants.chainId) +; + -const airdropKlass = require(rootPrefix + '/app/models/airdrop') +const AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') , airdropManager = require(rootPrefix + '/lib/airdrop_management/base') - , BalanceCacheKlass = require(rootPrefix + '/lib/cache_management/balance') - , balanceCache = new BalanceCacheKlass(constants.chainId, constants.TC5Address) , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') + , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') + , responseHelper = require(rootPrefix + '/lib/formatter/response') ; var transferToAirdropBudgetHolderTransactionHash = '' ; -async function getAmountFromCache(address) { - console.log("========getAmountFromCache===== for address: "+address); - const response = await balanceCache.getBalance(address); - console.log(response); - return new BigNumber(response.data.response); -}; +/** + * Utitlity function to test set accepted margin + * + * @param {Object} airdropObject - airdrop object + * @param {string} currency - currency + * @param {string} margin - accepted margin + * + */ + +async function setAcceptedMargin(airdropObject, currency, margin) { + // set accepted margin + const amResponse = await airdropObject.setAcceptedMargin( + constants.ops, + constants.opsPassphrase, + currency, + margin, + constants.gasUsed, + constants.optionsReceipt); + assert.equal(amResponse.isSuccess(), true); + // verify if the transaction receipt is valid + utils.verifyTransactionReceipt(amResponse); + // verify if the transaction has was actually mined + await utils.verifyIfMined(airdropObject, amResponse.data.transaction_hash); + // verify if its set + const amResult = await airdropObject.acceptedMargins(currency); + assert.equal(amResult.isSuccess(), true); + assert.equal(margin, amResult.data.acceptedMargins); +} + + +/** + * Utitlity function to test set price oracle + * + * @param {Object} airdropObject - airdrop object + * @param {string} currency - currency + * @param {string} address - price oracle address + * + */ +async function setPriceOracle(airdropObject, currency, address) { + // Set Price Oracle + const spoResponse = await airdropObject.setPriceOracle( + constants.ops, + constants.opsPassphrase, + currency, + address, + constants.gasUsed, + constants.optionsReceipt); + assert.equal(spoResponse.isSuccess(), true); + // verify if the transaction receipt is valid + utils.verifyTransactionReceipt(spoResponse); + // verify if the transaction has was actually mined + await utils.verifyIfMined(airdropObject, spoResponse.data.transaction_hash); + // verify if its set + const poResult = await airdropObject.priceOracles(currency); + assert.equal(poResult.isSuccess(), true); + assert.equal(address, poResult.data.priceOracles); +} + + +/** + * Utitlity function to test set worker + * + * @param {string} workerAddress - worker address + * @param {Bignumber} deactivationHeight - deactivation height of the worker + * + */ +async function setWorker(workerAddress, deactivationHeight) { + const setWorkerResponse = await workersContract.setWorker( + constants.ops, + constants.opsPassphrase, + workerAddress, + deactivationHeight.toString(10), + constants.gasUsed, + constants.optionsReceipt); + + assert.equal(setWorkerResponse.isSuccess(), true); + // verify if the transaction receipt is valid + utils.verifyTransactionReceipt(setWorkerResponse); + + // confirm that worker is a set + const isWorkerResponse = await workersContract.isWorker(workerAddress); + assert.equal(isWorkerResponse.isSuccess(), true); + assert.equal(isWorkerResponse.data.isValid, true); +} + + +/** + * Utitlity function to test setBalance + * + * @param {Object} token - branded token object + * @param {string} address - account address + * @param {string} amount - amount that need to be set + * @param {BigNumber} gasPrice - gas price + * + */ +async function setBalance(token, address, amount) { + const amountInWei = airdropOstUsd.toWei(amount); + await token.setBalance( + constants.ops, + constants.opsPassphrase, + address, + amountInWei, + constants.gasUsed); + // check if the balance was set + const accountBalance = await token.balanceOf(address); + assert.equal(accountBalance, amountInWei); +} + +/** + * Utitlity function to get airdrop id from airdrop address + * + * @param {string} airdropAddress - airdrop address + * + * @return {Object} - formatted response + */ + +async function getAirdropIdFromAirdropAddress(airdropAddress) { + const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: airdropAddress}) + , airdropModelCacheResponse = await airdropModelCacheObject.fetch() + , airdropRecord = airdropModelCacheResponse.data[airdropAddress] + ; + if (airdropRecord) { + return responseHelper.successWithData({airdropId: airdropRecord.id}); + } + return responseHelper.error("gaidfad", "No data found"); +} + +/** + * Utitlity function to register airdrop if not already registered + * + * @param {string} airdropAddress - airdrop address + * + */ +async function registerAirdrop(airdropAddress) { + // Do Airdrop Setup if setup was not done + const airDropIdResponse = await getAirdropIdFromAirdropAddress(airdropAddress); + if (airDropIdResponse.isFailure()) { + const registerAirdropResponse = await airdropManager.registerAirdrop( + airdropAddress, + constants.chainId + ); + assert.equal(registerAirdropResponse.isSuccess(), true); + + // check again if the database awas set; + const airDropIdAfterRegisterResponse = await getAirdropIdFromAirdropAddress(airdropAddress); + assert.equal(airDropIdAfterRegisterResponse.isSuccess(), true); + } +} + +/** + * Utitlity function to transfer token to airdrop budget holder + * + * @param {Object} token - Branded token object + * @param {string} airdropAddress - airdrop address + * @param {string} fromAddress - reserve address + * @param {string} fromPassphrase - passphrase + * @param {string} budgetHolderAddress - budget holder address + * @param {string} amount - amount to transfer to budget holder + * + * @return {transaction hash} + */ +async function transferTokenToAirdropBugetHolder (token, airdropAddress, fromAddress, fromPassphrase, budgetHolderAddress, amount) { + + const airdropBudgetAmountInWei = new BigNumber(airdropOstUsd.toWei(amount)); + const initialBalance = new BigNumber(await token.balanceOf(fromAddress)); + const beforeTransferAirdropBudgetHolderBalance = new BigNumber(await token.balanceOf(budgetHolderAddress)); + + logger.info("initialBalance:", initialBalance.toString(10), + "\nairdropBudgetAmount:", airdropBudgetAmountInWei.toString(10), + "\nairdropAddress:", airdropAddress); + + assert.equal(initialBalance.gte(airdropBudgetAmountInWei), true, "insufficent balance to transfer amount to budgetHolderAddress"); + + var transferToAirdropBudgetHolderResult = await airdropManager.transfer( + fromAddress, + fromPassphrase, + airdropAddress, + airdropBudgetAmountInWei, + constants.gasUsed, + constants.chainId, + constants.optionsReceipt + ); + logger.info("=======transferToAirdropBudgetHolderResult======="); + logger.info(transferToAirdropBudgetHolderResult); + assert.equal(transferToAirdropBudgetHolderResult.isSuccess(), true); + // verify if the transaction receipt is valid + await utils.verifyTransactionReceipt(transferToAirdropBudgetHolderResult); + // verify if the transaction was actually mined + await utils.verifyIfMined(airdropOstUsd, transferToAirdropBudgetHolderResult.data.transaction_hash); + + const afterTransferAirdropBudgetHolderBalance = new BigNumber(await token.balanceOf(budgetHolderAddress)); + assert.equal((beforeTransferAirdropBudgetHolderBalance.plus(airdropBudgetAmountInWei)).equals( afterTransferAirdropBudgetHolderBalance), true); + + // set transaction hash + transferToAirdropBudgetHolderTransactionHash = transferToAirdropBudgetHolderResult.data.transaction_hash; + return transferToAirdropBudgetHolderTransactionHash; +} + +/** + * Utitlity function get user airdrop balance + * + * @param {string} airdropAddress - airdrop address + * @param {Array} userAddressArray - user address array + * + * @return {Object} - formatted response + */ +async function getUserAirdropBalanceFromCache(airdropAddress, userAddressArray) { + // Get cache value + var airdropBalanceResult = await airdropManager.getAirdropBalance( + constants.chainId, + airdropAddress, + userAddressArray + ); + const zeroAmount = { + totalAirdropAmount: '0', + totalAirdropUsedAmount: '0', + balanceAirdropAmount: '0' + }; + var responseData = {}; + if (airdropBalanceResult.isSuccess()) { + responseData = airdropBalanceResult.data; + } + var data = {}; + for (var i = userAddressArray.length - 1; i >= 0; i--) { + if(responseData[userAddressArray[i]]) { + data[userAddressArray[i]] = responseData[userAddressArray[i]]; + } else { + data[userAddressArray[i]] = zeroAmount; + } + } + return responseHelper.successWithData(data); +} + +/** + * Utitlity function get user airdrop balance form DB, bypass cache layer + * + * @param {string} airdropAddress - airdrop address + * @param {Array} userAddressArray - user address array + * + * @return {Object} - formatted response + */ +async function getUserAirdropBalanceFromDB(airdropAddress, userAddressArray) { + + const airDropIdResponse = await getAirdropIdFromAirdropAddress(airdropAddress); + if (airDropIdResponse.isSuccess()) { + const airdropId = airDropIdResponse.data.airdropId; + const userAirdropDetailModel = new UserAirdropDetailKlass(); + + const queryResponse = await userAirdropDetailModel.getByUserAddresses(airdropId, userAddressArray); + + var responseData = {}; + if (queryResponse.isSuccess()) { + responseData = queryResponse.data; + } + var data = {}; + for (var i = userAddressArray.length - 1; i >= 0; i--) { + if(responseData[userAddressArray[i]]) { + data[userAddressArray[i]] = responseData[userAddressArray[i]]; + } else { + data[userAddressArray[i]] = { + totalAirdropAmount: '0', + totalAirdropUsedAmount: '0', + balanceAirdropAmount: '0' + }; + } + } + return responseHelper.successWithData(data); + } + return airDropIdResponse; +} + +/** + * Utitlity function to compare the airdrop balances from DB and cache + * + * @param {Object} dbBalance - airdrop balance from DB + * @param {Object} cacheBalance - airdrop balance from cache + * + */ +function validateDBandCacheAirdropBalances(dbBalance, cacheBalance) { + + const compare = function(obj1, obj2) { + assert.equal(obj1.totalAirdropAmount, obj2.totalAirdropAmount); + assert.equal(obj1.totalAirdropUsedAmount, obj2.totalAirdropUsedAmount); + assert.equal(obj1.balanceAirdropAmount, obj2.balanceAirdropAmount); + }; + const dbUserKeys = Object.keys(dbBalance); + const cacheUserKeys = Object.keys(cacheBalance); + assert.equal(dbUserKeys.length, cacheUserKeys.length); + for (var i = dbUserKeys.length - 1; i >= 0; i--) { + const dbObject = dbBalance[dbUserKeys[i]]; + const cacheObject = cacheBalance[cacheUserKeys[i]]; + assert.isDefined(dbObject); + assert.isDefined(cacheObject); + compare(dbObject, cacheObject); + } +} + +/** + * Utitlity function to get balance of address from contract + * + * @param {Object} token - token + * @param {string} address - address whose balances need to be found + * + */ +async function getBalanceFromContract(token, address) { + var balances = {}; + for (var i = address.length - 1; i >= 0; i--) { + const addressKey = address[i]; + balances[addressKey] = new BigNumber(await token.balanceOf(addressKey)); + } + return balances; +} + +/** + * Utitlity function to get balance of address from cache + * + * @param {Object} token - token + * @param {string} address - address whose balances need to be found + * + */ +async function getBalanceFromCache(tokenObj, address) { + var balances = {}; + for (var i = address.length - 1; i >= 0; i--) { + const addressKey = address[i]; + const balance = await tokenObj.getBalanceOf(addressKey); + assert.equal(balance.isSuccess(), true); + balances[addressKey] = new BigNumber(balance.data.balance); + } + return balances; +} + +/** + * Utitlity function to compare balances from cache and contract + * + * @param {Object} contractBalances - balances from contract + * @param {Object} cacheBalance - balances from cache + * + */ + +function validateContractAndCacheBalance(cacheBalance, contractBalances) { + const contractKeys = Object.keys(cacheBalance); + const cacheKeys = Object.keys(contractBalances); + assert.equal(contractKeys.length, cacheKeys.length); + for (var i = contractKeys.length - 1; i >= 0; i--) { + const balanceFromContract = contractBalances[contractKeys[i]]; + const balanceFromCache = cacheBalance[contractKeys[i]]; + assert.isDefined(balanceFromContract); + assert.isDefined(balanceFromCache); + assert.equal(balanceFromCache.equals(balanceFromContract), true); + } +} + +/** + * Utitlity function to validate if airdrop was transfered successfully + * + * @param {string} accountAddress - user address + * @param {Object} initialAirdropBalance - Initial airdrop balance + * @param {Object} currentAirdropBalance - Current airdrop balance + * @param {BigNumber} airdropAmountTransfered - estimated airdrop amount that was transfered + */ +function validateAirdropTransferSuccess(accountAddress, initialAirdropBalance, currentAirdropBalance, airdropAmountTransfered) { + + const initialAirdropBalanceData = initialAirdropBalance.data[accountAddress]; + const currentAirdropBalanceData = currentAirdropBalance.data[accountAddress]; + + assert.isDefined(initialAirdropBalanceData); + assert.isDefined(currentAirdropBalanceData); + + const intialTotalAirdropAmount = new BigNumber(initialAirdropBalanceData.totalAirdropAmount); + const initialTotalAirdropUsedAmount = new BigNumber(initialAirdropBalanceData.totalAirdropUsedAmount); + const initialBalanceAirdropAmount = new BigNumber(initialAirdropBalanceData.balanceAirdropAmount); + + const totalAirdropAmount = new BigNumber(currentAirdropBalanceData.totalAirdropAmount); + const totalAirdropUsedAmount = new BigNumber(currentAirdropBalanceData.totalAirdropUsedAmount); + const balanceAirdropAmount = new BigNumber(currentAirdropBalanceData.balanceAirdropAmount); + + assert.equal(intialTotalAirdropAmount.equals(totalAirdropAmount), true); + assert.equal((initialTotalAirdropUsedAmount.plus(airdropAmountTransfered)).equals(totalAirdropUsedAmount), true); + assert.equal((initialBalanceAirdropAmount.minus(airdropAmountTransfered)).equals(balanceAirdropAmount), true); +} + +function validateTransferSuccess( + estimatedTokenAmount, + estimatedCommissionTokenAmount, + estimatedAirdropUsed, + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder, + initialBalances, + currentBalances) { + + assert.isDefined(estimatedTokenAmount); + assert.isDefined(estimatedCommissionTokenAmount); + assert.isDefined(estimatedAirdropUsed); + assert.isDefined(spenderAddress); + assert.isDefined(beneficiary); + assert.isDefined(commissionBeneficiary); + assert.isDefined(airdropBudgetHolder); + assert.isDefined(initialBalances); + assert.isDefined(currentBalances); + + const estimatedTotalAmount = estimatedTokenAmount.plus(estimatedCommissionTokenAmount); + const actualTransferAmount = estimatedTotalAmount.minus(estimatedAirdropUsed); + const calculatedBenficiaryAmount = initialBalances[beneficiary].plus(estimatedTokenAmount); + const calculatedCommisionAmount = initialBalances[commissionBeneficiary].plus(estimatedCommissionTokenAmount); + const calculatedSpenderAmount = initialBalances[spenderAddress].minus(actualTransferAmount); + const calculatesBugdetHolderAmount = initialBalances[airdropBudgetHolder].minus(estimatedAirdropUsed); + + assert.equal(calculatedBenficiaryAmount.equals(currentBalances[beneficiary]), true); + assert.equal(calculatedCommisionAmount.equals(currentBalances[commissionBeneficiary]), true); + assert.equal(calculatedSpenderAmount.equals(currentBalances[spenderAddress]), true); + assert.equal(calculatesBugdetHolderAmount.equals(currentBalances[airdropBudgetHolder]), true); +} + +/** + * Utitlity function to populate the cache of all test accounts + * + */ +async function populateCache() { + // Populate Cache + await brandedTokenObject.getBalanceOf(constants.account1); + await brandedTokenObject.getBalanceOf(constants.account2); + await brandedTokenObject.getBalanceOf(constants.account3); + await brandedTokenObject.getBalanceOf(constants.account4); + await brandedTokenObject.getBalanceOf(constants.account5); + await brandedTokenObject.getBalanceOf(constants.airdropBudgetHolder); +} +// Tests starts here describe('Airdrop Pay', function() { it('should pass the initial checks', async function() { // eslint-disable-next-line no-invalid-this this.timeout(500000); + // check if the address required for the testing are defined. assert.isDefined(constants.deployer); assert.isDefined(constants.ops); assert.isDefined(constants.account1); + assert.isDefined(constants.workerAccount1); + assert.isDefined(constants.airdropBudgetHolder); + assert.notEqual(constants.deployer, constants.ops); assert.notEqual(constants.deployer, constants.account1); assert.notEqual(constants.ops, constants.account1); - const currentBlockNumber = await web3RpcProvider.eth.getBlockNumber() - , deactivationHeight = new BigNumber(currentBlockNumber).plus(10000) - ; // set worker - const setWorkerResponse = await workersContract.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsReceipt); - - const isWorkerResponse = await workersContract.isWorker(constants.workerAccount1); - assert.equal(isWorkerResponse.isSuccess(), true); - assert.equal(isWorkerResponse.data.isValid, true); - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(setWorkerResponse); - // TODO Check for get Worker + logger.info("============= Set worker ============="); + const currentBlockNumber = await web3RpcProvider.eth.getBlockNumber(); + await setWorker(constants.workerAccount1, new BigNumber(currentBlockNumber).plus(100000000000)); // Set Price Oracle - const spoResponse = await airdropOstUsd.setPriceOracle( - constants.ops, - constants.opsPassphrase, - constants.currencyUSD, - constants.priceOracles.OST.USD, - constants.gasUsed, - constants.optionsReceipt); - - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(spoResponse); - - // verify if the transaction has was actually mined - await utils.verifyIfMined(airdropOstUsd, spoResponse.data.transaction_hash); + logger.info("============= Set Price Oracle ============="); + await setPriceOracle(airdropOstUsd, constants.currencyUSD, constants.priceOracles.OST.USD); // set accepted margin - const amResponse = await airdropOstUsd.setAcceptedMargin( - constants.ops, - constants.opsPassphrase, - constants.currencyUSD, - 50, - constants.gasUsed, - constants.optionsReceipt); + logger.info("============= Set accepted margin ============="); + await setAcceptedMargin(airdropOstUsd, constants.currencyUSD, 50); - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(amResponse); + // set balance for account 1 (Spender) + logger.info("============= Set account 1 balance ============="); + await setBalance(TC5, constants.account1, constants.account1InitialBrandedTokenBalance); - // verify if the transaction has was actually mined - await utils.verifyIfMined(airdropOstUsd, amResponse.data.transaction_hash); + // reset balance for account 2 to 100 + logger.info("============= Set account 2 balance ============="); + await setBalance(TC5, constants.account2, '100'); - // verify if its set - const amResult = await airdropOstUsd.acceptedMargins(constants.currencyUSD); - assert.equal(amResult.isSuccess(), true); - assert.equal(50, amResult.data.acceptedMargins); + // reset balance for account 3 to 0 + logger.info("============= Set account 3 balance ============="); + await setBalance(TC5, constants.account3, '0'); - // verify if its set - const poResult = await airdropOstUsd.priceOracles(constants.currencyUSD); - assert.equal(poResult.isSuccess(), true); - assert.equal(constants.priceOracles.OST.USD, poResult.data.priceOracles); + // reset balance for account 4 to 0 + logger.info("============= Set account 4 balance ============="); + await setBalance(TC5, constants.account4, '0'); - // Do Airdrop Setup if setup was not done - var airdropModel = new airdropKlass(); - var result = await airdropModel.getByContractAddress(constants.airdropOstUsdAddress); - const airdropRecord = result[0]; - if (!airdropRecord) { - const registerAirdropResponse = await airdropManager.registerAirdrop( - constants.airdropOstUsdAddress, - constants.chainId - ); - assert.equal(registerAirdropResponse.isSuccess(), true); - } + // reset balance of account airdropBudgetHolder to 0 + logger.info("============= Set airdropBudgetHolder balance ============="); + await setBalance(TC5, constants.airdropBudgetHolder, '0'); - await TC5.setBalance( - constants.ops, - constants.opsPassphrase, - constants.account1, - airdropOstUsd.toWei(constants.account1InitialBrandedTokenBalance), - constants.gasUsed); - - - const account1Balance = await TC5.balanceOf(constants.account1); - assert.equal(account1Balance, airdropOstUsd.toWei(constants.account1InitialBrandedTokenBalance)); - - await TC5.setBalance( - constants.ops, - constants.opsPassphrase, - constants.account2, - airdropOstUsd.toWei('0'), - constants.gasUsed); - - const account2Balance = await TC5.balanceOf(constants.account2); - assert.equal(account2Balance, airdropOstUsd.toWei('0')); - - await TC5.setBalance( - constants.ops, - constants.opsPassphrase, - constants.account3, - airdropOstUsd.toWei('0'), - constants.gasUsed); - - const account3Balance = await TC5.balanceOf(constants.account3); - assert.equal(account3Balance, airdropOstUsd.toWei('0')); + // Do Airdrop Setup if setup was not done + logger.info("============= Do Airdrop Setup if setup was not done ============="); + await registerAirdrop(constants.airdropOstUsdAddress); - await TC5.setBalance( - constants.ops, - constants.opsPassphrase, - constants.account4, - airdropOstUsd.toWei('0'), - constants.gasUsed); + }); - const account4Balance = await TC5.balanceOf(constants.account4); - assert.equal(account4Balance, airdropOstUsd.toWei('0')); + it('AirdropManager: transfer branded token from reserve to airdropBudgetHolder and approve airdrop contract', async function() { + // eslint-disable-next-line no-invalid-this + this.timeout(100000); - // Populate Cache - brandedTokenObject.getBalanceOf(constants.account1); - brandedTokenObject.getBalanceOf(constants.account2); - brandedTokenObject.getBalanceOf(constants.account3); - brandedTokenObject.getBalanceOf(constants.account4); + const address = [ + constants.account1, + constants.airdropBudgetHolder + ]; + const initalBalancesFromContract = await getBalanceFromContract(TC5, address); + const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - }); - it('AirdropManager: transfer branded token from reserve to airdropBudgetHolder', async function() { - this.timeout(100000); - const airdropBudgetAmountInWei = new BigNumber(constants.airdropBudgetBrandedTokenBalance) - , initialAccount1Balance = new BigNumber(await TC5.balanceOf(constants.account1)); - ; - assert.isAbove( - initialAccount1Balance.toNumber(), - airdropBudgetAmountInWei.toNumber(), - "account1 balance should be greater than airdropBudgetAmount") - ; - logger.info("=======initialAccount1Balance:", initialAccount1Balance.toString(), - "\nairdropBudgetAmount:",airdropBudgetAmountInWei.toString(), - "\nairdropOstUsdAddress:",constants.airdropOstUsdAddress); - var transferToAirdropBudgetHolderResult = await airdropManager.transfer( + // transfer amount + await transferTokenToAirdropBugetHolder(TC5, + constants.airdropOstUsdAddress, constants.account1, constants.accountPassphrase1, - constants.airdropOstUsdAddress, - airdropBudgetAmountInWei.toString(), - constants.gasUsed, - constants.chainId, - {returnType: constants.returnTypeReceipt} - ); - logger.info("=======transferToAirdropBudgetHolderResult======="); - logger.info(transferToAirdropBudgetHolderResult); - const afterTransferAirdropBudgetHolderBalance = new BigNumber(await TC5.balanceOf(constants.airdropBudgetHolder)); - assert.equal(afterTransferAirdropBudgetHolderBalance.toString(), airdropBudgetAmountInWei.toString()); - // verify if the transaction receipt is valid - await utils.verifyTransactionReceipt(transferToAirdropBudgetHolderResult); + constants.airdropBudgetHolder, + constants.airdropBudgetBrandedTokenBalance); - // verify if the transaction was actually mined - await utils.verifyIfMined(airdropOstUsd, transferToAirdropBudgetHolderResult.data.transaction_hash); - transferToAirdropBudgetHolderTransactionHash = transferToAirdropBudgetHolderResult.data.transaction_hash; - }); + const balanceFromContract = await getBalanceFromContract(TC5, address); + const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - it('AirdropManager: aidropBudgetHolder is approving airdrop contract', async function() { - this.timeout(100000); + // approve var approveToAirdropBudgetHolderResult = await airdropManager.approve( constants.airdropOstUsdAddress, constants.airdropBudgetHolderPassphrase, constants.gasUsed, constants.chainId, - {returnType: constants.returnTypeReceipt} + constants.optionsReceipt ); - assert.equal(approveToAirdropBudgetHolderResult.isSuccess(), true); logger.info("=======approveToAirdropBudgetHolderResult======="); logger.info(approveToAirdropBudgetHolderResult); + + assert.equal(approveToAirdropBudgetHolderResult.isSuccess(), true); // verify if the transaction receipt is valid await utils.verifyTransactionReceipt(approveToAirdropBudgetHolderResult); - // verify if the transaction was actually mined await utils.verifyIfMined(airdropOstUsd, approveToAirdropBudgetHolderResult.data.transaction_hash); - }); - it('AirdropManager: batch allocate to airdrop users', async function() { + + it('AirdropManager: batch allocate to airdrop users and check user balance', async function() { + // eslint-disable-next-line no-invalid-this this.timeout(10000); + + var airdropUsers = constants.airdropUsers; + airdropUsers[constants.account2] = {airdropAmount: '100000000000000000000', expiryTimestamp: 0}; + + // checks for cache and DB consistency + const beforeAllocationBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); + const beforeAllocationBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); + validateDBandCacheAirdropBalances(beforeAllocationBalanceFromDB.data, beforeAllocationBalanceFromCache.data); + var batchAllocateAirdropAmountResult = await airdropManager.batchAllocate( constants.airdropOstUsdAddress, transferToAirdropBudgetHolderTransactionHash, - constants.airdropUsers, + airdropUsers, constants.chainId ); + assert.equal(batchAllocateAirdropAmountResult.isSuccess(), true); var airdropAllocationProofDetailModel = new airdropAllocationProofDetailKlass(); var result = await airdropAllocationProofDetailModel.getByTransactionHash(transferToAirdropBudgetHolderTransactionHash); var airdropAllocationProofDetailRecord = result[0]; // airdrop_allocated_amount is less than or equal to airdrop_amount - assert.isAtMost(new BigNumber(airdropAllocationProofDetailRecord.airdrop_allocated_amount).toNumber(), - new BigNumber(airdropAllocationProofDetailRecord.airdrop_amount).toNumber()); - }); + assert.equal(new BigNumber(airdropAllocationProofDetailRecord.airdrop_allocated_amount).lte(new BigNumber(airdropAllocationProofDetailRecord.airdrop_amount)), true); + - it('AirdropManager: Get User Balance and validate balance', async function() { - this.timeout(5000); - var userAddressArray = []; - for (var ua in constants.airdropUsers){ - userAddressArray.push(ua); + // checks for cache and DB consistency + const afterAllocationBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); + const afterAllocationBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); + validateDBandCacheAirdropBalances(afterAllocationBalanceFromDB.data, afterAllocationBalanceFromCache.data); + + // check if the airdrop balance reflects the proper value. + const allUserKeys = Object.keys(airdropUsers); + for (var i = allUserKeys.length - 1; i >= 0; i--) { + const userKey = allUserKeys[i]; + const initialTotalAirdropAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].totalAirdropAmount); + const initialTotalAirdropUsedAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].totalAirdropUsedAmount); + const initialBalanceAirdropAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].balanceAirdropAmount); + + const totalAirdropAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].totalAirdropAmount); + const totalAirdropUsedAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].totalAirdropUsedAmount); + const balanceAirdropAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].balanceAirdropAmount); + + assert.equal((initialTotalAirdropAmount.plus(new BigNumber(airdropUsers[userKey].airdropAmount))).equals(totalAirdropAmount), true); + + assert.equal(initialTotalAirdropUsedAmount.equals(totalAirdropUsedAmount), true); + assert.equal(initialTotalAirdropUsedAmount.equals(0), true); + + assert.equal((initialBalanceAirdropAmount.plus(new BigNumber(airdropUsers[userKey].airdropAmount))).equals(balanceAirdropAmount), true); } - // Without Cache + }); + + + it('should fail when worker is not whitelisted', async function() { + // eslint-disable-next-line no-invalid-this + this.timeout(100000); + + // Populate Cache + populateCache(); + + const beneficiary = constants.account3 + , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.9')) + , commissionBeneficiary = constants.account4 + , currency = constants.currencyUSD + , transferAmount = new BigNumber(airdropOstUsd.toWei('1.18')) + , spenderAddress = constants.account2 + , spenderPassphrase = constants.accountPassphrase2 + , airdropBudgetHolder = constants.airdropBudgetHolder + ; + + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract ============="); + const address = [ + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder + ]; + const initalBalancesFromContract = await getBalanceFromContract(TC5, address); + const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); + + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); + const airdropUserAddress = [spenderAddress]; + const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); + var airdropBalanceResult = await airdropManager.getAirdropBalance( constants.chainId, constants.airdropOstUsdAddress, - userAddressArray + [spenderAddress] ); assert.equal(airdropBalanceResult.isSuccess(), true); - // With Cache + const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); + + const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( + transferAmount, + commissionAmount, + currency); + assert.equal(estimatedValues.isSuccess(), true); + + const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); + const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); + const intendedPricePoint = estimatedValues.data.pricePoint; + + const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); + + const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); + logger.info("============ estimatedAirdropUsed ============"); + logger.info(estimatedAirdropUsed); + + // Approve account1 for transfer + const accountApproveResponse = await TC5.approve( + spenderAddress, + spenderPassphrase, + constants.airdropOstUsdAddress, + estimatedTotalAmount.plus(100), + constants.gasUsed); + + logger.info("============spender approving to contract============="); + logger.info(accountApproveResponse); + var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); + logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); + + const payResponse = await airdropOstUsd.pay( + constants.ops, + constants.opsPassphrase, + beneficiary, + transferAmount.toString(10), + commissionBeneficiary, + commissionAmount.toString(10), + currency, + intendedPricePoint, + spenderAddress, + constants.gasUsed, + constants.optionsReceipt); + + assert.equal(payResponse.isFailure(), true); + logger.info("============airdrop.pay response============="); + logger.info(payResponse); + + + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); + const balanceFromContract = await getBalanceFromContract(TC5, address); + const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(balanceFromContract, balancesFromCache); + //check if the initial and current balances are reverted properly + validateContractAndCacheBalance(initalBalancesFromContract, balanceFromContract); + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); + const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); + // validate if the airdrop transfer was reverted properly + validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, airdropBalanceFromDB.data); + + }); + + it('should pass when transfer amount is less than available airdrop amount', async function() { + // eslint-disable-next-line no-invalid-this + this.timeout(100000); + + // Populate Cache + populateCache(); + + const beneficiary = constants.account3 + , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.7')) + , commissionBeneficiary = constants.account4 + , currency = constants.currencyUSD + , transferAmount = new BigNumber(airdropOstUsd.toWei('1.91')) + , spenderAddress = constants.account2 + , spenderPassphrase = constants.accountPassphrase2 + , airdropBudgetHolder = constants.airdropBudgetHolder + ; + + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract ============="); + const address = [ + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder + ]; + const initalBalancesFromContract = await getBalanceFromContract(TC5, address); + const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); + + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); + const airdropUserAddress = [spenderAddress]; + const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); + var airdropBalanceResult = await airdropManager.getAirdropBalance( constants.chainId, constants.airdropOstUsdAddress, - userAddressArray + [spenderAddress] ); assert.equal(airdropBalanceResult.isSuccess(), true); - for (var userAddress in constants.airdropUsers){ - // Match airdrop allocated Balance - assert.equal(airdropBalanceResult.data[userAddress].total_airdrop_amount, constants.airdropUsers[userAddress].airdrop_amount); - } + const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); + + const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( + transferAmount, + commissionAmount, + currency); + assert.equal(estimatedValues.isSuccess(), true); + + const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); + const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); + const intendedPricePoint = estimatedValues.data.pricePoint; + + const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); + + const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); + logger.info("============ estimatedAirdropUsed ============"); + logger.info(estimatedAirdropUsed); + // here we make sure that airdrop amount used will be greater than 0 + assert.equal(estimatedAirdropUsed.gt(0), true); + // Approve account1 for transfer + const accountApproveResponse = await TC5.approve( + spenderAddress, + spenderPassphrase, + constants.airdropOstUsdAddress, + estimatedTotalAmount.plus(100), + constants.gasUsed); + + logger.info("============spender approving to contract============="); + logger.info(accountApproveResponse); + var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); + logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); + + const payResponse = await airdropOstUsd.pay( + constants.workerAccount1, + constants.workerAccountPassphrase1, + beneficiary, + transferAmount.toString(10), + commissionBeneficiary, + commissionAmount.toString(10), + currency, + intendedPricePoint, + spenderAddress, + constants.gasUsed, + constants.optionsReceipt); + + assert.equal(payResponse.isSuccess(), true); + logger.info("============airdrop.pay response============="); + logger.info(payResponse); + + // verify if the transaction receipt is valid + utils.verifyTransactionReceipt(payResponse); + // verify if the transaction is actually mined + await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); + + + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); + const balanceFromContract = await getBalanceFromContract(TC5, address); + const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(balanceFromContract, balancesFromCache); + //check if the transfer was propre + validateTransferSuccess( + estimatedTokenAmount, + estimatedCommissionTokenAmount, + estimatedAirdropUsed, + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder, + initalBalancesFromContract, + balanceFromContract); + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); + const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); + // validate if the airdrop transfer was proper + validateAirdropTransferSuccess( + spenderAddress, + initialAirdropBalanceFromDB, + airdropBalanceFromDB, + estimatedAirdropUsed); + }); - it('should pass when all parameters are valid with currency USD and account1 allocated airdrop amount is 0', async function() { + // This is with an assumption that pervious test was passed and due to that constants.account3 has some balance + it('should pass when airdrop amount is 0', async function() { // eslint-disable-next-line no-invalid-this this.timeout(100000); - logger.info("========Get Amount from Contract========="); - const initialAccount1Balance = new BigNumber(await TC5.balanceOf(constants.account1)) - , initialAccount3Balance = new BigNumber(await TC5.balanceOf(constants.account3)) - , initialAccount4Balance = new BigNumber(await TC5.balanceOf(constants.account4)) - ; - - // Cache check - logger.info("========Get Amount from Cache========="); - // const initialAccount1BalanceCache = await brandedTokenObject.getBalanceOf(constants.account1) - // , initialAccount3BalanceCache = await brandedTokenObject.getBalanceOf(constants.account3) - // , initialAccount4BalanceCache = await brandedTokenObject.getBalanceOf(constants.account4) - // ; - logger.info("========Asserting amount of cache and DB========="); - // assert.equal(initialAccount1Balance.toString(), new BigNumber(initialAccount1BalanceCache.data.balance).toString(), "account1: Actual and cacheValue mismatch"); - // assert.equal(initialAccount3Balance.toString(), new BigNumber(initialAccount3BalanceCache.data.balance).toString(), "account3: Actual and cacheValue mismatch"); - // assert.equal(initialAccount4Balance.toString(), new BigNumber(initialAccount4BalanceCache.data.balance).toString(), "account4: Actual and cacheValue mismatch"); + // Populate Cache + populateCache(); - const beneficiary = constants.account3 - , commissionAmount = new BigNumber(airdropOstUsd.toWei('1')) + const beneficiary = constants.account1 + , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.0000000001')) , commissionBeneficiary = constants.account4 , currency = constants.currencyUSD - , transferAmount = new BigNumber(airdropOstUsd.toWei('9')) + , transferAmount = new BigNumber(airdropOstUsd.toWei('0.000000033')) + , spenderAddress = constants.account3 + , spenderPassphrase = constants.accountPassphrase3 + , airdropBudgetHolder = constants.airdropBudgetHolder ; + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract ============="); + const address = [ + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder + ]; + const initalBalancesFromContract = await getBalanceFromContract(TC5, address); + const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); + + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); + const airdropUserAddress = [spenderAddress]; + const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); + + var airdropBalanceResult = await airdropManager.getAirdropBalance( + constants.chainId, + constants.airdropOstUsdAddress, + [spenderAddress] + ); + assert.equal(airdropBalanceResult.isSuccess(), true); + // this line is to make sure that the airdropBalance is not availalbe for the user. This is because this user was never allocated airdrop. + assert.isUndefined(airdropBalanceResult.data[spenderAddress]); + const availableAirdropBalance = new BigNumber(0); + const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( transferAmount, commissionAmount, @@ -307,74 +915,124 @@ describe('Airdrop Pay', function() { const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); + const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); + logger.info("============ estimatedAirdropUsed ============"); + logger.info(estimatedAirdropUsed); + // Here we make sure that the airdrop amount is 0; + assert.equal(estimatedAirdropUsed.equals(0), true); // Approve account1 for transfer - const account1ApproveResponse = await TC5.approve( - constants.account1, - constants.accountPassphrase1, + const accountApproveResponse = await TC5.approve( + spenderAddress, + spenderPassphrase, constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100).toString(), + estimatedTotalAmount.plus(100), constants.gasUsed); logger.info("============spender approving to contract============="); - logger.info(account1ApproveResponse); + logger.info(accountApproveResponse); var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); + const payResponse = await airdropOstUsd.pay( constants.workerAccount1, constants.workerAccountPassphrase1, beneficiary, - transferAmount.toString(), + transferAmount.toString(10), commissionBeneficiary, - commissionAmount.toString(), + commissionAmount.toString(10), currency, intendedPricePoint, - constants.account1, + spenderAddress, constants.gasUsed, - {returnType: constants.returnTypeReceipt, tag: 'airdrop.pay'}); + constants.optionsReceipt); + + assert.equal(payResponse.isSuccess(), true); logger.info("============airdrop.pay response============="); logger.info(payResponse); - // verify if the transaction receipt is valid utils.verifyTransactionReceipt(payResponse); - // verify if the transaction is actually mined await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); - // const account1Balance = new BigNumber(await TC5.balanceOf(constants.account1)) - // , account3Balance = new BigNumber(await TC5.balanceOf(constants.account3)) - // , account4Balance = new BigNumber(await TC5.balanceOf(constants.account4)) - // ; - // - // assert.equal( - // new BigNumber(0).plus(initialAccount1Balance) - // .minus(estimatedTokenAmount) - // .minus(estimatedCommissionTokenAmount) - // .toNumber(), account1Balance.toNumber()); - // - // assert.equal( - // new BigNumber(0).plus(initialAccount3Balance) - // .plus(estimatedTokenAmount) - // .toNumber(), account3Balance.toNumber()); - // - // assert.equal( - // new BigNumber(0).plus(initialAccount4Balance) - // .plus(estimatedCommissionTokenAmount) - // .toNumber(), account4Balance.toNumber()); - // + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); + const balanceFromContract = await getBalanceFromContract(TC5, address); + const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(balanceFromContract, balancesFromCache); + //check if the transfer was propre + validateTransferSuccess( + estimatedTokenAmount, + estimatedCommissionTokenAmount, + estimatedAirdropUsed, + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder, + initalBalancesFromContract, + balanceFromContract); + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); + const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); + // validate if the airdrop transfer was proper + validateAirdropTransferSuccess( + spenderAddress, + initialAirdropBalanceFromDB, + airdropBalanceFromDB, + estimatedAirdropUsed); }); - it('should pass when all parameters are valid with currency USD and allocated airdrop amount is greater than 0', async function() { + it('should pass when all airdrop amount is used and partial user balance is used', async function() { // eslint-disable-next-line no-invalid-this this.timeout(100000); + + // Populate Cache + populateCache(); + const spenderAddress = constants.account2 + , spenderPassphrase = constants.accountPassphrase2 + ; + + var airdropBalanceResult = await airdropManager.getAirdropBalance( + constants.chainId, + constants.airdropOstUsdAddress, + [spenderAddress] + ); + assert.equal(airdropBalanceResult.isSuccess(), true); + + const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); + const partialAmount = new BigNumber(10); + const beneficiary = constants.account3 - , commissionAmount = new BigNumber(airdropOstUsd.toWei('1')) + , commissionAmount = partialAmount , commissionBeneficiary = constants.account4 , currency = constants.currencyUSD - , transferAmount = new BigNumber(airdropOstUsd.toWei('9')) + , transferAmount = availableAirdropBalance.div(6).floor() + , airdropBudgetHolder = constants.airdropBudgetHolder ; + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract ============="); + const address = [ + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder + ]; + const initalBalancesFromContract = await getBalanceFromContract(TC5, address); + const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); + const airdropUserAddress = [spenderAddress]; + const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); + const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( transferAmount, commissionAmount, @@ -386,61 +1044,83 @@ describe('Airdrop Pay', function() { const intendedPricePoint = estimatedValues.data.pricePoint; const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); - // Batch allocate airdrop amount to account1 - var airdropUsers = {}; - airdropUsers[constants.account1] = {airdropAmount: '50000000000000000000', expiryTimestamp: 0}; - var batchAllocateAirdropAmountResult = await airdropManager.batchAllocate( - constants.airdropOstUsdAddress, - transferToAirdropBudgetHolderTransactionHash, - airdropUsers, - constants.chainId - ); - assert.equal(batchAllocateAirdropAmountResult.isSuccess(), true); - var airdropAllocationProofDetailModel = new airdropAllocationProofDetailKlass(); - var result = await airdropAllocationProofDetailModel.getByTransactionHash(transferToAirdropBudgetHolderTransactionHash); - var airdropAllocationProofDetailRecord = result[0]; - assert.isAtMost(new BigNumber(airdropAllocationProofDetailRecord.airdrop_allocated_amount).toNumber(), - new BigNumber(airdropAllocationProofDetailRecord.airdrop_amount).toNumber()); + const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); + logger.info("============ estimatedAirdropUsed ============"); + logger.info(estimatedAirdropUsed); + // here we make sure that airdrop amount used will be greater than 0 + assert.equal(estimatedAirdropUsed.gt(0), true); // Approve account1 for transfer - const account1ApproveResponse = await TC5.approve( - constants.account1, - constants.accountPassphrase1, + const accountApproveResponse = await TC5.approve( + spenderAddress, + spenderPassphrase, constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100).toString(), + estimatedTotalAmount.plus(100), constants.gasUsed); logger.info("============spender approving to contract============="); - logger.info(account1ApproveResponse); + logger.info(accountApproveResponse); var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); + const payResponse = await airdropOstUsd.pay( constants.workerAccount1, constants.workerAccountPassphrase1, beneficiary, - transferAmount.toString(), + transferAmount.toString(10), commissionBeneficiary, - commissionAmount.toString(), + commissionAmount.toString(10), currency, intendedPricePoint, - constants.account1, + spenderAddress, constants.gasUsed, - {returnType: constants.returnTypeReceipt, tag: 'airdrop.pay'}); - logger.info("============mocha_test.airdrop.pay response============="); - logger.info(payResponse); + constants.optionsReceipt); + assert.equal(payResponse.isSuccess(), true); + logger.info("============airdrop.pay response============="); + logger.info(payResponse); // verify if the transaction receipt is valid utils.verifyTransactionReceipt(payResponse); - // verify if the transaction is actually mined await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); - }); - it('Airdrop.Pay: It exits', async function() { - process.exit(0); + // checks for account balance cache and DB consistency + logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); + const balanceFromContract = await getBalanceFromContract(TC5, address); + const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); + validateContractAndCacheBalance(balanceFromContract, balancesFromCache); + //check if the transfer was propre + validateTransferSuccess( + estimatedTokenAmount, + estimatedCommissionTokenAmount, + estimatedAirdropUsed, + spenderAddress, + beneficiary, + commissionBeneficiary, + airdropBudgetHolder, + initalBalancesFromContract, + balanceFromContract); + + // checks for airdrop balance cache and DB consistency + logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); + const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); + const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); + validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); + // validate if the airdrop transfer was proper + validateAirdropTransferSuccess( + spenderAddress, + initialAirdropBalanceFromDB, + airdropBalanceFromDB, + estimatedAirdropUsed); + }); -}); -*/ \ No newline at end of file + + // it('Airdrop.Pay: It exits', async function() { + // process.exit(0); + // }); + + +}); \ No newline at end of file diff --git a/mocha_test/services/airdrop/pay_1.js b/mocha_test/services/airdrop/pay_1.js deleted file mode 100644 index 12309a9..0000000 --- a/mocha_test/services/airdrop/pay_1.js +++ /dev/null @@ -1,1126 +0,0 @@ -/* global describe, it */ - -const chai = require('chai') - , assert = chai.assert; - -const rootPrefix = "../../.." - , constants = require(rootPrefix + '/mocha_test/lib/constants') - , BigNumber = require('bignumber.js') - , utils = require(rootPrefix+'/mocha_test/lib/utils') - , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') - , workers = require(rootPrefix + '/lib/contract_interact/workers') - , mockToken = require(rootPrefix + '/lib/contract_interact/EIP20TokenMock') - , BrandedTokenKlass = require(rootPrefix + '/lib/contract_interact/branded_token') - , web3RpcProvider = require(rootPrefix + '/lib/web3/providers/rpc') - , logger = require(rootPrefix + '/helpers/custom_console_logger') -; - -const workersContract = new workers(constants.workersContractAddress, constants.chainId) - , airdropOstUsd = new airdrop(constants.airdropOstUsdAddress, constants.chainId) - , TC5 = new mockToken(constants.TC5Address) - , brandedTokenObject = new BrandedTokenKlass(constants.TC5Address, constants.chainId) -; - - -const AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') - , airdropManager = require(rootPrefix + '/lib/airdrop_management/base') - , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') - , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') - , responseHelper = require(rootPrefix + '/lib/formatter/response') -; - -var transferToAirdropBudgetHolderTransactionHash = '' -; - -/** - * Utitlity function to test set accepted margin - * - * @param {Object} airdropObject - airdrop object - * @param {string} currency - currency - * @param {string} margin - accepted margin - * - */ - -async function setAcceptedMargin(airdropObject, currency, margin) { - // set accepted margin - const amResponse = await airdropObject.setAcceptedMargin( - constants.ops, - constants.opsPassphrase, - currency, - margin, - constants.gasUsed, - constants.optionsReceipt); - assert.equal(amResponse.isSuccess(), true); - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(amResponse); - // verify if the transaction has was actually mined - await utils.verifyIfMined(airdropObject, amResponse.data.transaction_hash); - // verify if its set - const amResult = await airdropObject.acceptedMargins(currency); - assert.equal(amResult.isSuccess(), true); - assert.equal(margin, amResult.data.acceptedMargins); -} - - -/** - * Utitlity function to test set price oracle - * - * @param {Object} airdropObject - airdrop object - * @param {string} currency - currency - * @param {string} address - price oracle address - * - */ -async function setPriceOracle(airdropObject, currency, address) { - // Set Price Oracle - const spoResponse = await airdropObject.setPriceOracle( - constants.ops, - constants.opsPassphrase, - currency, - address, - constants.gasUsed, - constants.optionsReceipt); - assert.equal(spoResponse.isSuccess(), true); - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(spoResponse); - // verify if the transaction has was actually mined - await utils.verifyIfMined(airdropObject, spoResponse.data.transaction_hash); - // verify if its set - const poResult = await airdropObject.priceOracles(currency); - assert.equal(poResult.isSuccess(), true); - assert.equal(address, poResult.data.priceOracles); -} - - -/** - * Utitlity function to test set worker - * - * @param {string} workerAddress - worker address - * @param {Bignumber} deactivationHeight - deactivation height of the worker - * - */ -async function setWorker(workerAddress, deactivationHeight) { - const setWorkerResponse = await workersContract.setWorker( - constants.ops, - constants.opsPassphrase, - workerAddress, - deactivationHeight.toString(10), - constants.gasUsed, - constants.optionsReceipt); - - assert.equal(setWorkerResponse.isSuccess(), true); - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(setWorkerResponse); - - // confirm that worker is a set - const isWorkerResponse = await workersContract.isWorker(workerAddress); - assert.equal(isWorkerResponse.isSuccess(), true); - assert.equal(isWorkerResponse.data.isValid, true); -} - - -/** - * Utitlity function to test setBalance - * - * @param {Object} token - branded token object - * @param {string} address - account address - * @param {string} amount - amount that need to be set - * @param {BigNumber} gasPrice - gas price - * - */ -async function setBalance(token, address, amount) { - const amountInWei = airdropOstUsd.toWei(amount); - await token.setBalance( - constants.ops, - constants.opsPassphrase, - address, - amountInWei, - constants.gasUsed); - // check if the balance was set - const accountBalance = await token.balanceOf(address); - assert.equal(accountBalance, amountInWei); -} - -/** - * Utitlity function to get airdrop id from airdrop address - * - * @param {string} airdropAddress - airdrop address - * - * @return {Object} - formatted response - */ - -async function getAirdropIdFromAirdropAddress(airdropAddress) { - const airdropModelCacheObject = new AirdropModelCacheKlass({useObject: true, contractAddress: airdropAddress}) - , airdropModelCacheResponse = await airdropModelCacheObject.fetch() - , airdropRecord = airdropModelCacheResponse.data[airdropAddress.toLowerCase()] - ; - if (airdropRecord) { - return responseHelper.successWithData({airdropId: airdropRecord.id}); - } - return responseHelper.error("gaidfad", "No data found"); -} - -/** - * Utitlity function to register airdrop if not already registered - * - * @param {string} airdropAddress - airdrop address - * - */ -async function registerAirdrop(airdropAddress) { - // Do Airdrop Setup if setup was not done - const airDropIdResponse = await getAirdropIdFromAirdropAddress(airdropAddress); - if (airDropIdResponse.isFailure()) { - const registerAirdropResponse = await airdropManager.registerAirdrop( - airdropAddress, - constants.chainId - ); - assert.equal(registerAirdropResponse.isSuccess(), true); - - // check again if the database awas set; - const airDropIdAfterRegisterResponse = await getAirdropIdFromAirdropAddress(airdropAddress); - assert.equal(airDropIdAfterRegisterResponse.isSuccess(), true); - } -} - -/** - * Utitlity function to transfer token to airdrop budget holder - * - * @param {Object} token - Branded token object - * @param {string} airdropAddress - airdrop address - * @param {string} fromAddress - reserve address - * @param {string} fromPassphrase - passphrase - * @param {string} budgetHolderAddress - budget holder address - * @param {string} amount - amount to transfer to budget holder - * - * @return {transaction hash} - */ -async function transferTokenToAirdropBugetHolder (token, airdropAddress, fromAddress, fromPassphrase, budgetHolderAddress, amount) { - - const airdropBudgetAmountInWei = new BigNumber(airdropOstUsd.toWei(amount)); - const initialBalance = new BigNumber(await token.balanceOf(fromAddress)); - const beforeTransferAirdropBudgetHolderBalance = new BigNumber(await token.balanceOf(budgetHolderAddress)); - - logger.info("initialBalance:", initialBalance.toString(10), - "\nairdropBudgetAmount:", airdropBudgetAmountInWei.toString(10), - "\nairdropAddress:", airdropAddress); - - assert.equal(initialBalance.gte(airdropBudgetAmountInWei), true, "insufficent balance to transfer amount to budgetHolderAddress"); - - var transferToAirdropBudgetHolderResult = await airdropManager.transfer( - fromAddress, - fromPassphrase, - airdropAddress, - airdropBudgetAmountInWei, - constants.gasUsed, - constants.chainId, - constants.optionsReceipt - ); - logger.info("=======transferToAirdropBudgetHolderResult======="); - logger.info(transferToAirdropBudgetHolderResult); - assert.equal(transferToAirdropBudgetHolderResult.isSuccess(), true); - // verify if the transaction receipt is valid - await utils.verifyTransactionReceipt(transferToAirdropBudgetHolderResult); - // verify if the transaction was actually mined - await utils.verifyIfMined(airdropOstUsd, transferToAirdropBudgetHolderResult.data.transaction_hash); - - const afterTransferAirdropBudgetHolderBalance = new BigNumber(await token.balanceOf(budgetHolderAddress)); - assert.equal((beforeTransferAirdropBudgetHolderBalance.plus(airdropBudgetAmountInWei)).equals( afterTransferAirdropBudgetHolderBalance), true); - - // set transaction hash - transferToAirdropBudgetHolderTransactionHash = transferToAirdropBudgetHolderResult.data.transaction_hash; - return transferToAirdropBudgetHolderTransactionHash; -} - -/** - * Utitlity function get user airdrop balance - * - * @param {string} airdropAddress - airdrop address - * @param {Array} userAddressArray - user address array - * - * @return {Object} - formatted response - */ -async function getUserAirdropBalanceFromCache(airdropAddress, userAddressArray) { - // Get cache value - var airdropBalanceResult = await airdropManager.getAirdropBalance( - constants.chainId, - airdropAddress, - userAddressArray - ); - const zeroAmount = { - totalAirdropAmount: '0', - totalAirdropUsedAmount: '0', - balanceAirdropAmount: '0' - }; - var responseData = {}; - if (airdropBalanceResult.isSuccess()) { - responseData = airdropBalanceResult.data; - } - var data = {}; - for (var i = userAddressArray.length - 1; i >= 0; i--) { - if(responseData[userAddressArray[i]]) { - data[userAddressArray[i]] = responseData[userAddressArray[i]]; - } else { - data[userAddressArray[i]] = zeroAmount; - } - } - return responseHelper.successWithData(data); -} - -/** - * Utitlity function get user airdrop balance form DB, bypass cache layer - * - * @param {string} airdropAddress - airdrop address - * @param {Array} userAddressArray - user address array - * - * @return {Object} - formatted response - */ -async function getUserAirdropBalanceFromDB(airdropAddress, userAddressArray) { - - const airDropIdResponse = await getAirdropIdFromAirdropAddress(airdropAddress); - if (airDropIdResponse.isSuccess()) { - const airdropId = airDropIdResponse.data.airdropId; - const userAirdropDetailModel = new UserAirdropDetailKlass(); - - const queryResponse = await userAirdropDetailModel.getByUserAddresses(airdropId, userAddressArray); - - var responseData = {}; - if (queryResponse.isSuccess()) { - responseData = queryResponse.data; - } - var data = {}; - for (var i = userAddressArray.length - 1; i >= 0; i--) { - if(responseData[userAddressArray[i]]) { - data[userAddressArray[i]] = responseData[userAddressArray[i]]; - } else { - data[userAddressArray[i]] = { - totalAirdropAmount: '0', - totalAirdropUsedAmount: '0', - balanceAirdropAmount: '0' - }; - } - } - return responseHelper.successWithData(data); - } - return airDropIdResponse; -} - -/** - * Utitlity function to compare the airdrop balances from DB and cache - * - * @param {Object} dbBalance - airdrop balance from DB - * @param {Object} cacheBalance - airdrop balance from cache - * - */ -function validateDBandCacheAirdropBalances(dbBalance, cacheBalance) { - - const compare = function(obj1, obj2) { - assert.equal(obj1.totalAirdropAmount, obj2.totalAirdropAmount); - assert.equal(obj1.totalAirdropUsedAmount, obj2.totalAirdropUsedAmount); - assert.equal(obj1.balanceAirdropAmount, obj2.balanceAirdropAmount); - }; - - const dbUserKeys = Object.keys(dbBalance); - const cacheUserKeys = Object.keys(cacheBalance); - assert.equal(dbUserKeys.length, cacheUserKeys.length); - for (var i = dbUserKeys.length - 1; i >= 0; i--) { - const dbObject = dbBalance[dbUserKeys[i]]; - const cacheObject = cacheBalance[cacheUserKeys[i]]; - assert.isDefined(dbObject); - assert.isDefined(cacheObject); - compare(dbObject, cacheObject); - } -} - -/** - * Utitlity function to get balance of address from contract - * - * @param {Object} token - token - * @param {string} address - address whose balances need to be found - * - */ -async function getBalanceFromContract(token, address) { - var balances = {}; - for (var i = address.length - 1; i >= 0; i--) { - const addressKey = address[i]; - balances[addressKey] = new BigNumber(await token.balanceOf(addressKey)); - } - return balances; -} - -/** - * Utitlity function to get balance of address from cache - * - * @param {Object} token - token - * @param {string} address - address whose balances need to be found - * - */ -async function getBalanceFromCache(tokenObj, address) { - var balances = {}; - for (var i = address.length - 1; i >= 0; i--) { - const addressKey = address[i]; - const balance = await tokenObj.getBalanceOf(addressKey); - assert.equal(balance.isSuccess(), true); - balances[addressKey] = new BigNumber(balance.data.balance); - } - return balances; -} - -/** - * Utitlity function to compare balances from cache and contract - * - * @param {Object} contractBalances - balances from contract - * @param {Object} cacheBalance - balances from cache - * - */ - -function validateContractAndCacheBalance(cacheBalance, contractBalances) { - const contractKeys = Object.keys(cacheBalance); - const cacheKeys = Object.keys(contractBalances); - assert.equal(contractKeys.length, cacheKeys.length); - for (var i = contractKeys.length - 1; i >= 0; i--) { - const balanceFromContract = contractBalances[contractKeys[i]]; - const balanceFromCache = cacheBalance[contractKeys[i]]; - assert.isDefined(balanceFromContract); - assert.isDefined(balanceFromCache); - assert.equal(balanceFromCache.equals(balanceFromContract), true); - } -} - -/** - * Utitlity function to validate if airdrop was transfered successfully - * - * @param {string} accountAddress - user address - * @param {Object} initialAirdropBalance - Initial airdrop balance - * @param {Object} currentAirdropBalance - Current airdrop balance - * @param {BigNumber} airdropAmountTransfered - estimated airdrop amount that was transfered - */ -function validateAirdropTransferSuccess(accountAddress, initialAirdropBalance, currentAirdropBalance, airdropAmountTransfered) { - - const initialAirdropBalanceData = initialAirdropBalance.data[accountAddress]; - const currentAirdropBalanceData = currentAirdropBalance.data[accountAddress]; - - assert.isDefined(initialAirdropBalanceData); - assert.isDefined(currentAirdropBalanceData); - - const intialTotalAirdropAmount = new BigNumber(initialAirdropBalanceData.totalAirdropAmount); - const initialTotalAirdropUsedAmount = new BigNumber(initialAirdropBalanceData.totalAirdropUsedAmount); - const initialBalanceAirdropAmount = new BigNumber(initialAirdropBalanceData.balanceAirdropAmount); - - const totalAirdropAmount = new BigNumber(currentAirdropBalanceData.totalAirdropAmount); - const totalAirdropUsedAmount = new BigNumber(currentAirdropBalanceData.totalAirdropUsedAmount); - const balanceAirdropAmount = new BigNumber(currentAirdropBalanceData.balanceAirdropAmount); - - assert.equal(intialTotalAirdropAmount.equals(totalAirdropAmount), true); - assert.equal((initialTotalAirdropUsedAmount.plus(airdropAmountTransfered)).equals(totalAirdropUsedAmount), true); - assert.equal((initialBalanceAirdropAmount.minus(airdropAmountTransfered)).equals(balanceAirdropAmount), true); -} - -function validateTransferSuccess( - estimatedTokenAmount, - estimatedCommissionTokenAmount, - estimatedAirdropUsed, - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder, - initialBalances, - currentBalances) { - - assert.isDefined(estimatedTokenAmount); - assert.isDefined(estimatedCommissionTokenAmount); - assert.isDefined(estimatedAirdropUsed); - assert.isDefined(spenderAddress); - assert.isDefined(beneficiary); - assert.isDefined(commissionBeneficiary); - assert.isDefined(airdropBudgetHolder); - assert.isDefined(initialBalances); - assert.isDefined(currentBalances); - - const estimatedTotalAmount = estimatedTokenAmount.plus(estimatedCommissionTokenAmount); - const actualTransferAmount = estimatedTotalAmount.minus(estimatedAirdropUsed); - const calculatedBenficiaryAmount = initialBalances[beneficiary].plus(estimatedTokenAmount); - const calculatedCommisionAmount = initialBalances[commissionBeneficiary].plus(estimatedCommissionTokenAmount); - const calculatedSpenderAmount = initialBalances[spenderAddress].minus(actualTransferAmount); - const calculatesBugdetHolderAmount = initialBalances[airdropBudgetHolder].minus(estimatedAirdropUsed); - - assert.equal(calculatedBenficiaryAmount.equals(currentBalances[beneficiary]), true); - assert.equal(calculatedCommisionAmount.equals(currentBalances[commissionBeneficiary]), true); - assert.equal(calculatedSpenderAmount.equals(currentBalances[spenderAddress]), true); - assert.equal(calculatesBugdetHolderAmount.equals(currentBalances[airdropBudgetHolder]), true); -} - -/** - * Utitlity function to populate the cache of all test accounts - * - */ -async function populateCache() { - // Populate Cache - await brandedTokenObject.getBalanceOf(constants.account1); - await brandedTokenObject.getBalanceOf(constants.account2); - await brandedTokenObject.getBalanceOf(constants.account3); - await brandedTokenObject.getBalanceOf(constants.account4); - await brandedTokenObject.getBalanceOf(constants.account5); - await brandedTokenObject.getBalanceOf(constants.airdropBudgetHolder); -} -// Tests starts here -describe('Airdrop Pay', function() { - - it('should pass the initial checks', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(500000); - - // check if the address required for the testing are defined. - assert.isDefined(constants.deployer); - assert.isDefined(constants.ops); - assert.isDefined(constants.account1); - assert.isDefined(constants.workerAccount1); - assert.isDefined(constants.airdropBudgetHolder); - - assert.notEqual(constants.deployer, constants.ops); - assert.notEqual(constants.deployer, constants.account1); - assert.notEqual(constants.ops, constants.account1); - - // set worker - logger.info("============= Set worker ============="); - const currentBlockNumber = await web3RpcProvider.eth.getBlockNumber(); - await setWorker(constants.workerAccount1, new BigNumber(currentBlockNumber).plus(100000000000)); - - // Set Price Oracle - logger.info("============= Set Price Oracle ============="); - await setPriceOracle(airdropOstUsd, constants.currencyUSD, constants.priceOracles.OST.USD); - - // set accepted margin - logger.info("============= Set accepted margin ============="); - await setAcceptedMargin(airdropOstUsd, constants.currencyUSD, 50); - - // set balance for account 1 (Spender) - logger.info("============= Set account 1 balance ============="); - await setBalance(TC5, constants.account1, constants.account1InitialBrandedTokenBalance); - - // reset balance for account 2 to 100 - logger.info("============= Set account 2 balance ============="); - await setBalance(TC5, constants.account2, '100'); - - // reset balance for account 3 to 0 - logger.info("============= Set account 3 balance ============="); - await setBalance(TC5, constants.account3, '0'); - - // reset balance for account 4 to 0 - logger.info("============= Set account 4 balance ============="); - await setBalance(TC5, constants.account4, '0'); - - // reset balance of account airdropBudgetHolder to 0 - logger.info("============= Set airdropBudgetHolder balance ============="); - await setBalance(TC5, constants.airdropBudgetHolder, '0'); - - // Do Airdrop Setup if setup was not done - logger.info("============= Do Airdrop Setup if setup was not done ============="); - await registerAirdrop(constants.airdropOstUsdAddress); - - }); - - it('AirdropManager: transfer branded token from reserve to airdropBudgetHolder and approve airdrop contract', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(100000); - - const address = [ - constants.account1, - constants.airdropBudgetHolder - ]; - const initalBalancesFromContract = await getBalanceFromContract(TC5, address); - const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - - - // transfer amount - await transferTokenToAirdropBugetHolder(TC5, - constants.airdropOstUsdAddress, - constants.account1, - constants.accountPassphrase1, - constants.airdropBudgetHolder, - constants.airdropBudgetBrandedTokenBalance); - - const balanceFromContract = await getBalanceFromContract(TC5, address); - const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - - // approve - var approveToAirdropBudgetHolderResult = await airdropManager.approve( - constants.airdropOstUsdAddress, - constants.airdropBudgetHolderPassphrase, - constants.gasUsed, - constants.chainId, - constants.optionsReceipt - ); - logger.info("=======approveToAirdropBudgetHolderResult======="); - logger.info(approveToAirdropBudgetHolderResult); - - assert.equal(approveToAirdropBudgetHolderResult.isSuccess(), true); - // verify if the transaction receipt is valid - await utils.verifyTransactionReceipt(approveToAirdropBudgetHolderResult); - // verify if the transaction was actually mined - await utils.verifyIfMined(airdropOstUsd, approveToAirdropBudgetHolderResult.data.transaction_hash); - }); - - - it('AirdropManager: batch allocate to airdrop users and check user balance', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(10000); - - var airdropUsers = constants.airdropUsers; - airdropUsers[constants.account2] = {airdropAmount: '100000000000000000000', expiryTimestamp: 0}; - - // checks for cache and DB consistency - const beforeAllocationBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); - const beforeAllocationBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); - validateDBandCacheAirdropBalances(beforeAllocationBalanceFromDB.data, beforeAllocationBalanceFromCache.data); - - var batchAllocateAirdropAmountResult = await airdropManager.batchAllocate( - constants.airdropOstUsdAddress, - transferToAirdropBudgetHolderTransactionHash, - airdropUsers, - constants.chainId - ); - - assert.equal(batchAllocateAirdropAmountResult.isSuccess(), true); - var airdropAllocationProofDetailModel = new airdropAllocationProofDetailKlass(); - var result = await airdropAllocationProofDetailModel.getByTransactionHash(transferToAirdropBudgetHolderTransactionHash); - var airdropAllocationProofDetailRecord = result[0]; - // airdrop_allocated_amount is less than or equal to airdrop_amount - assert.equal(new BigNumber(airdropAllocationProofDetailRecord.airdrop_allocated_amount).lte(new BigNumber(airdropAllocationProofDetailRecord.airdrop_amount)), true); - - - // checks for cache and DB consistency - const afterAllocationBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); - const afterAllocationBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, Object.keys(airdropUsers)); - validateDBandCacheAirdropBalances(afterAllocationBalanceFromDB.data, afterAllocationBalanceFromCache.data); - - // check if the airdrop balance reflects the proper value. - const allUserKeys = Object.keys(airdropUsers); - for (var i = allUserKeys.length - 1; i >= 0; i--) { - const userKey = allUserKeys[i]; - const initialTotalAirdropAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].totalAirdropAmount); - const initialTotalAirdropUsedAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].totalAirdropUsedAmount); - const initialBalanceAirdropAmount = new BigNumber(beforeAllocationBalanceFromDB.data[userKey].balanceAirdropAmount); - - const totalAirdropAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].totalAirdropAmount); - const totalAirdropUsedAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].totalAirdropUsedAmount); - const balanceAirdropAmount = new BigNumber(afterAllocationBalanceFromDB.data[userKey].balanceAirdropAmount); - - assert.equal((initialTotalAirdropAmount.plus(new BigNumber(airdropUsers[userKey].airdropAmount))).equals(totalAirdropAmount), true); - - assert.equal(initialTotalAirdropUsedAmount.equals(totalAirdropUsedAmount), true); - assert.equal(initialTotalAirdropUsedAmount.equals(0), true); - - assert.equal((initialBalanceAirdropAmount.plus(new BigNumber(airdropUsers[userKey].airdropAmount))).equals(balanceAirdropAmount), true); - } - }); - - - it('should fail when worker is not whitelisted', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(100000); - - // Populate Cache - populateCache(); - - const beneficiary = constants.account3 - , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.9')) - , commissionBeneficiary = constants.account4 - , currency = constants.currencyUSD - , transferAmount = new BigNumber(airdropOstUsd.toWei('1.18')) - , spenderAddress = constants.account2 - , spenderPassphrase = constants.accountPassphrase2 - , airdropBudgetHolder = constants.airdropBudgetHolder - ; - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract ============="); - const address = [ - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder - ]; - const initalBalancesFromContract = await getBalanceFromContract(TC5, address); - const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); - const airdropUserAddress = [spenderAddress]; - const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); - - var airdropBalanceResult = await airdropManager.getAirdropBalance( - constants.chainId, - constants.airdropOstUsdAddress, - [spenderAddress] - ); - assert.equal(airdropBalanceResult.isSuccess(), true); - const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); - - const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( - transferAmount, - commissionAmount, - currency); - assert.equal(estimatedValues.isSuccess(), true); - - const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); - const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); - const intendedPricePoint = estimatedValues.data.pricePoint; - - const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); - - const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); - logger.info("============ estimatedAirdropUsed ============"); - logger.info(estimatedAirdropUsed); - - // Approve account1 for transfer - const accountApproveResponse = await TC5.approve( - spenderAddress, - spenderPassphrase, - constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100), - constants.gasUsed); - - logger.info("============spender approving to contract============="); - logger.info(accountApproveResponse); - var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); - logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); - - const payResponse = await airdropOstUsd.pay( - constants.ops, - constants.opsPassphrase, - beneficiary, - transferAmount.toString(10), - commissionBeneficiary, - commissionAmount.toString(10), - currency, - intendedPricePoint, - spenderAddress, - constants.gasUsed, - constants.optionsReceipt); - - assert.equal(payResponse.isFailure(), true); - logger.info("============airdrop.pay response============="); - logger.info(payResponse); - - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); - const balanceFromContract = await getBalanceFromContract(TC5, address); - const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - //check if the initial and current balances are reverted properly - validateContractAndCacheBalance(initalBalancesFromContract, balanceFromContract); - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); - const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); - // validate if the airdrop transfer was reverted properly - validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, airdropBalanceFromDB.data); - - }); - - it('should pass when transfer amount is less than available airdrop amount', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(100000); - - // Populate Cache - populateCache(); - - const beneficiary = constants.account3 - , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.7')) - , commissionBeneficiary = constants.account4 - , currency = constants.currencyUSD - , transferAmount = new BigNumber(airdropOstUsd.toWei('1.91')) - , spenderAddress = constants.account2 - , spenderPassphrase = constants.accountPassphrase2 - , airdropBudgetHolder = constants.airdropBudgetHolder - ; - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract ============="); - const address = [ - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder - ]; - const initalBalancesFromContract = await getBalanceFromContract(TC5, address); - const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); - const airdropUserAddress = [spenderAddress]; - const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); - - var airdropBalanceResult = await airdropManager.getAirdropBalance( - constants.chainId, - constants.airdropOstUsdAddress, - [spenderAddress] - ); - assert.equal(airdropBalanceResult.isSuccess(), true); - const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); - - const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( - transferAmount, - commissionAmount, - currency); - assert.equal(estimatedValues.isSuccess(), true); - - const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); - const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); - const intendedPricePoint = estimatedValues.data.pricePoint; - - const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); - - const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); - logger.info("============ estimatedAirdropUsed ============"); - logger.info(estimatedAirdropUsed); - // here we make sure that airdrop amount used will be greater than 0 - assert.equal(estimatedAirdropUsed.gt(0), true); - // Approve account1 for transfer - const accountApproveResponse = await TC5.approve( - spenderAddress, - spenderPassphrase, - constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100), - constants.gasUsed); - - logger.info("============spender approving to contract============="); - logger.info(accountApproveResponse); - var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); - logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); - - const payResponse = await airdropOstUsd.pay( - constants.workerAccount1, - constants.workerAccountPassphrase1, - beneficiary, - transferAmount.toString(10), - commissionBeneficiary, - commissionAmount.toString(10), - currency, - intendedPricePoint, - spenderAddress, - constants.gasUsed, - constants.optionsReceipt); - - assert.equal(payResponse.isSuccess(), true); - logger.info("============airdrop.pay response============="); - logger.info(payResponse); - - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(payResponse); - // verify if the transaction is actually mined - await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); - - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); - const balanceFromContract = await getBalanceFromContract(TC5, address); - const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - //check if the transfer was propre - validateTransferSuccess( - estimatedTokenAmount, - estimatedCommissionTokenAmount, - estimatedAirdropUsed, - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder, - initalBalancesFromContract, - balanceFromContract); - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); - const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); - // validate if the airdrop transfer was proper - validateAirdropTransferSuccess( - spenderAddress, - initialAirdropBalanceFromDB, - airdropBalanceFromDB, - estimatedAirdropUsed); - - }); - - // This is with an assumption that pervious test was passed and due to that constants.account3 has some balance - it('should pass when airdrop amount is 0', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(100000); - - // Populate Cache - populateCache(); - - const beneficiary = constants.account1 - , commissionAmount = new BigNumber(airdropOstUsd.toWei('0.0000000001')) - , commissionBeneficiary = constants.account4 - , currency = constants.currencyUSD - , transferAmount = new BigNumber(airdropOstUsd.toWei('0.000000033')) - , spenderAddress = constants.account3 - , spenderPassphrase = constants.accountPassphrase3 - , airdropBudgetHolder = constants.airdropBudgetHolder - ; - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract ============="); - const address = [ - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder - ]; - const initalBalancesFromContract = await getBalanceFromContract(TC5, address); - const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); - const airdropUserAddress = [spenderAddress]; - const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); - - var airdropBalanceResult = await airdropManager.getAirdropBalance( - constants.chainId, - constants.airdropOstUsdAddress, - [spenderAddress] - ); - assert.equal(airdropBalanceResult.isSuccess(), true); - // this line is to make sure that the airdropBalance is not availalbe for the user. This is because this user was never allocated airdrop. - assert.isUndefined(airdropBalanceResult.data[spenderAddress]); - const availableAirdropBalance = new BigNumber(0); - - const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( - transferAmount, - commissionAmount, - currency); - assert.equal(estimatedValues.isSuccess(), true); - - const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); - const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); - const intendedPricePoint = estimatedValues.data.pricePoint; - - const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); - - const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); - logger.info("============ estimatedAirdropUsed ============"); - logger.info(estimatedAirdropUsed); - // Here we make sure that the airdrop amount is 0; - assert.equal(estimatedAirdropUsed.equals(0), true); - // Approve account1 for transfer - const accountApproveResponse = await TC5.approve( - spenderAddress, - spenderPassphrase, - constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100), - constants.gasUsed); - - logger.info("============spender approving to contract============="); - logger.info(accountApproveResponse); - var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); - logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); - - const payResponse = await airdropOstUsd.pay( - constants.workerAccount1, - constants.workerAccountPassphrase1, - beneficiary, - transferAmount.toString(10), - commissionBeneficiary, - commissionAmount.toString(10), - currency, - intendedPricePoint, - spenderAddress, - constants.gasUsed, - constants.optionsReceipt); - - assert.equal(payResponse.isSuccess(), true); - logger.info("============airdrop.pay response============="); - logger.info(payResponse); - - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(payResponse); - // verify if the transaction is actually mined - await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); - - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); - const balanceFromContract = await getBalanceFromContract(TC5, address); - const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - //check if the transfer was propre - validateTransferSuccess( - estimatedTokenAmount, - estimatedCommissionTokenAmount, - estimatedAirdropUsed, - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder, - initalBalancesFromContract, - balanceFromContract); - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); - const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); - // validate if the airdrop transfer was proper - validateAirdropTransferSuccess( - spenderAddress, - initialAirdropBalanceFromDB, - airdropBalanceFromDB, - estimatedAirdropUsed); - }); - - it('should pass when all airdrop amount is used and partial user balance is used', async function() { - // eslint-disable-next-line no-invalid-this - this.timeout(100000); - - // Populate Cache - populateCache(); - const spenderAddress = constants.account2 - , spenderPassphrase = constants.accountPassphrase2 - ; - - var airdropBalanceResult = await airdropManager.getAirdropBalance( - constants.chainId, - constants.airdropOstUsdAddress, - [spenderAddress] - ); - assert.equal(airdropBalanceResult.isSuccess(), true); - - const availableAirdropBalance = new BigNumber(airdropBalanceResult.data[spenderAddress].balanceAirdropAmount); - const partialAmount = new BigNumber(10); - - const beneficiary = constants.account3 - , commissionAmount = partialAmount - , commissionBeneficiary = constants.account4 - , currency = constants.currencyUSD - , transferAmount = availableAirdropBalance.div(6).floor() - , airdropBudgetHolder = constants.airdropBudgetHolder - ; - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract ============="); - const address = [ - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder - ]; - const initalBalancesFromContract = await getBalanceFromContract(TC5, address); - const initalBalancesCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(initalBalancesFromContract, initalBalancesCache); - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB ============="); - const airdropUserAddress = [spenderAddress]; - const initialAirdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const initialAirdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(initialAirdropBalanceFromDB.data, initialAirdropBalanceFromCache.data); - - const estimatedValues = await airdropOstUsd.getPricePointAndCalculatedAmounts( - transferAmount, - commissionAmount, - currency); - assert.equal(estimatedValues.isSuccess(), true); - - const estimatedTokenAmount = new BigNumber(estimatedValues.data.tokenAmount); - const estimatedCommissionTokenAmount = new BigNumber(estimatedValues.data.commissionTokenAmount); - const intendedPricePoint = estimatedValues.data.pricePoint; - - const estimatedTotalAmount = new BigNumber(0).plus(estimatedTokenAmount).plus(estimatedCommissionTokenAmount); - - const estimatedAirdropUsed = BigNumber.min(estimatedTotalAmount, availableAirdropBalance); - logger.info("============ estimatedAirdropUsed ============"); - logger.info(estimatedAirdropUsed); - // here we make sure that airdrop amount used will be greater than 0 - assert.equal(estimatedAirdropUsed.gt(0), true); - // Approve account1 for transfer - const accountApproveResponse = await TC5.approve( - spenderAddress, - spenderPassphrase, - constants.airdropOstUsdAddress, - estimatedTotalAmount.plus(100), - constants.gasUsed); - - logger.info("============spender approving to contract============="); - logger.info(accountApproveResponse); - var worker1Balance = await web3RpcProvider.eth.getBalance(constants.workerAccount1); - logger.info("\nconstants.workerAccount1.balance: ", worker1Balance); - - const payResponse = await airdropOstUsd.pay( - constants.workerAccount1, - constants.workerAccountPassphrase1, - beneficiary, - transferAmount.toString(10), - commissionBeneficiary, - commissionAmount.toString(10), - currency, - intendedPricePoint, - spenderAddress, - constants.gasUsed, - constants.optionsReceipt); - - assert.equal(payResponse.isSuccess(), true); - logger.info("============airdrop.pay response============="); - logger.info(payResponse); - - // verify if the transaction receipt is valid - utils.verifyTransactionReceipt(payResponse); - // verify if the transaction is actually mined - await utils.verifyIfMined(airdropOstUsd, payResponse.data.transaction_hash); - - - // checks for account balance cache and DB consistency - logger.info("============ Validating consistency for account balance form cache and contract after pay ============="); - const balanceFromContract = await getBalanceFromContract(TC5, address); - const balancesFromCache = await getBalanceFromCache(brandedTokenObject, address); - validateContractAndCacheBalance(balanceFromContract, balancesFromCache); - //check if the transfer was propre - validateTransferSuccess( - estimatedTokenAmount, - estimatedCommissionTokenAmount, - estimatedAirdropUsed, - spenderAddress, - beneficiary, - commissionBeneficiary, - airdropBudgetHolder, - initalBalancesFromContract, - balanceFromContract); - - // checks for airdrop balance cache and DB consistency - logger.info("============ Validating consistency for airdrop balance form cache and DB after pay ============="); - const airdropBalanceFromDB = await getUserAirdropBalanceFromDB(constants.airdropOstUsdAddress, airdropUserAddress); - const airdropBalanceFromCache = await getUserAirdropBalanceFromCache(constants.airdropOstUsdAddress, airdropUserAddress); - validateDBandCacheAirdropBalances(airdropBalanceFromDB.data, airdropBalanceFromCache.data); - // validate if the airdrop transfer was proper - validateAirdropTransferSuccess( - spenderAddress, - initialAirdropBalanceFromDB, - airdropBalanceFromDB, - estimatedAirdropUsed); - - }); - - - it('Airdrop.Pay: It exits', async function() { - process.exit(0); - }); - - -}); \ No newline at end of file From 0d229db56b90cfe7ea8b5db9fb26905706977c3d Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Fri, 16 Mar 2018 02:39:28 +0530 Subject: [PATCH 006/115] debug level logging --- app/models/user_airdrop_detail.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/user_airdrop_detail.js b/app/models/user_airdrop_detail.js index b01f59f..bdda74b 100644 --- a/app/models/user_airdrop_detail.js +++ b/app/models/user_airdrop_detail.js @@ -39,8 +39,8 @@ const UserAirdropDetailKlassPrototype = { */ getByUserAddresses: async function (airdropId, userAddresses) { var oThis = this; - logger.info("========user_airdrop_detail.getByUserAddresses().userAddresses========="); - logger.info(userAddresses); + logger.debug("========user_airdrop_detail.getByUserAddresses().userAddresses========="); + logger.debug(userAddresses); return new Promise(async function (onResolve, onReject) { var result = {} , userAirdropDetail = {} @@ -58,7 +58,7 @@ const UserAirdropDetailKlassPrototype = { for (var i in userAddresses) { userAddressesMap[userAddresses[i].toLowerCase()] = userAddresses[i]; } - logger.info("userAddressesMap ", userAddressesMap); + logger.debug("userAddressesMap ", userAddressesMap); for (var uadIndex in userAirdropDetailResultArray) { userAirdropDetail = userAirdropDetailResultArray[uadIndex]; @@ -73,8 +73,8 @@ const UserAirdropDetailKlassPrototype = { balanceAirdropAmount: balanceAirdropAmount.toString(10) }; } - logger.info("========user_airdrop_detail.getByUserAddresses().result========="); - logger.info(result); + logger.debug("========user_airdrop_detail.getByUserAddresses().result========="); + logger.debug(result); return onResolve(responseHelper.successWithData(result)); } catch (error) { return onResolve(responseHelper.error('a_m_uad_1', 'error:' + error)); From aa29268a0b7a776dc308e1f8fd03a023ce1de8aa Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Fri, 16 Mar 2018 20:05:09 +0530 Subject: [PATCH 007/115] Bug fix for "Exception when converting Number to BigNumber with high precision" --- CHANGELOG.md | 5 +++++ VERSION | 2 +- lib/contract_interact/airdrop.js | 2 +- package.json | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7d2d9..42eddc5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## OpenST-platform v1.0.1 + +Changelog: +- Fixed - Exception coming when converting Number to BigNumber with high precision + ## OpenST-Payments v1.0.0 (14 March 2018) OpenST-Payments 1.0.0 is the first release of OpenST-Payments. It provides `Airdrop` and `Pricer` contracts for token transfers, defines a `PriceOracle` interface, and introduces the concept of `Workers`. diff --git a/VERSION b/VERSION index afaf360..7f20734 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.1 \ No newline at end of file diff --git a/lib/contract_interact/airdrop.js b/lib/contract_interact/airdrop.js index 8c1e47c..8bfcab9 100644 --- a/lib/contract_interact/airdrop.js +++ b/lib/contract_interact/airdrop.js @@ -172,7 +172,7 @@ Airdrop.prototype.pay = async function (senderWorkerAddress, senderWorkerPassphr web3RpcProvider.utils.asciiToHex(currency), intendedPricePoint, spender, - userAirdropAmount.toString()); + userAirdropAmount.toString(10)); const notificationData = helper.getNotificationData( ['transfer.payments.airdrop.pay'], diff --git a/package.json b/package.json index a48816e..616f011 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.0", + "version": "1.0.1", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 358cb496fbb6e8b7eb82955ec4b8f60cab5afd6d Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 19 Mar 2018 11:32:16 +0530 Subject: [PATCH 008/115] Changelog updated --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7d2d9..f505a83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,13 @@ +## OpenST-Payments v1.0.2 + +Changelog: +- Airdrop table caching and integration + +## OpenST-Payments v1.0.1 + +Changelog: +- Fixed - Exception coming when converting Number to BigNumber with high precision + ## OpenST-Payments v1.0.0 (14 March 2018) OpenST-Payments 1.0.0 is the first release of OpenST-Payments. It provides `Airdrop` and `Pricer` contracts for token transfers, defines a `PriceOracle` interface, and introduces the concept of `Workers`. From e4d2eb3d0f8eb12fe3200e0da770196b34cdb7aa Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 19 Mar 2018 11:52:45 +0530 Subject: [PATCH 009/115] Bump up --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 616f011..018f043 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.1", + "version": "1.0.2", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From f550b671272cda2284baab7d57ff576aa1e61d41 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 19 Mar 2018 12:38:43 +0530 Subject: [PATCH 010/115] Enable mocha test Airdrop.pay.exit --- mocha_test/services/airdrop/pay.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mocha_test/services/airdrop/pay.js b/mocha_test/services/airdrop/pay.js index 82c8119..8cde883 100644 --- a/mocha_test/services/airdrop/pay.js +++ b/mocha_test/services/airdrop/pay.js @@ -1118,9 +1118,9 @@ describe('Airdrop Pay', function() { }); - // it('Airdrop.Pay: It exits', async function() { - // process.exit(0); - // }); + it('Airdrop.Pay: It exits', async function() { + process.exit(0); + }); }); \ No newline at end of file From 2193ab5a1398838922b5ae3c9f0b1848fe3556f8 Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Mon, 19 Mar 2018 14:20:12 +0530 Subject: [PATCH 011/115] Added error code for insufficient gas fund and transaction receipt with status 0 --- CHANGELOG.md | 6 ++++++ lib/contract_interact/helper.js | 18 +++++++++++------- package.json | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f505a83..fe43bbb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## OpenST-Payments v1.0.3 + +Changelog: +- Added error code for insufficient gas fund +- Added error code for transaction receipt with status 0 + ## OpenST-Payments v1.0.2 Changelog: diff --git a/lib/contract_interact/helper.js b/lib/contract_interact/helper.js index 7403989..fbbe9f6 100644 --- a/lib/contract_interact/helper.js +++ b/lib/contract_interact/helper.js @@ -443,16 +443,16 @@ ContractInteractHelper.prototype = { transaction_receipt: receipt }); }; - const onReceiptFail = async function (errorReason, receipt) { + const onReceiptFail = async function (errorCode, errorReason, receipt) { // call fail callback if (failCallback != undefined && failCallback != null) { logger.debug("======helper.Calling failCallback======="); await failCallback(receipt); } notifyTransactionError(errorReason); - const errorCode = params.errorCode || "l_ci_h_pse"; + const code = `${params.errorCode}|${errorCode}`; const errorMessage = (errorReason && errorReason.message) ? errorReason.message : `Something went wrong: l_ci_h_pse`; - return responseHelper.error(errorCode, errorMessage); + return responseHelper.error(code, errorMessage); }; const onReceipt = function(receipt) { @@ -462,7 +462,7 @@ ContractInteractHelper.prototype = { return onReceiptSuccess(receipt); } else { const errorReason = "Transaction status is 0"; - return onReceiptFail(errorReason, receipt); + return onReceiptFail('l_ci_h_pse_status_0', errorReason, receipt); } }; @@ -500,7 +500,7 @@ ContractInteractHelper.prototype = { } } else { const errorReason = "Unable to get receipt"; - const receiptFailResponse = onReceiptFail(errorReason, {}); + const receiptFailResponse = onReceiptFail('l_ci_h_pse_1', errorReason, {}); if (isValueReturned == false) { isValueReturned = true; return onResolve(receiptFailResponse); @@ -509,7 +509,11 @@ ContractInteractHelper.prototype = { }); } else { - const receiptFailResponse =onReceiptFail(reason, {}); + var errorCode = 'l_ci_h_pse_2'; + if (reason && reason.message && reason.message.includes('insufficient funds for gas * price + value')) { + errorCode = 'l_ci_h_pse_gas_low'; + } + const receiptFailResponse =onReceiptFail(errorCode, reason, {}); if (isValueReturned == false) { isValueReturned = true; return onResolve(receiptFailResponse); @@ -519,7 +523,7 @@ ContractInteractHelper.prototype = { }) .catch(function(reason) { logger.error(`\n=======Exception at location 2========: ${reason} \n`); - const receiptFailResponse =onReceiptFail(reason, {}); + const receiptFailResponse =onReceiptFail('l_ci_h_pse_3', reason, {}); if (isValueReturned == false) { isValueReturned = true; return onResolve(receiptFailResponse); diff --git a/package.json b/package.json index 018f043..d5d8d44 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.2", + "version": "1.0.3", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 884895be7c407c1871c606a0f7eb4c5b0377db93 Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Tue, 20 Mar 2018 16:25:59 +0530 Subject: [PATCH 012/115] Changed error message for low balance and low gas balance --- lib/contract_interact/airdrop.js | 2 +- lib/contract_interact/helper.js | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/contract_interact/airdrop.js b/lib/contract_interact/airdrop.js index 8bfcab9..80e8dfb 100644 --- a/lib/contract_interact/airdrop.js +++ b/lib/contract_interact/airdrop.js @@ -142,7 +142,7 @@ Airdrop.prototype.pay = async function (senderWorkerAddress, senderWorkerPassphr logger.debug(`\nuserInitialBalance.plus(airdropAmountToUse): ${(userInitialBalance.plus(airdropAmountToUse)).toString(10)}`); if ((userInitialBalance.plus(airdropAmountToUse)).lt(totalAmount)) { - return Promise.resolve(responseHelper.error('l_ci_a_pay_2', 'insufficient balance for the transaction. (spender+airdropAmountToUse) balance is insufficient for transaction.')); + return Promise.resolve(responseHelper.error('l_ci_a_pay_2', 'insufficient balance')); } var brandedTokenAddress = null; diff --git a/lib/contract_interact/helper.js b/lib/contract_interact/helper.js index fbbe9f6..6099411 100644 --- a/lib/contract_interact/helper.js +++ b/lib/contract_interact/helper.js @@ -509,11 +509,13 @@ ContractInteractHelper.prototype = { }); } else { + var errorReason = reason; var errorCode = 'l_ci_h_pse_2'; if (reason && reason.message && reason.message.includes('insufficient funds for gas * price + value')) { errorCode = 'l_ci_h_pse_gas_low'; + errorReason = {message: "insufficient gas"} } - const receiptFailResponse =onReceiptFail(errorCode, reason, {}); + const receiptFailResponse =onReceiptFail(errorCode, errorReason, {}); if (isValueReturned == false) { isValueReturned = true; return onResolve(receiptFailResponse); From a9687f435b0b40fc632758a17804961e5745b2fe Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Tue, 20 Mar 2018 16:28:20 +0530 Subject: [PATCH 013/115] Updated change logs --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe43bbb..ffc8ca7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## OpenST-Payments v1.0.4 + +Changelog: +- Changed error message when insufficient balance +- Changed error message when insufficient gas + ## OpenST-Payments v1.0.3 Changelog: diff --git a/package.json b/package.json index d5d8d44..2fbf948 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.3", + "version": "1.0.4", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 9ab3cfb932fcba5d0ed6ea670a32ebbd47522265 Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Wed, 21 Mar 2018 19:02:01 +0530 Subject: [PATCH 014/115] Updated code for error message --- lib/contract_interact/helper.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/contract_interact/helper.js b/lib/contract_interact/helper.js index 6099411..2ee294e 100644 --- a/lib/contract_interact/helper.js +++ b/lib/contract_interact/helper.js @@ -509,13 +509,12 @@ ContractInteractHelper.prototype = { }); } else { - var errorReason = reason; var errorCode = 'l_ci_h_pse_2'; if (reason && reason.message && reason.message.includes('insufficient funds for gas * price + value')) { errorCode = 'l_ci_h_pse_gas_low'; - errorReason = {message: "insufficient gas"} + reason.message = "insufficient gas" } - const receiptFailResponse =onReceiptFail(errorCode, errorReason, {}); + const receiptFailResponse =onReceiptFail(errorCode, reason, {}); if (isValueReturned == false) { isValueReturned = true; return onResolve(receiptFailResponse); From 3ba6b6a028a320c2b738b04fd7d8031a66dc3c4c Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Wed, 21 Mar 2018 19:23:43 +0530 Subject: [PATCH 015/115] Updated package.json and travis.yml --- .travis.yml | 3 ++- package.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index df3066b..99343a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ branches: only: - master - develop + - deepesh/geth_version_update notifications: email: recipients: @@ -23,7 +24,7 @@ before_install: - sudo apt-get install software-properties-common - sudo add-apt-repository -y ppa:ethereum/ethereum - sudo apt-get update - - sudo bash mocha_test/scripts/install_geth_1_7_3.sh + - sudo apt-get install ethereum - sudo apt-get install solc - geth version install: diff --git a/package.json b/package.json index 2fbf948..52c1245 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "mustache": "2.3.0", "mysql": "2.14.1", "shortid": "2.2.8", - "web3": "1.0.0-beta.26" + "web3": "1.0.0-beta.33" }, "devDependencies": { "abi-decoder": "1.0.9", From 1ced392329626168d711128386144d8b405ba9b2 Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Wed, 21 Mar 2018 22:01:55 +0530 Subject: [PATCH 016/115] Version updated to 1.0.4-beta.1 --- .travis.yml | 1 - package.json | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99343a0..bccdfeb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ branches: only: - master - develop - - deepesh/geth_version_update notifications: email: recipients: diff --git a/package.json b/package.json index 52c1245..d321f96 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.4", + "version": "1.0.4-beta.1", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 9a3a77887551b85f3b11cc9941f84ab1c234e85c Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 22 Mar 2018 16:27:47 +0530 Subject: [PATCH 017/115] Validate if reserve has sufficient balance for transfer --- CHANGELOG.md | 5 +++++ VERSION | 2 +- lib/airdrop_management/transfer.js | 14 ++++++++++++++ package.json | 2 +- 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffc8ca7..25654f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## OpenST-Payments v1.0.5 + +Changelog: +- while transferring from reserve to airdrop budget holder validate if reserve has sufficient balance. + ## OpenST-Payments v1.0.4 Changelog: diff --git a/VERSION b/VERSION index 7f20734..1464c52 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 \ No newline at end of file +1.0.5 \ No newline at end of file diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index aea672e..1a06dd1 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -15,6 +15,7 @@ const rootPrefix = '../..' , basicHelper = require(rootPrefix + '/helpers/basic_helper') , logger = require(rootPrefix + '/helpers/custom_console_logger') , AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') + , BrandedTokenKlass = require(rootPrefix + '/lib/contract_interact/branded_token') ; /** @@ -128,6 +129,19 @@ transfer.prototype = { return onResolve(responseHelper.error('l_am_v_vp_7', 'ChainId is invalid')); } + const brandedTokenObject = new BrandedTokenKlass(oThis.brandedTokenContractAddress, oThis.chainId); + const senderBalanceResponse = await brandedTokenObject.getBalanceOf(oThis.senderAddress); + + if (senderBalanceResponse.isFailure()) { + return onResolve(responseHelper.error('l_am_v_vp_8', 'Error while getting sender balance')); + } + + const senderBalance = new BigNumber(senderBalanceResponse.data.balance); + logger.info("senderBalance: "+senderBalance.toString(10), "amount to transfer: "+amountInBigNumber); + if (senderBalance.lt(amountInBigNumber)){ + return onResolve(responseHelper.error('l_am_v_vp_9', 'Sender balance: '+ senderBalance.toString(10) +' is not enough to transfer amount: '+amountInBigNumber.toString(10))); + } + return onResolve(responseHelper.successWithData({})); }); diff --git a/package.json b/package.json index d321f96..f4e45e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.4-beta.1", + "version": "1.0.5", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 152f890657fe4c493b1be046443253789f017415 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 22 Mar 2018 16:32:46 +0530 Subject: [PATCH 018/115] remove logger --- lib/airdrop_management/transfer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index 1a06dd1..a34483a 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -137,7 +137,7 @@ transfer.prototype = { } const senderBalance = new BigNumber(senderBalanceResponse.data.balance); - logger.info("senderBalance: "+senderBalance.toString(10), "amount to transfer: "+amountInBigNumber); + //logger.debug("senderBalance: "+senderBalance.toString(10), "amount to transfer: "+amountInBigNumber); if (senderBalance.lt(amountInBigNumber)){ return onResolve(responseHelper.error('l_am_v_vp_9', 'Sender balance: '+ senderBalance.toString(10) +' is not enough to transfer amount: '+amountInBigNumber.toString(10))); } From 98eff80559b64819273157888f319076b07c4cb4 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 22 Mar 2018 16:43:50 +0530 Subject: [PATCH 019/115] Update version, changelog and package.json --- CHANGELOG.md | 3 ++- VERSION | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25654f4..b67bf0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -## OpenST-Payments v1.0.5 +## OpenST-Payments 1.0.4.beta.2 Changelog: +- Upgrade Geth and Web3 version - while transferring from reserve to airdrop budget holder validate if reserve has sufficient balance. ## OpenST-Payments v1.0.4 diff --git a/VERSION b/VERSION index 1464c52..a6a3a43 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.5 \ No newline at end of file +1.0.4 \ No newline at end of file diff --git a/package.json b/package.json index f4e45e4..929089f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.5", + "version": "1.0.4.beta.2", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 35b3572e7ffbb3fb90ade4cf3ea275300672cc70 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Thu, 22 Mar 2018 17:12:49 +0530 Subject: [PATCH 020/115] correct version updated --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 929089f..c5dd35b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@openstfoundation/openst-payments", - "version": "1.0.4.beta.2", + "version": "1.0.4-beta.2", "description": "Payment infrastructure on top of the OpenST network.", "keywords": [ "openst", From 5a9bfe05c8d0a363b2e13202ecab0945c8a5bf27 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 26 Mar 2018 18:48:36 +0530 Subject: [PATCH 021/115] deployer moved as services --- index.js | 10 +- lib/airdrop_management/approve.js | 6 +- lib/airdrop_management/base.js | 6 +- lib/airdrop_management/batch_allocator.js | 6 +- lib/airdrop_management/register.js | 6 +- lib/airdrop_management/transfer.js | 6 +- lib/set_worker_and_ops.js | 16 +-- mocha_test/scripts/deploy_all.sh | 32 ++--- mocha_test/services/airdrop/pay.js | 3 +- {lib => services}/deployer.js | 149 +++++++++++----------- tools/deploy/EIP20TokenMock.js | 38 +++--- tools/deploy/airdrop.js | 42 +++--- tools/deploy/helper.js | 1 + tools/deploy/pricer.js | 36 +++--- tools/deploy/workers.js | 24 ++-- 15 files changed, 197 insertions(+), 184 deletions(-) rename {lib => services}/deployer.js (65%) diff --git a/index.js b/index.js index 9f0ac20..2eb25dc 100644 --- a/index.js +++ b/index.js @@ -1,16 +1,16 @@ +"use strict"; + /** * Index File of "@openstfoundation/openst-payments" node module */ -"use strict"; - const rootPrefix = "." , version = require(rootPrefix + '/package.json').version - , deployer = require(rootPrefix + '/lib/deployer') + , deployer = require(rootPrefix + '/services/deployer') , workers = require(rootPrefix + '/lib/contract_interact/workers') , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') , opsManaged = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") - , airdropManager = require(rootPrefix + "/lib/airdrop_management/base") + , airdropManagerKlass = require(rootPrefix + "/lib/airdrop_management/base") ; const OSTPayment = function () { @@ -21,7 +21,7 @@ const OSTPayment = function () { oThis.opsManaged = opsManaged; oThis.workers = workers; oThis.airdrop = airdrop; - oThis.airdropManager = airdropManager; + oThis.airdropManager = airdropManagerKlass; }; module.exports = new OSTPayment(); \ No newline at end of file diff --git a/lib/airdrop_management/approve.js b/lib/airdrop_management/approve.js index e2de9c0..71b197e 100644 --- a/lib/airdrop_management/approve.js +++ b/lib/airdrop_management/approve.js @@ -30,7 +30,7 @@ const rootPrefix = '../..' * @return {Object} * */ -const approve = module.exports = function(params) { +const ApproveKlass = function(params) { logger.debug("=========Approve.params========="); logger.debug(params.airdropContractAddress, params.gasPrice, params.chainId, params.options); const oThis = this; @@ -46,7 +46,7 @@ const approve = module.exports = function(params) { oThis.brandedTokenObject = null; }; -approve.prototype = { +ApproveKlass.prototype = { /** * Perform approve by airdrop budget holder to contract @@ -151,4 +151,4 @@ approve.prototype = { }; -module.exports = approve; \ No newline at end of file +module.exports = ApproveKlass; \ No newline at end of file diff --git a/lib/airdrop_management/base.js b/lib/airdrop_management/base.js index f155a54..8b6eb65 100644 --- a/lib/airdrop_management/base.js +++ b/lib/airdrop_management/base.js @@ -19,9 +19,9 @@ const rootPrefix = '../..' * @constructor * */ -const base = module.exports = function() {}; +const BaseKlass = function() {}; -base.prototype = { +BaseKlass.prototype = { /** * Register Airdrop @@ -144,5 +144,5 @@ base.prototype = { }; -module.exports = new base(); +module.exports = BaseKlass; diff --git a/lib/airdrop_management/batch_allocator.js b/lib/airdrop_management/batch_allocator.js index cda0165..113959a 100644 --- a/lib/airdrop_management/batch_allocator.js +++ b/lib/airdrop_management/batch_allocator.js @@ -30,7 +30,7 @@ const rootPrefix = '../..' * * @return {Object} */ -const batchAllocator = module.exports = function(params) { +const BatchAllocatorKlass = function(params) { logger.debug("\n=========batchAllocator.params========="); logger.debug(params); const oThis = this; @@ -49,7 +49,7 @@ const batchAllocator = module.exports = function(params) { oThis.userAddresses = []; }; -batchAllocator.prototype = { +BatchAllocatorKlass.prototype = { /** * Perform batch allocation to airdrop users @@ -230,4 +230,4 @@ batchAllocator.prototype = { }; -module.exports = batchAllocator; \ No newline at end of file +module.exports = BatchAllocatorKlass; \ No newline at end of file diff --git a/lib/airdrop_management/register.js b/lib/airdrop_management/register.js index e2414f8..3a91030 100644 --- a/lib/airdrop_management/register.js +++ b/lib/airdrop_management/register.js @@ -26,7 +26,7 @@ const rootPrefix = '../..' * @return {Object} * */ -const register = module.exports = function (params) { +const RegisterKlass = function (params) { logger.debug("=======register.params======="); logger.debug(params); this.airdropContractAddress = params.airdropContractAddress; @@ -34,7 +34,7 @@ const register = module.exports = function (params) { }; -register.prototype = { +RegisterKlass.prototype = { /** * Perform method @@ -132,5 +132,5 @@ register.prototype = { }; -module.exports = register; +module.exports = RegisterKlass; diff --git a/lib/airdrop_management/transfer.js b/lib/airdrop_management/transfer.js index a34483a..8b500f5 100644 --- a/lib/airdrop_management/transfer.js +++ b/lib/airdrop_management/transfer.js @@ -34,7 +34,7 @@ const rootPrefix = '../..' * @return {Object} * */ -const transfer = module.exports = function(params) { +const TransferKlass = function(params) { logger.debug("\n=========Transfer params========="); logger.debug(params); const oThis = this; @@ -51,7 +51,7 @@ const transfer = module.exports = function(params) { }; -transfer.prototype = { +TransferKlass.prototype = { /** * Perform method @@ -181,5 +181,5 @@ transfer.prototype = { }; -module.exports = transfer; +module.exports = TransferKlass; diff --git a/lib/set_worker_and_ops.js b/lib/set_worker_and_ops.js index fdee9f5..509c0be 100644 --- a/lib/set_worker_and_ops.js +++ b/lib/set_worker_and_ops.js @@ -8,7 +8,7 @@ const rootPrefix = ".." , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , logger = require(rootPrefix + '/helpers/custom_console_logger') - , Deployer = require(rootPrefix + '/lib/deployer') + , Deployer = require(rootPrefix + '/services/deployer') , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , coreAddresses = require(rootPrefix + '/config/core_addresses') , responseHelper = require(rootPrefix + '/lib/formatter/response') @@ -49,19 +49,19 @@ SetWorkerOps.prototype = { , gasPrice = (options || {}).gasPrice , chainId = (options || {}).chainId , constructorArgs = [] - , deployerInstance = new Deployer() , deployOptions = {returnType: returnTypes.transactionReceipt()} - ; + ; + const deployerInstance = new Deployer({ + contract_name: contractName, + constructor_args: constructorArgs, + gas_price: gasPrice, + options: deployOptions}); if(!gasPrice || !chainId){ return Promise.resolve(responseHelper.error("l_swao_2", "Gas price and Chain Id are mandatory")); } - const deployResult = await deployerInstance.deploy( - contractName, - constructorArgs, - gasPrice, - deployOptions); + const deployResult = await deployerInstance.perform(); if (deployResult.isSuccess()) { const contractAddress = deployResult.data.transaction_receipt.contractAddress; diff --git a/mocha_test/scripts/deploy_all.sh b/mocha_test/scripts/deploy_all.sh index 822d059..7475a23 100644 --- a/mocha_test/scripts/deploy_all.sh +++ b/mocha_test/scripts/deploy_all.sh @@ -6,57 +6,57 @@ sh ../contracts/compile.sh echo "\n********* Deploying test coin 1 *************" node ../tools/deploy/EIP20TokenMock.js 5 TC1 TestCoin1 18 0x12A05F200 travis tc1.txt -export OST_UTILITY_TEST_COIN1_C5_ADDRESS=$(cat ../lib/tc1.txt) +export OST_UTILITY_TEST_COIN1_C5_ADDRESS=$(cat ../tools/deploy/tc1.txt) echo '\nexport OST_UTILITY_TEST_COIN1_C5_ADDRESS='\'$OST_UTILITY_TEST_COIN1_C5_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tc1.txt +rm ../tools/deploy/tc1.txt echo "\n********* Done *************" echo "\n********* Deploying test coin 2 *************" . ./scripts/env_vars.sh node ../tools/deploy/EIP20TokenMock.js 2 TC2 TestCoin2 18 0x12A05F200 travis tc2.txt -export OST_UTILITY_TEST_COIN2_C2_ADDRESS=$(cat ../lib/tc2.txt) +export OST_UTILITY_TEST_COIN2_C2_ADDRESS=$(cat ../tools/deploy/tc2.txt) echo '\nexport OST_UTILITY_TEST_COIN2_C2_ADDRESS='\'$OST_UTILITY_TEST_COIN2_C2_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tc2.txt +rm ../tools/deploy/tc2.txt echo "\n********* Done *************" echo "\n********* Deploying test coin 3 *************" . ./scripts/env_vars.sh node ../tools/deploy/EIP20TokenMock.js 3 TC3 TestCoin3 10 0x12A05F200 travis tc3.txt -export OST_UTILITY_TEST_COIN3_C3_ADDRESS=$(cat ../lib/tc3.txt) +export OST_UTILITY_TEST_COIN3_C3_ADDRESS=$(cat ../tools/deploy/tc3.txt) echo '\nexport OST_UTILITY_TEST_COIN3_C3_ADDRESS='\'$OST_UTILITY_TEST_COIN3_C3_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tc3.txt +rm ../tools/deploy/tc3.txt echo "\n********* Done *************" echo "\n********* Deploying Pricer 1 *************" . ./scripts/env_vars.sh node ../tools/deploy/pricer.js $OST_UTILITY_TEST_COIN1_C5_ADDRESS OST 0x12A05F200 $OST_UTILITY_CHAIN_ID travis tp1.txt -export OST_UTILITY_TEST_PRICER_C5_ADDRESS=$(cat ../lib/tp1.txt) +export OST_UTILITY_TEST_PRICER_C5_ADDRESS=$(cat ../tools/deploy/tp1.txt) echo '\nexport OST_UTILITY_TEST_PRICER_C5_ADDRESS='\'$OST_UTILITY_TEST_PRICER_C5_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tp1.txt +rm ../tools/deploy/tp1.txt echo "\n********* Done *************" echo "\n********* Deploying Pricer 2 *************" . ./scripts/env_vars.sh node ../tools/deploy/pricer.js $OST_UTILITY_TEST_COIN2_C2_ADDRESS OST 0x12A05F200 $OST_UTILITY_CHAIN_ID travis tp2.txt -export OST_UTILITY_TEST_PRICER_C2_ADDRESS=$(cat ../lib/tp2.txt) +export OST_UTILITY_TEST_PRICER_C2_ADDRESS=$(cat ../tools/deploy/tp2.txt) echo '\nexport OST_UTILITY_TEST_PRICER_C2_ADDRESS='\'$OST_UTILITY_TEST_PRICER_C2_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tp2.txt +rm ../tools/deploy/tp2.txt echo "\n********* Done *************" echo "\n********* Deploying Pricer 3 *************" . ./scripts/env_vars.sh node ../tools/deploy/pricer.js $OST_UTILITY_TEST_COIN3_C3_ADDRESS OST 0x12A05F200 $OST_UTILITY_CHAIN_ID travis tp3.txt -export OST_UTILITY_TEST_PRICER_C3_ADDRESS=$(cat ../lib/tp3.txt) +export OST_UTILITY_TEST_PRICER_C3_ADDRESS=$(cat ../tools/deploy/tp3.txt) echo '\nexport OST_UTILITY_TEST_PRICER_C3_ADDRESS='\'$OST_UTILITY_TEST_PRICER_C3_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/tp3.txt +rm ../tools/deploy/tp3.txt echo "\n********* Done *************" echo "\n********* Deploying Worker Contract Address *************" node ../tools/deploy/workers.js 0x12A05F200 $OST_UTILITY_CHAIN_ID travis w1.txt -export OST_UTILITY_WORKER_CONTRACT_ADDRESS=$(cat ../lib/w1.txt) +export OST_UTILITY_WORKER_CONTRACT_ADDRESS=$(cat ../tools/deploy/w1.txt) echo '\nexport OST_UTILITY_WORKER_CONTRACT_ADDRESS='\'$OST_UTILITY_WORKER_CONTRACT_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/w1.txt +rm ../tools/deploy/w1.txt echo "\n********* Done *************" echo "\n Sourcing env_vars again" @@ -65,9 +65,9 @@ echo "\n Sourcing env_vars again" echo "\n********* Deploying Airdrop Contract Address *************" . ./scripts/env_vars.sh node ../tools/deploy/airdrop.js $OST_UTILITY_TEST_COIN1_C5_ADDRESS OST $OST_UTILITY_WORKER_CONTRACT_ADDRESS $OST_AIRDROP_BUDGET_HOLDER 0x12A05F200 $OST_UTILITY_CHAIN_ID travis ad1.txt -export OST_UTILITY_TEST_AIRDROP1_CONTRACT_ADDRESS=$(cat ../lib/ad1.txt) +export OST_UTILITY_TEST_AIRDROP1_CONTRACT_ADDRESS=$(cat ../tools/deploy/ad1.txt) echo '\nexport OST_UTILITY_TEST_AIRDROP1_CONTRACT_ADDRESS='\'$OST_UTILITY_TEST_AIRDROP1_CONTRACT_ADDRESS\'>>scripts/env_vars.sh -rm ../lib/ad1.txt +rm ../tools/deploy/ad1.txt echo "\n********* Done *************" diff --git a/mocha_test/services/airdrop/pay.js b/mocha_test/services/airdrop/pay.js index 8cde883..4e37195 100644 --- a/mocha_test/services/airdrop/pay.js +++ b/mocha_test/services/airdrop/pay.js @@ -23,7 +23,8 @@ const workersContract = new workers(constants.workersContractAddress, constants. const AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') - , airdropManager = require(rootPrefix + '/lib/airdrop_management/base') + , airdropManagerKlass = require(rootPrefix + '/lib/airdrop_management/base') + , airdropManager = new airdropManagerKlass() , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') , responseHelper = require(rootPrefix + '/lib/formatter/response') diff --git a/lib/deployer.js b/services/deployer.js similarity index 65% rename from lib/deployer.js rename to services/deployer.js index 49bfc82..05d3439 100644 --- a/lib/deployer.js +++ b/services/deployer.js @@ -1,58 +1,86 @@ +"use strict"; + /** * This is script for deploying any contract.

* - * Prerequisite: - *
    - *
  1. Deployer Address
    2. - *
- * + * @module services/deployer + */ + +const uuid = require('uuid') + , rootPrefix = '..' + , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') + , coreConstants = require(rootPrefix + '/config/core_constants') + , coreAddresses = require(rootPrefix + '/config/core_addresses') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , deployerName = 'deployer' +; + +/** + * Constructor to create object of deployer * + * @param {String} contract_name - name of contract + * @param {Object} constructor_args - contract deployment constructor arguments + * @param {String} gas_price - gas price + * @param {Object} options - deployment options * + * @constructor * - * @module lib/deployer */ +const DeployerKlass = function(params) { + logger.debug("\n=========deployer params========="); + logger.debug(params); + const oThis = this; + + oThis.contractName = params.contract_name; + oThis.constructorArgs = params.constructor_args; + oThis.gasPrice = params.gas_price; + oThis.options = params.options; +}; -const uuid = require('uuid'); -const fs = require('fs'); -const Path = require('path'); +DeployerKlass.prototype = { -const rootPrefix = '..'; -const web3Provider = require(rootPrefix + '/lib/web3/providers/rpc'); -const coreConstants = require(rootPrefix + '/config/core_constants'); -const coreAddresses = require(rootPrefix + '/config/core_addresses'); -const logger = require(rootPrefix + '/helpers/custom_console_logger'); -const responseHelper = require(rootPrefix + '/lib/formatter/response'); -const basicHelper = require(rootPrefix + '/helpers/basic_helper'); + /** + * Perform method + * + * @return {promise} - returns a promise which resolves to an object of kind Result + * + */ + perform: async function () { -const deployerName = 'deployer'; + const oThis = this; -/** - * @constructor - * - */ -const Deploy = module.exports = function () {}; + var r = null; + + r = await oThis.validateParams(); + logger.debug("\n=========Deployer.validateParams.result========="); + logger.debug(r); + if(r.isFailure()) return r; -Deploy.prototype = { + r = oThis.deploy(); + logger.debug("\n=========Deployer.deploy.result========="); + logger.debug(r); + return r; + + }, /** * Validate deploy parameters * - * @param {string} contractName - Contract name - * @param {BigNumber} gasPrice - Gas price - * - * @return {response} + * @return {result} - returns object of kind Result * */ - validateDeployParams: function( - contractName, - gasPrice) { + validateParams: function() { + + const oThis = this; - if (!contractName) { + if (!oThis.contractName) { logger.error("Error: Contract name is mandatory"); return responseHelper.error('l_d_1', 'Contract name is mandatory'); } - if (!gasPrice) { + if (!oThis.gasPrice) { logger.error("Error: Gas price is mandatory"); return responseHelper.error('l_d_2', 'Gas price is mandatory'); } @@ -76,56 +104,39 @@ Deploy.prototype = { /** * Deploy contract * - * @param {string} contractName - Contract name - pricer / airdrop / workers - * @param {Array} constructorArgs - Contract constructor params - * @param {BigNumber} gasPrice - Gas price - * @param {object} options - for params like returnType, tag. - * - * @return {response} + * @return {promise} - returns a promise which resolves to an object of kind Result * */ - deploy: function( - contractName, - constructorArgs, - gasPrice, - options) { + deploy: function() { const oThis = this; return new Promise(function (onResolve, onReject) { - logger.debug("Contract name: " + contractName); - logger.debug("Gas price: " + gasPrice); - logger.debug("Constructor arguments: " + constructorArgs); - - const validationResult = oThis.validateDeployParams( - contractName, - gasPrice); - - if (validationResult.isFailure()) { - return onResolve(validationResult); - } + logger.debug("Contract name: " + oThis.contractName); + logger.debug("Gas price: " + oThis.gasPrice); + logger.debug("Constructor arguments: " + oThis.constructorArgs); const txUUID = uuid.v4(); - const returnType = basicHelper.getReturnType(options.returnType); + const returnType = basicHelper.getReturnType(oThis.options.returnType); const asyncPerform = function () { const deployerAddress = coreAddresses.getAddressForUser(deployerName); const deployerAddrPassphrase = coreAddresses.getPassphraseForUser(deployerName); - const contractAbi = coreAddresses.getAbiForContract(contractName); - const contractBin = coreAddresses.getBinForContract(contractName); + const contractAbi = coreAddresses.getAbiForContract(oThis.contractName); + const contractBin = coreAddresses.getBinForContract(oThis.contractName); const txParams = { from: deployerAddress, data: (web3Provider.utils.isHexStrict(contractBin) ? "" : "0x") + contractBin, - gasPrice: gasPrice, + gasPrice: oThis.gasPrice, gas: coreConstants.OST_GAS_LIMIT }; - if (constructorArgs) { - txParams.arguments = constructorArgs; + if (oThis.constructorArgs) { + txParams.arguments = oThis.constructorArgs; } var contract = new web3Provider.eth.Contract( @@ -209,21 +220,9 @@ Deploy.prototype = { } }); - }, - - /** - * Write contract address to file based on parameter - * - * @param {String} fileName - file name - * @param {Hex} contractAddress - contract Address - * - * @return {} - */ - writeContractAddressToFile: function(fileName, contractAddress) { - // Write contract address to file - if ( fileName !== '') { - fs.writeFileSync(Path.join(__dirname, '/' + fileName), contractAddress); - } } + }; +module.exports = DeployerKlass; + diff --git a/tools/deploy/EIP20TokenMock.js b/tools/deploy/EIP20TokenMock.js index aeae046..58a16c8 100644 --- a/tools/deploy/EIP20TokenMock.js +++ b/tools/deploy/EIP20TokenMock.js @@ -1,3 +1,5 @@ +"use strict"; + /** * This is script for deploying Pricer contract on any chain.

* @@ -10,13 +12,14 @@ * @module tools/deploy/EIP20TokenMock */ -const readline = require('readline'); -const rootPrefix = '../..'; -const prompts = readline.createInterface(process.stdin, process.stdout); -const logger = require(rootPrefix + '/helpers/custom_console_logger'); -const Deployer = require(rootPrefix + '/lib/deployer'); -const coreConstants = require(rootPrefix + '/config/core_constants'); -const BigNumber = require('bignumber.js'); +const readline = require('readline') + , rootPrefix = '../..' + , prompts = readline.createInterface(process.stdin, process.stdout) + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , Deployer = require(rootPrefix + '/services/deployer') + , BigNumber = require('bignumber.js') + , helper = require(rootPrefix + "/tools/deploy/helper") +; /** * It is the main performer method of this deployment script @@ -88,7 +91,9 @@ async function performer(argv) { prompts.close(); } - const contractName = 'eip20tokenmock'; + const contractName = 'eip20tokenmock' + , options = {returnType: "txReceipt"} + ; var constructorArgs = [ conversionRate, @@ -98,21 +103,20 @@ async function performer(argv) { decimals ]; - const options = {returnType: "txReceipt"}; - - const deployerInstance = new Deployer(); + const deployerInstance = new Deployer({ + contract_name: contractName, + constructor_args: constructorArgs, + gas_price: gasPrice, + options: options + }); - const deployResult = await deployerInstance.deploy( - contractName, - constructorArgs, - gasPrice, - options); + const deployResult = await deployerInstance.perform(); if (deployResult.isSuccess()) { const contractAddress = deployResult.data.transaction_receipt.contractAddress; logger.win("contractAddress: " + contractAddress); if (fileForContractAddress !== '') { - deployerInstance.writeContractAddressToFile(fileForContractAddress, contractAddress); + await helper.writeContractAddressToFile(fileForContractAddress, contractAddress); } } } diff --git a/tools/deploy/airdrop.js b/tools/deploy/airdrop.js index a9005a6..050a5a6 100644 --- a/tools/deploy/airdrop.js +++ b/tools/deploy/airdrop.js @@ -1,3 +1,5 @@ +"use strict"; + /** * This is script for deploying Pricer contract on any chain.

* @@ -15,16 +17,17 @@ * @module tools/deploy/pricer */ -const readline = require('readline'); -const rootPrefix = '../..'; -const web3Provider = require(rootPrefix + '/lib/web3/providers/rpc'); -const Deployer = require(rootPrefix + '/lib/deployer'); -const coreConstants = require(rootPrefix + '/config/core_constants'); -const coreAddresses = require(rootPrefix + '/config/core_addresses'); -const prompts = readline.createInterface(process.stdin, process.stdout); -const logger = require(rootPrefix + '/helpers/custom_console_logger'); -const OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract"); -const returnTypes = require(rootPrefix + "/lib/global_constant/return_types"); +const readline = require('readline') + , rootPrefix = '../..' + , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') + , Deployer = require(rootPrefix + '/services/deployer') + , coreAddresses = require(rootPrefix + '/config/core_addresses') + , prompts = readline.createInterface(process.stdin, process.stdout) + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") + , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") + , helper = require(rootPrefix + "/tools/deploy/helper") +; // Different addresses used for deployment const deployerName = "deployer" @@ -123,27 +126,28 @@ async function performer(argv) { } const contractName = 'airdrop' - , deployerInstance = new Deployer() + , deployOptions = {returnType: returnTypes.transactionReceipt()} ; - const constructorArgs = [ brandedTokenAddress, web3Provider.utils.asciiToHex(baseCurrency), workerContractAddress, airdropBudgetHolder ]; - const deployOptions = {returnType: returnTypes.transactionReceipt()}; - const deployResult = await deployerInstance.deploy( - contractName, - constructorArgs, - gasPrice, - deployOptions); + + const deployerInstance = new Deployer({ + contract_name: contractName, + constructor_args: constructorArgs, + gas_price: gasPrice, + options: deployOptions + }); + const deployResult = await deployerInstance.perform(); if (deployResult.isSuccess()) { const contractAddress = deployResult.data.transaction_receipt.contractAddress; logger.win("contractAddress: " + contractAddress); if (fileForContractAddress !== '') { - deployerInstance.writeContractAddressToFile(fileForContractAddress, contractAddress); + helper.writeContractAddressToFile(fileForContractAddress, contractAddress); } logger.debug("Setting Ops Address to: " + opsAddress); diff --git a/tools/deploy/helper.js b/tools/deploy/helper.js index 06d0da7..1065ad3 100644 --- a/tools/deploy/helper.js +++ b/tools/deploy/helper.js @@ -206,6 +206,7 @@ const deployHelper = { writeContractAddressToFile: function(fileName, contractAddress) { // Write contract address to file if ( fileName !== '') { + logger.debug("Writing to file: ", fileName, "contract address: ", contractAddress); fs.writeFileSync(Path.join(__dirname, '/' + fileName), contractAddress); } } diff --git a/tools/deploy/pricer.js b/tools/deploy/pricer.js index 1407d34..b34b538 100644 --- a/tools/deploy/pricer.js +++ b/tools/deploy/pricer.js @@ -15,16 +15,17 @@ * @module tools/deploy/pricer */ -const readline = require('readline'); -const rootPrefix = '../..'; -const web3Provider = require(rootPrefix + '/lib/web3/providers/rpc'); -const prompts = readline.createInterface(process.stdin, process.stdout); -const logger = require(rootPrefix + '/helpers/custom_console_logger'); -const OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract"); -const Deployer = require(rootPrefix + '/lib/deployer'); -const coreAddresses = require(rootPrefix + '/config/core_addresses'); -const coreConstants = require(rootPrefix + '/config/core_constants'); -const returnTypes = require(rootPrefix + "/lib/global_constant/return_types"); +const readline = require('readline') + , rootPrefix = '../..' + , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') + , prompts = readline.createInterface(process.stdin, process.stdout) + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") + , Deployer = require(rootPrefix + '/services/deployer') + , coreAddresses = require(rootPrefix + '/config/core_addresses') + , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") + , helper = require(rootPrefix + "/tools/deploy/helper") +; // Different addresses used for deployment const deployerName = "deployer" @@ -125,22 +126,23 @@ async function performer(argv) { ]; const contractName = 'pricer' - , deployerInstance = new Deployer() , deployOptions = {returnType: returnTypes.transactionReceipt()}; ; - const deployResult = await deployerInstance.deploy( - contractName, - constructorArgs, - gasPrice, - deployOptions); + const deployerInstance = new Deployer({ + contract_name: contractName, + constructor_args: constructorArgs, + gas_price: gasPrice, + options: deployOptions + }); + const deployResult = await deployerInstance.perform(); if (deployResult.isSuccess()) { const contractAddress = deployResult.data.transaction_receipt.contractAddress; logger.win("contractAddress: " + contractAddress); if (fileForContractAddress !== '') { - deployerInstance.writeContractAddressToFile(fileForContractAddress, contractAddress); + helper.writeContractAddressToFile(fileForContractAddress, contractAddress); } logger.debug("Setting Ops Address to: " + opsAddress); diff --git a/tools/deploy/workers.js b/tools/deploy/workers.js index dd3444d..7930c13 100644 --- a/tools/deploy/workers.js +++ b/tools/deploy/workers.js @@ -1,3 +1,5 @@ +"use strict"; + /** * This is script for deploying Workers contract on any chain.

* @@ -15,14 +17,15 @@ * @module tools/deploy/workers */ -const readline = require('readline'); -const rootPrefix = '../..'; -const prompts = readline.createInterface(process.stdin, process.stdout); -const logger = require(rootPrefix + '/helpers/custom_console_logger'); -const Deployer = require(rootPrefix + '/lib/deployer'); -const SetWorkerAndOpsKlass = require(rootPrefix + '/lib/set_worker_and_ops') - , setWorkerOps = new SetWorkerAndOpsKlass(); - +const readline = require('readline') + , rootPrefix = '../..' + , prompts = readline.createInterface(process.stdin, process.stdout) + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , Deployer = require(rootPrefix + '/services/deployer') + , helper = require(rootPrefix + "/tools/deploy/helper") + , SetWorkerAndOpsKlass = require(rootPrefix + '/lib/set_worker_and_ops') + , setWorkerOps = new SetWorkerAndOpsKlass() +; /** * It is the main performer method of this deployment script @@ -80,13 +83,12 @@ async function performer(argv) { var response = await setWorkerOps.perform({gasPrice: gasPrice, chainId: chainId}); logger.debug("**** Deployment Response", response); if (response.isSuccess() && fileForContractAddress !== '') { - var deployerInstance = new Deployer(); - deployerInstance.writeContractAddressToFile(fileForContractAddress, response.data.workerContractAddress); + helper.writeContractAddressToFile(fileForContractAddress, response.data.workerContractAddress); } process.exit(0); } -// node tools/deploy/worker.js gasPrice chainId +// node tools/deploy/workers.js gasPrice chainId performer(process.argv); From f1f64644034c4a8bc7339bd4b38b2234fd73afac Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 26 Mar 2018 19:04:43 +0530 Subject: [PATCH 022/115] deployer moved to services/deploy --- index.js | 5 +++-- lib/set_worker_and_ops.js | 2 +- services/{ => deploy}/deployer.js | 0 tools/deploy/EIP20TokenMock.js | 2 +- tools/deploy/airdrop.js | 2 +- tools/deploy/pricer.js | 2 +- tools/deploy/workers.js | 1 - 7 files changed, 7 insertions(+), 7 deletions(-) rename services/{ => deploy}/deployer.js (100%) diff --git a/index.js b/index.js index 2eb25dc..b59f140 100644 --- a/index.js +++ b/index.js @@ -6,22 +6,23 @@ const rootPrefix = "." , version = require(rootPrefix + '/package.json').version - , deployer = require(rootPrefix + '/services/deployer') , workers = require(rootPrefix + '/lib/contract_interact/workers') , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') , opsManaged = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , airdropManagerKlass = require(rootPrefix + "/lib/airdrop_management/base") + , serviceManifest = require(rootPrefix + '/services/manifest') ; const OSTPayment = function () { const oThis = this; oThis.version = version; - oThis.deployer = deployer; oThis.opsManaged = opsManaged; oThis.workers = workers; oThis.airdrop = airdrop; oThis.airdropManager = airdropManagerKlass; + + oThis.services = serviceManifest; }; module.exports = new OSTPayment(); \ No newline at end of file diff --git a/lib/set_worker_and_ops.js b/lib/set_worker_and_ops.js index 509c0be..94b137b 100644 --- a/lib/set_worker_and_ops.js +++ b/lib/set_worker_and_ops.js @@ -8,7 +8,7 @@ const rootPrefix = ".." , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , logger = require(rootPrefix + '/helpers/custom_console_logger') - , Deployer = require(rootPrefix + '/services/deployer') + , Deployer = require(rootPrefix + '/services/deploy/deployer') , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , coreAddresses = require(rootPrefix + '/config/core_addresses') , responseHelper = require(rootPrefix + '/lib/formatter/response') diff --git a/services/deployer.js b/services/deploy/deployer.js similarity index 100% rename from services/deployer.js rename to services/deploy/deployer.js diff --git a/tools/deploy/EIP20TokenMock.js b/tools/deploy/EIP20TokenMock.js index 58a16c8..6978c33 100644 --- a/tools/deploy/EIP20TokenMock.js +++ b/tools/deploy/EIP20TokenMock.js @@ -16,7 +16,7 @@ const readline = require('readline') , rootPrefix = '../..' , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') - , Deployer = require(rootPrefix + '/services/deployer') + , Deployer = require(rootPrefix + '/services/deploy/deployer') , BigNumber = require('bignumber.js') , helper = require(rootPrefix + "/tools/deploy/helper") ; diff --git a/tools/deploy/airdrop.js b/tools/deploy/airdrop.js index 050a5a6..292e6ef 100644 --- a/tools/deploy/airdrop.js +++ b/tools/deploy/airdrop.js @@ -20,7 +20,7 @@ const readline = require('readline') , rootPrefix = '../..' , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') - , Deployer = require(rootPrefix + '/services/deployer') + , Deployer = require(rootPrefix + '/services/deploy/deployer') , coreAddresses = require(rootPrefix + '/config/core_addresses') , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') diff --git a/tools/deploy/pricer.js b/tools/deploy/pricer.js index b34b538..149ded7 100644 --- a/tools/deploy/pricer.js +++ b/tools/deploy/pricer.js @@ -21,7 +21,7 @@ const readline = require('readline') , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") - , Deployer = require(rootPrefix + '/services/deployer') + , Deployer = require(rootPrefix + '/services/deploy/deployer') , coreAddresses = require(rootPrefix + '/config/core_addresses') , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , helper = require(rootPrefix + "/tools/deploy/helper") diff --git a/tools/deploy/workers.js b/tools/deploy/workers.js index 7930c13..4f714f8 100644 --- a/tools/deploy/workers.js +++ b/tools/deploy/workers.js @@ -21,7 +21,6 @@ const readline = require('readline') , rootPrefix = '../..' , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') - , Deployer = require(rootPrefix + '/services/deployer') , helper = require(rootPrefix + "/tools/deploy/helper") , SetWorkerAndOpsKlass = require(rootPrefix + '/lib/set_worker_and_ops') , setWorkerOps = new SetWorkerAndOpsKlass() From 56356b10bcd707cb52a7b40899b7bef2a7161ef4 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 26 Mar 2018 19:59:32 +0530 Subject: [PATCH 023/115] Airdrop Manager moved to manifest --- index.js | 8 --- lib/contract_interact/airdrop.js | 2 +- lib/transaction_helper.js | 2 +- mocha_test/services/airdrop/pay.js | 2 +- .../adjust_airdrop_amount.js | 0 .../airdrop_management/approve.js | 0 .../airdrop_management/base_old.js | 10 +-- .../airdrop_management/batch_allocator.js | 0 .../airdrop_management/register.js | 0 .../airdrop_management/transfer.js | 0 .../airdrop_management/user_balance.js | 0 services/deploy/deployer.js | 2 +- services/manifest.js | 67 +++++++++++++++++++ 13 files changed, 76 insertions(+), 17 deletions(-) rename {lib => services}/airdrop_management/adjust_airdrop_amount.js (100%) rename {lib => services}/airdrop_management/approve.js (100%) rename lib/airdrop_management/base.js => services/airdrop_management/base_old.js (91%) rename {lib => services}/airdrop_management/batch_allocator.js (100%) rename {lib => services}/airdrop_management/register.js (100%) rename {lib => services}/airdrop_management/transfer.js (100%) rename {lib => services}/airdrop_management/user_balance.js (100%) create mode 100644 services/manifest.js diff --git a/index.js b/index.js index b59f140..5a28327 100644 --- a/index.js +++ b/index.js @@ -6,10 +6,6 @@ const rootPrefix = "." , version = require(rootPrefix + '/package.json').version - , workers = require(rootPrefix + '/lib/contract_interact/workers') - , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') - , opsManaged = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") - , airdropManagerKlass = require(rootPrefix + "/lib/airdrop_management/base") , serviceManifest = require(rootPrefix + '/services/manifest') ; @@ -17,10 +13,6 @@ const OSTPayment = function () { const oThis = this; oThis.version = version; - oThis.opsManaged = opsManaged; - oThis.workers = workers; - oThis.airdrop = airdrop; - oThis.airdropManager = airdropManagerKlass; oThis.services = serviceManifest; }; diff --git a/lib/contract_interact/airdrop.js b/lib/contract_interact/airdrop.js index 80e8dfb..d601664 100644 --- a/lib/contract_interact/airdrop.js +++ b/lib/contract_interact/airdrop.js @@ -21,7 +21,7 @@ const rootPrefix = '../..' , eventGlobalConstants = require(rootPrefix+'/lib/global_constant/events') , notificationGlobalConstant = require(rootPrefix + '/lib/global_constant/notification') , Pricer = require(rootPrefix + '/lib/contract_interact/pricer') - , AirdropUserBalanceKlass = require(rootPrefix + '/lib/airdrop_management/user_balance') + , AirdropUserBalanceKlass = require(rootPrefix + '/services/airdrop_management/user_balance') , AirdropCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop') ; diff --git a/lib/transaction_helper.js b/lib/transaction_helper.js index b5d1e9e..b51750e 100644 --- a/lib/transaction_helper.js +++ b/lib/transaction_helper.js @@ -14,7 +14,7 @@ const rootPrefix = '..' , responseHelper = require(rootPrefix + '/lib/formatter/response') , Token = require(rootPrefix + '/lib/contract_interact/branded_token') , UserAirdropDetailCacheKlass = require(rootPrefix + '/lib/cache_multi_management/user_airdrop_detail') - , AdjustAirdropAmountKlass = require(rootPrefix + '/lib/airdrop_management/adjust_airdrop_amount') + , AdjustAirdropAmountKlass = require(rootPrefix + '/services/airdrop_management/adjust_airdrop_amount') , web3EventsDecoder = require(rootPrefix + '/lib/web3/events/decoder') , logger = require(rootPrefix + '/helpers/custom_console_logger') , eventGlobalConstants = require(rootPrefix+'/lib/global_constant/events') diff --git a/mocha_test/services/airdrop/pay.js b/mocha_test/services/airdrop/pay.js index 4e37195..468883d 100644 --- a/mocha_test/services/airdrop/pay.js +++ b/mocha_test/services/airdrop/pay.js @@ -23,7 +23,7 @@ const workersContract = new workers(constants.workersContractAddress, constants. const AirdropModelCacheKlass = require(rootPrefix + '/lib/cache_management/airdrop_model') - , airdropManagerKlass = require(rootPrefix + '/lib/airdrop_management/base') + , airdropManagerKlass = require(rootPrefix + '/services/airdrop_management/base') , airdropManager = new airdropManagerKlass() , airdropAllocationProofDetailKlass = require(rootPrefix + '/app/models/airdrop_allocation_proof_detail') , UserAirdropDetailKlass = require(rootPrefix + '/app/models/user_airdrop_detail') diff --git a/lib/airdrop_management/adjust_airdrop_amount.js b/services/airdrop_management/adjust_airdrop_amount.js similarity index 100% rename from lib/airdrop_management/adjust_airdrop_amount.js rename to services/airdrop_management/adjust_airdrop_amount.js diff --git a/lib/airdrop_management/approve.js b/services/airdrop_management/approve.js similarity index 100% rename from lib/airdrop_management/approve.js rename to services/airdrop_management/approve.js diff --git a/lib/airdrop_management/base.js b/services/airdrop_management/base_old.js similarity index 91% rename from lib/airdrop_management/base.js rename to services/airdrop_management/base_old.js index 8b6eb65..6a8f6b4 100644 --- a/lib/airdrop_management/base.js +++ b/services/airdrop_management/base_old.js @@ -6,11 +6,11 @@ * */ const rootPrefix = '../..' - , Register = require(rootPrefix + '/lib/airdrop_management/register') - , Transfer = require(rootPrefix + '/lib/airdrop_management/transfer') - , Approve = require(rootPrefix + '/lib/airdrop_management/approve') - , BatchAllocator = require(rootPrefix + '/lib/airdrop_management/batch_allocator') - , UserBalance = require(rootPrefix + '/lib/airdrop_management/user_balance') + , Register = require(rootPrefix + '/services/airdrop_management/register') + , Transfer = require(rootPrefix + '/services/airdrop_management/transfer') + , Approve = require(rootPrefix + '/services/airdrop_management/approve') + , BatchAllocator = require(rootPrefix + '/services/airdrop_management/batch_allocator') + , UserBalance = require(rootPrefix + '/services/airdrop_management/user_balance') ; /** diff --git a/lib/airdrop_management/batch_allocator.js b/services/airdrop_management/batch_allocator.js similarity index 100% rename from lib/airdrop_management/batch_allocator.js rename to services/airdrop_management/batch_allocator.js diff --git a/lib/airdrop_management/register.js b/services/airdrop_management/register.js similarity index 100% rename from lib/airdrop_management/register.js rename to services/airdrop_management/register.js diff --git a/lib/airdrop_management/transfer.js b/services/airdrop_management/transfer.js similarity index 100% rename from lib/airdrop_management/transfer.js rename to services/airdrop_management/transfer.js diff --git a/lib/airdrop_management/user_balance.js b/services/airdrop_management/user_balance.js similarity index 100% rename from lib/airdrop_management/user_balance.js rename to services/airdrop_management/user_balance.js diff --git a/services/deploy/deployer.js b/services/deploy/deployer.js index 05d3439..a17ea45 100644 --- a/services/deploy/deployer.js +++ b/services/deploy/deployer.js @@ -7,7 +7,7 @@ */ const uuid = require('uuid') - , rootPrefix = '..' + , rootPrefix = '../..' , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') , coreConstants = require(rootPrefix + '/config/core_constants') , coreAddresses = require(rootPrefix + '/config/core_addresses') diff --git a/services/manifest.js b/services/manifest.js new file mode 100644 index 0000000..cc7c897 --- /dev/null +++ b/services/manifest.js @@ -0,0 +1,67 @@ +"use strict"; + +/** + * Service manifest + * + * @module services/manifest + */ + +const rootPrefix = ".." + + , deployer = require(rootPrefix + '/services/deploy/deployer') + + , register = require(rootPrefix + '/services/airdrop_management/register') + , transfer = require(rootPrefix + '/services/airdrop_management/transfer') + , approve = require(rootPrefix + '/services/airdrop_management/approve') + , batchAllocator = require(rootPrefix + '/services/airdrop_management/batch_allocator') + , userBalance = require(rootPrefix + '/services/airdrop_management/user_balance') + + , workers = require(rootPrefix + '/lib/contract_interact/workers') + , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') + , opsManaged = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") +; + +/** + * Service Manifest Constructor + * + * @constructor + */ +const ServiceManifestKlass = function() {}; + +ServiceManifestKlass.prototype = { + /** + * deploy any contract + * + * @constant {object} + */ + deploy: { + deployer: deployer + }, + + /** + * airdrop Manager + * + * @constant {object} + */ + airdropManager: { + registerAirdrop: register, + transfer: transfer, + approve: approve, + batchAllocator: batchAllocator, + userBalance: userBalance + }, + + /** + * Contract Interact related services + * + * @constant {object} + */ + contractInteract: { + workers: workers, + airdrop: airdrop, + opsManaged:opsManaged + }, + +}; + +module.exports = new ServiceManifestKlass(); \ No newline at end of file From b9960e0634c2c7631b8e930ed47cfaefc59520a7 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Mon, 26 Mar 2018 20:40:15 +0530 Subject: [PATCH 024/115] airdrop management base not needed --- services/airdrop_management/base_old.js | 148 ------------------------ 1 file changed, 148 deletions(-) delete mode 100644 services/airdrop_management/base_old.js diff --git a/services/airdrop_management/base_old.js b/services/airdrop_management/base_old.js deleted file mode 100644 index 6a8f6b4..0000000 --- a/services/airdrop_management/base_old.js +++ /dev/null @@ -1,148 +0,0 @@ -/** - * - * This is a utility file which would be used for executing all methods related to airdrop.

- * - * @module lib/airdrop_management/base - * - */ -const rootPrefix = '../..' - , Register = require(rootPrefix + '/services/airdrop_management/register') - , Transfer = require(rootPrefix + '/services/airdrop_management/transfer') - , Approve = require(rootPrefix + '/services/airdrop_management/approve') - , BatchAllocator = require(rootPrefix + '/services/airdrop_management/batch_allocator') - , UserBalance = require(rootPrefix + '/services/airdrop_management/user_balance') -; - -/** - * Constructor to create object of base - * - * @constructor - * - */ -const BaseKlass = function() {}; - -BaseKlass.prototype = { - - /** - * Register Airdrop - * - * @param {Hex} airdropContractAddress - airdrop contract address - * @param {Number} chainId - chain Id - * - * @return {Promise} - * - */ - registerAirdrop: function(airdropContractAddress, chainId) { - return new Promise(async function (onResolve, onReject) { - - const registerAirdropObject = new Register({ - airdropContractAddress: airdropContractAddress, - chainId: chainId - }); - onResolve(registerAirdropObject.perform()); - - }); - - }, - - /** - * Transfer airdrop amount to airdrop budget holder - * - * @param {Hex} senderAddress - Sender Address - * @param {string} senderPassphrase - passphrase - * @param {Hex} airdropContractAddress - airdrop contract address - * @param {BigNumber} amount - amount to transfer - * @param {Hex} gasPrice - gasPrice - * @param {Number} chainId - chainId - * @param {Object} options - options e.g. {returnType: '', tag: ''} - * - * @return {Promise} - * - */ - transfer: function (senderAddress, senderPassphrase, airdropContractAddress, amount, gasPrice, chainId, options) { - - var transferObject = new Transfer({ - senderAddress: senderAddress, - senderPassphrase: senderPassphrase, - airdropContractAddress: airdropContractAddress, - amount: amount, - gasPrice: gasPrice, - chainId: chainId, - options: options}); - return transferObject.perform(); - - }, - - /** - * approve airdrop amount to airdrop contract address - * - * @param {Hex} airdropContractAddress - airdrop contract address - * @param {string} airdropBudgetHolderPassphrase - passphrase - * @param {Hex} gasPrice - gasPrice - * @param {Number} chainId - chainId - * @param {Object} options - options e.g. {returnType: '', tag: ''} - * - * @return {Promise} - * - */ - approve: function (airdropContractAddress, airdropBudgetHolderPassphrase, gasPrice, chainId, options) { - - var approveObject = new Approve({ - airdropContractAddress: airdropContractAddress, - airdropBudgetHolderPassphrase: airdropBudgetHolderPassphrase, - gasPrice: gasPrice, - chainId: chainId, - options: options}); - return approveObject.perform(); - - }, - - /** - * batch allocate to users - * - * @param {Hex} airdropContractAddress - airdrop contract address - * @param {Hex} transactionHash - transfer transaction hash - * @param {Object} airdropUsers - airdropUsers => {address: {airdropAmount:2, expiryTimestamp: timestamp}} - * @param {Number} chainId - chainId - * - * @return {response} - * - */ - batchAllocate: function (airdropContractAddress, transactionHash, airdropUsers, chainId) { - const batchAllocatorObject = new BatchAllocator({ - airdropContractAddress: airdropContractAddress, - transactionHash: transactionHash, - airdropUsers: airdropUsers, - chainId: chainId - }); - - return batchAllocatorObject.perform(); - }, - - /** - * Get user airdrop balance - * - * @param {Integer} chainId - chain Id - * @param {Hex} airdropContractAddress - airdrop contract address - * @param {Array} userAddresses - array of user addresses - * - * @return {response} - { - * '0x934ebd34b2a4f16d4de16256df36a6013785557d': {totalAirdropAmount: '10000000000000000', totalAirdropUsedAmount: '10000000000000000', balanceAirdropAmount: '10000000000000000'}, - * '0x934ebd34b2a4f16d4de16256df36a6013785557e': {totalAirdropAmount: '20000000000000000', totalAirdropUsedAmount: '20000000000000000', balanceAirdropAmount: '10000000000000000'} - * } - * - */ - getAirdropBalance: function (chainId, airdropContractAddress, userAddresses) { - var userBalance = new UserBalance({ - chainId: chainId, - airdropContractAddress: airdropContractAddress, - userAddresses: userAddresses - }); - return userBalance.perform(); - }, - - -}; - -module.exports = BaseKlass; - From 96ad5ae5001aa6b3b283f76a60a700d85deb2dff Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Tue, 27 Mar 2018 16:02:44 +0530 Subject: [PATCH 025/115] Initial ws changes --- helpers/custom_console_logger.js | 4 ++-- lib/contract_interact/EIP20TokenMock.js | 6 +++--- lib/contract_interact/branded_token.js | 2 +- lib/contract_interact/ops_managed_contract.js | 2 +- lib/contract_interact/owned_contract.js | 2 +- lib/deployer.js | 9 ++++++++- lib/web3/providers/rpc.js | 5 +++-- mocha_test/scripts/nohup.out | 0 mocha_test/scripts/run_chain.sh | 4 ++-- mocha_test/scripts/set_env_vars.sh | 2 ++ mocha_test/scripts/start_test_chain.sh | 1 + package.json | 3 ++- tools/deploy/EIP20TokenMock.js | 1 + tools/deploy/airdrop.js | 2 +- tools/deploy/helper.js | 2 +- tools/deploy/pricer.js | 1 + 16 files changed, 30 insertions(+), 16 deletions(-) create mode 100644 mocha_test/scripts/nohup.out diff --git a/helpers/custom_console_logger.js b/helpers/custom_console_logger.js index a8a1de0..0756d97 100644 --- a/helpers/custom_console_logger.js +++ b/helpers/custom_console_logger.js @@ -60,12 +60,12 @@ module.exports = { }, debug: function () { - if (coreConstants.DEBUG_ENABLED == 1) { + //if (coreConstants.DEBUG_ENABLED == 1) { var args = [this.INFO_PRE]; args = args.concat(Array.prototype.slice.call(arguments)); args.push(this.CONSOLE_RESET); console.log.apply(console, args); - } + //} }, //Method to Log Success/Win. diff --git a/lib/contract_interact/EIP20TokenMock.js b/lib/contract_interact/EIP20TokenMock.js index 104c438..4b4c450 100644 --- a/lib/contract_interact/EIP20TokenMock.js +++ b/lib/contract_interact/EIP20TokenMock.js @@ -64,7 +64,7 @@ MockToken.prototype = { helper.assertAddress(senderAddress); currContract.options.address = this.contractAddress; - currContract.setProvider( web3RpcProvider.currentProvider ); + //currContract.setProvider( web3RpcProvider.currentProvider ); const transactionObject = currContract.methods.setBalance(ownerAddress, value); const encodedABI = transactionObject.encodeABI(); return helper.safeSendFromAddr( @@ -97,7 +97,7 @@ MockToken.prototype = { helper.assertAddress(senderAddress); currContract.options.address = this.contractAddress; - currContract.setProvider( web3RpcProvider.currentProvider ); + //currContract.setProvider( web3RpcProvider.currentProvider ); const transactionObject = currContract.methods.setConverionRate(conversionRate); const encodedABI = transactionObject.encodeABI(); return helper.safeSendFromAddr( @@ -132,7 +132,7 @@ MockToken.prototype = { helper.assertAddress(spenderAddress); currContract.options.address = this.contractAddress; - currContract.setProvider( web3RpcProvider.currentProvider ); + //currContract.setProvider( web3RpcProvider.currentProvider ); const transactionObject = currContract.methods.approve(spenderAddress, value); const encodedABI = transactionObject.encodeABI(); return helper.safeSendFromAddr( diff --git a/lib/contract_interact/branded_token.js b/lib/contract_interact/branded_token.js index 1a4233e..a4ff8c3 100644 --- a/lib/contract_interact/branded_token.js +++ b/lib/contract_interact/branded_token.js @@ -44,7 +44,7 @@ const BrandedToken = function (brandedTokenAddress, chainId) { oThis.brandedTokenAddress = brandedTokenAddress; oThis.chainId = chainId; oThis.balanceCache = new BalanceCacheKlass(chainId, brandedTokenAddress); - currContract.setProvider(web3RpcProvider.currentProvider); + //currContract.setProvider(web3RpcProvider.currentProvider); }; BrandedToken.prototype = { diff --git a/lib/contract_interact/ops_managed_contract.js b/lib/contract_interact/ops_managed_contract.js index 06f5713..43a5541 100644 --- a/lib/contract_interact/ops_managed_contract.js +++ b/lib/contract_interact/ops_managed_contract.js @@ -41,7 +41,7 @@ const OpsManagedContract = function (contractAddress, defaultGasPrice, chainId) this.currContract = currContract; this.defaultGasPrice = defaultGasPrice; this.currContract.options.address = contractAddress; - this.currContract.setProvider(web3RpcProvider.currentProvider); + //this.currContract.setProvider(web3RpcProvider.currentProvider); this.chainId = chainId; OwnedContract.call(this, contractAddress, web3RpcProvider, currContract, defaultGasPrice); }; diff --git a/lib/contract_interact/owned_contract.js b/lib/contract_interact/owned_contract.js index a38194b..00f118c 100644 --- a/lib/contract_interact/owned_contract.js +++ b/lib/contract_interact/owned_contract.js @@ -27,7 +27,7 @@ const OwnedContract = function (contractAddress, web3RpcProvider, currContract, this.currContract = currContract; this.defaultGasPrice = defaultGasPrice; this.currContract.options.address = contractAddress; - this.currContract.setProvider( web3RpcProvider.currentProvider ); + //this.currContract.setProvider( web3RpcProvider.currentProvider ); }; OwnedContract.prototype = { diff --git a/lib/deployer.js b/lib/deployer.js index 49bfc82..5b8f2bb 100644 --- a/lib/deployer.js +++ b/lib/deployer.js @@ -135,7 +135,7 @@ Deploy.prototype = { ); // this is needed since the contract object - contract.setProvider(web3Provider.currentProvider); + //contract.setProvider(web3Provider.currentProvider); // Unlock account web3Provider.eth.personal.unlockAccount( @@ -186,6 +186,13 @@ Deploy.prototype = { return onResolve(responseHelper.error(errorCode, 'Contract deployment failed')); } }); + }) + .catch(function(reason) { + const errorCode = "l_d_8"; + logger.error(`${errorCode}: Contract deployment failed`); + if (basicHelper.isReturnTypeTxReceipt(returnType)) { + return onResolve(responseHelper.error(errorCode, 'Contract deployment failed')); + } }); }) .catch(function(reason) { diff --git a/lib/web3/providers/rpc.js b/lib/web3/providers/rpc.js index 8e49a40..8fd174b 100644 --- a/lib/web3/providers/rpc.js +++ b/lib/web3/providers/rpc.js @@ -3,7 +3,8 @@ const coreConstants = require('../../../config/core_constants'); const Web3 = require('web3') - , provider = new Web3.providers.HttpProvider(coreConstants.OST_UTILITY_GETH_RPC_PROVIDER) - , web3RpcProvider = new Web3(provider); + //, provider = new Web3.providers.HttpProvider(coreConstants.OST_UTILITY_GETH_RPC_PROVIDER) + //, web3RpcProvider = new Web3(provider); + , web3RpcProvider = new Web3(coreConstants.OST_UTILITY_GETH_RPC_PROVIDER); module.exports = web3RpcProvider; diff --git a/mocha_test/scripts/nohup.out b/mocha_test/scripts/nohup.out new file mode 100644 index 0000000..e69de29 diff --git a/mocha_test/scripts/run_chain.sh b/mocha_test/scripts/run_chain.sh index d34497a..fba4780 100755 --- a/mocha_test/scripts/run_chain.sh +++ b/mocha_test/scripts/run_chain.sh @@ -1,6 +1,6 @@ #!/bin/bash -DATADIR=./st-poa +DATADIR=/Users/Deepesh/Documents/SimpleToken/workspace/openst-payments/mocha_test/scripts/st-poa LOCAL_NETWORK_ID="--networkid 20171010" -geth --datadir "$DATADIR" $LOCAL_NETWORK_ID --port 30301 --rpcport 9546 --ws --wsport 19546 --wsorigins "*" --gasprice 0 --targetgaslimit 100000000 --etherbase 0 --unlock 0 --password pw --rpc --maxpeers 0 --mine --minerthreads 4 --rpcapi net,eth,web3,personal +geth --datadir "$DATADIR" $LOCAL_NETWORK_ID --port 30301 --rpcport 9546 --rpcapi net,eth,web3,personal --wsapi net,eth,web3,personal --ws --wsport 19546 --wsorigins "*" --gasprice 0 --targetgaslimit 100000000 --etherbase 0 --unlock 0 --password pw --rpc --maxpeers 0 --mine --minerthreads 4 diff --git a/mocha_test/scripts/set_env_vars.sh b/mocha_test/scripts/set_env_vars.sh index 260f350..4f05a64 100644 --- a/mocha_test/scripts/set_env_vars.sh +++ b/mocha_test/scripts/set_env_vars.sh @@ -3,6 +3,8 @@ export OST_UTILITY_GAS_PRICE='0x12A05F200' export OST_UTILITY_GETH_RPC_PROVIDER='http://127.0.0.1:9546' +#export OST_UTILITY_GETH_RPC_PROVIDER='ws://127.0.0.1:19546' + export OST_UTILITY_DEPLOYER_ADDR='' export OST_UTILITY_DEPLOYER_PASSPHRASE='testtest' export OST_UTILITY_OPS_ADDR='' diff --git a/mocha_test/scripts/start_test_chain.sh b/mocha_test/scripts/start_test_chain.sh index 17a8ae8..44bee8b 100644 --- a/mocha_test/scripts/start_test_chain.sh +++ b/mocha_test/scripts/start_test_chain.sh @@ -5,5 +5,6 @@ cat set_env_vars.sh>env_vars.sh sh init_keys.sh sh init_chain.sh nohup sh run_chain.sh /dev/null 2>&1 & +sleep 10 node ./geth_checker.js diff --git a/package.json b/package.json index c5dd35b..7eef603 100644 --- a/package.json +++ b/package.json @@ -24,11 +24,12 @@ "dependencies": { "@openstfoundation/openst-cache": "1.0.1", "@openstfoundation/openst-notification": "1.0.0", + "@ostdotcom/ost-price-oracle": "^1.0.0", "bignumber.js": "4.1.0", "mustache": "2.3.0", "mysql": "2.14.1", "shortid": "2.2.8", - "web3": "1.0.0-beta.33" + "web3": "1.0.0-beta.26" }, "devDependencies": { "abi-decoder": "1.0.9", diff --git a/tools/deploy/EIP20TokenMock.js b/tools/deploy/EIP20TokenMock.js index aeae046..8ba63a2 100644 --- a/tools/deploy/EIP20TokenMock.js +++ b/tools/deploy/EIP20TokenMock.js @@ -115,6 +115,7 @@ async function performer(argv) { deployerInstance.writeContractAddressToFile(fileForContractAddress, contractAddress); } } + process.exit(0); } diff --git a/tools/deploy/airdrop.js b/tools/deploy/airdrop.js index a9005a6..7690b91 100644 --- a/tools/deploy/airdrop.js +++ b/tools/deploy/airdrop.js @@ -166,7 +166,7 @@ async function performer(argv) { logger.error("Error deploying contract"); logger.error(deployResult); } - + process.exit(0); } // node tools/deploy/airdrop.js brandedTokenContractAddress baseCurrency workerContractAddress airdropBudgetHolder gasPrice chainId diff --git a/tools/deploy/helper.js b/tools/deploy/helper.js index 06d0da7..61c7c69 100644 --- a/tools/deploy/helper.js +++ b/tools/deploy/helper.js @@ -108,7 +108,7 @@ const deployHelper = { options ); // this is needed since the contract object - contract.setProvider(web3Provider.currentProvider); + //contract.setProvider(web3Provider.currentProvider); const deploy = function () { const encodeABI = contract.deploy(options).encodeABI(); diff --git a/tools/deploy/pricer.js b/tools/deploy/pricer.js index 1407d34..69305bf 100644 --- a/tools/deploy/pricer.js +++ b/tools/deploy/pricer.js @@ -164,6 +164,7 @@ async function performer(argv) { logger.error(deployResult); } + process.exit(0); } performer(process.argv); From bbb04a6c4835ecc3e855c8feb4a4d6203c0565a6 Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Tue, 27 Mar 2018 16:15:57 +0530 Subject: [PATCH 026/115] New services and tested services --- lib/contract_interact/airdrop.js | 2 +- lib/set_worker_and_ops.js | 26 +++- services/airdrop/pay.js | 139 +++++++++++++++++ .../adjust_airdrop_amount.js | 4 +- services/airdrop_management/approve.js | 30 ++-- .../airdrop_management/batch_allocator.js | 30 ++-- services/airdrop_management/register.js | 31 ++-- services/airdrop_management/transfer.js | 33 ++-- services/airdrop_management/user_balance.js | 30 ++-- services/deploy/deployer.js | 24 +-- services/manifest.js | 45 ++++-- services/ops_managed/get_ops.js | 109 ++++++++++++++ services/ops_managed/set_ops.js | 123 +++++++++++++++ services/workers/is_worker.js | 108 +++++++++++++ services/workers/set_worker.js | 142 ++++++++++++++++++ tools/deploy/airdrop.js | 36 +++-- tools/deploy/pricer.js | 36 +++-- 17 files changed, 832 insertions(+), 116 deletions(-) create mode 100644 services/airdrop/pay.js create mode 100644 services/ops_managed/get_ops.js create mode 100644 services/ops_managed/set_ops.js create mode 100644 services/workers/is_worker.js create mode 100644 services/workers/set_worker.js diff --git a/lib/contract_interact/airdrop.js b/lib/contract_interact/airdrop.js index d601664..d8efda6 100644 --- a/lib/contract_interact/airdrop.js +++ b/lib/contract_interact/airdrop.js @@ -27,7 +27,6 @@ const rootPrefix = '../..' const contractAbi = coreAddresses.getAbiForContract('airdrop') , currContract = new web3RpcProvider.eth.Contract(contractAbi) - , gasLimit = coreConstants.OST_GAS_LIMIT ; /** @@ -66,6 +65,7 @@ Airdrop.prototype.constructor = Airdrop; * @param {string} currency - quote currency * @param {BigNumber} intendedPricePoint - price point at which the pay is intended (in wei) * @param {string} spender - User address + * @param {Hex} gas_price - gas price * @param {object} options - for params like returnType, tag. * * @return {promise} diff --git a/lib/set_worker_and_ops.js b/lib/set_worker_and_ops.js index 94b137b..1b73b8e 100644 --- a/lib/set_worker_and_ops.js +++ b/lib/set_worker_and_ops.js @@ -6,12 +6,13 @@ * @module lib/set_worker_and_ops */ const rootPrefix = ".." - , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , logger = require(rootPrefix + '/helpers/custom_console_logger') , Deployer = require(rootPrefix + '/services/deploy/deployer') , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , coreAddresses = require(rootPrefix + '/config/core_addresses') , responseHelper = require(rootPrefix + '/lib/formatter/response') + , SetOpsKlass = require(rootPrefix + '/services/ops_managed/set_ops') + , GetOpsKlass = require(rootPrefix + '/services/ops_managed/get_ops') ; // Different addresses used for deployment @@ -72,14 +73,25 @@ SetWorkerOps.prototype = { returnType: returnTypes.transactionReceipt(), tag: '' } - , opsManaged = new OpsManagedContract(contractAddress, gasPrice, chainId) ; - var result = await opsManaged.setOpsAddress(deployerAddress, - deployerPassphrase, - opsAddress, - setOpsOptions); + const SetOpsObject = new SetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId, + deployer_address: deployerAddress, + deployer_passphrase: deployerPassphrase, + ops_address: opsAddress, + options: setOpsOptions + }); + var result = await SetOpsObject.perform(); logger.debug(result); - var contractOpsAddress = await opsManaged.getOpsAddress(); + + const GetOpsObject = new GetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId + }); + var contractOpsAddress = await GetOpsObject.perform(); logger.debug("Ops Address Set to: ", contractOpsAddress); return Promise.resolve(responseHelper.successWithData({workerContractAddress: contractAddress})); } else{ diff --git a/services/airdrop/pay.js b/services/airdrop/pay.js new file mode 100644 index 0000000..a3acb79 --- /dev/null +++ b/services/airdrop/pay.js @@ -0,0 +1,139 @@ +"use strict"; + +/** + * + * This class would be used for executing airdrop pay.

+ * + * @module services/airdrop/pay + * + */ + +const rootPrefix = '../..' + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , AirdropContractInteractKlass = require(rootPrefix + '/lib/contract_interact/airdrop') +; + +/** + * Constructor to create object of airdrop PayKlass + * + * @param {string} airdrop_contract_address - airdrop contract address + * @param {string} chain_id - chain Id + * @param {string} sender_worker_address - address of worker + * @param {string} sender_worker_passphrase - passphrase of worker + * @param {string} beneficiary_address - address of beneficiary account + * @param {BigNumber} transfer_amount - transfer amount (in wei) + * @param {string} commission_beneficiary_address - address of commision beneficiary account + * @param {BigNumber} commission_amount - commission amount (in wei) + * @param {string} currency - quote currency + * @param {BigNumber} intended_price_point - price point at which the pay is intended (in wei) + * @param {string} spender - User address + * @param {Hex} gas_price - gas price + * @param {object} options - for params like returnType, tag. + * + * @constructor + * + */ +const PayKlass = function (params) { + logger.debug("=======PayKlass.params======="); + logger.debug(params.airdrop_contract_address, params.chain_id, params.sender_worker_address, params.beneficiary_address, + params.transfer_amount, params.commission_beneficiary_address, params.commission_amount, params.intended_price_point, + params.spender, params.gas_price, params.options); + + const oThis = this + ; + + oThis.airdropContractAddress = params.airdrop_contract_address; + oThis.chainId = params.chain_id; + oThis.senderWorkerAddress = params.sender_worker_address; + oThis.senderWorkerPassphrase = params.sender_worker_passphrase; + oThis.beneficiaryAddress = params.beneficiary_address; + oThis.transferAmount = params.transfer_amount; + oThis.commissionBeneficiaryAddress = params.commission_beneficiary_address; + oThis.commissionAmount = params.commission_amount; + oThis.intendedPricePoint = params.intended_price_point; + oThis.spender = params.spender; + oThis.gasPrice = params.gas_price; + oThis.options = params.options; +}; + +PayKlass.prototype = { + + /** + * Perform method + * + * @return {promise} + * + */ + perform: async function () { + const oThis = this + ; + + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======PayKlass.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.pay(); + logger.debug("=======PayKlass.pay.result======="); + logger.debug(r); + + return r; + + } catch (err) { + return responseHelper.error('s_a_p_perform_1', 'Something went wrong. ' + err.message); + } + + }, + + /** + * Validation of params + * + * @return {promise} + * + */ + validateParams: function () { + const oThis = this + ; + if (!basicHelper.isAddressValid(oThis.airdropContractAddress)) { + return responseHelper.error('s_a_p_validateParams_1', 'airdrop contract address is invalid'); + } + + return responseHelper.successWithData({}); + }, + + /** + * airdrop pay + * + * @return {promise} + * + */ + pay: function () { + const oThis = this + ; + const AirdropContractInteractObject = new AirdropContractInteractKlass( + oThis.airdropContractAddress, + oThis.chainId + ); + return AirdropContractInteractObject.pay( + oThis.senderWorkerAddress, + oThis.senderWorkerPassphrase, + oThis.beneficiaryAddress, + oThis.transferAmount, + oThis.commissionBeneficiaryAddress, + oThis.commissionAmount, + oThis.currency, + oThis.intendedPricePoint, + oThis.spender, + oThis.gasPrice, + oThis.options + ); + } + +}; + +module.exports = PayKlass; \ No newline at end of file diff --git a/services/airdrop_management/adjust_airdrop_amount.js b/services/airdrop_management/adjust_airdrop_amount.js index 2f20a0f..ad9a287 100644 --- a/services/airdrop_management/adjust_airdrop_amount.js +++ b/services/airdrop_management/adjust_airdrop_amount.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This class would be used for calculating user airdrop balance.

* - * @module lib/airdrop_management/user_balance + * @module services/airdrop_management/adjust_airdrop_amount * */ diff --git a/services/airdrop_management/approve.js b/services/airdrop_management/approve.js index 71b197e..bebc17b 100644 --- a/services/airdrop_management/approve.js +++ b/services/airdrop_management/approve.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This is a utility file which would be used for executing approve by airdrop budget holder.

* - * @module lib/airdrop_management/approve + * @module services/airdrop_management/approve * */ @@ -58,17 +60,21 @@ ApproveKlass.prototype = { const oThis = this; - var r = null; - - r = await oThis.validateParams(); - logger.debug("\n=========Approve.validateParams.result========="); - logger.debug(r); - if(r.isFailure()) return r; - - r = oThis.doApprove(); - logger.debug("\n=========Approve.doApprove.result========="); - logger.debug(r); - return r; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("\n=========Approve.validateParams.result========="); + logger.debug(r); + if(r.isFailure()) return r; + + r = oThis.doApprove(); + logger.debug("\n=========Approve.doApprove.result========="); + logger.debug(r); + return r; + } catch(err) { + return responseHelper.error('s_am_a_perform_1', 'Something went wrong. ' + err.message) + } }, diff --git a/services/airdrop_management/batch_allocator.js b/services/airdrop_management/batch_allocator.js index 113959a..5151c63 100644 --- a/services/airdrop_management/batch_allocator.js +++ b/services/airdrop_management/batch_allocator.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This is a utility file which would be used for allocating amount to airdrop users.

* - * @module lib/airdrop_management/batch_allocator + * @module services/airdrop_management/batch_allocator * */ @@ -61,17 +63,23 @@ BatchAllocatorKlass.prototype = { const oThis = this; - var r = null; + try { + + var r = null; + + r = await oThis.validateParams(); + logger.debug("\n=========batchAllocator.validateParams.result========="); + logger.debug(r); + if(r.isFailure()) return r; - r = await oThis.validateParams(); - logger.debug("\n=========batchAllocator.validateParams.result========="); - logger.debug(r); - if(r.isFailure()) return r; + r = await oThis.allocateAirdropAmountToUsers(); + logger.debug("\n=========batchAllocator.allocateAirdropAmountToUsers.result========="); + logger.debug(r); + return r; - r = await oThis.allocateAirdropAmountToUsers(); - logger.debug("\n=========batchAllocator.allocateAirdropAmountToUsers.result========="); - logger.debug(r); - return r; + } catch(err){ + return responseHelper.error('s_am_ba_perform_1', 'Something went wrong. ' + err.message) + } }, /** @@ -101,7 +109,7 @@ BatchAllocatorKlass.prototype = { return onResolve(responseHelper.error('l_am_ba_vp_3', 'given airdrop record is not present in DB')); } var airdropAllocationProofDetailModel = new airdropAllocationProofDetailKlass(); - result = await airdropAllocationProofDetailModel.getByTransactionHash(oThis.transactionHash); + const result = await airdropAllocationProofDetailModel.getByTransactionHash(oThis.transactionHash); oThis.airdropAllocationProofDetailRecord = result[0]; if (!oThis.airdropAllocationProofDetailRecord) { return onResolve(responseHelper.error('l_am_ba_vp_4', 'Invalid transactionHash. Given airdropAllocationProofDetailRecord is not present in DB')); diff --git a/services/airdrop_management/register.js b/services/airdrop_management/register.js index 3a91030..af79c82 100644 --- a/services/airdrop_management/register.js +++ b/services/airdrop_management/register.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This class would be used for executing airdrop register.

* - * @module lib/airdrop_management/register + * @module services/airdrop_management/register * */ @@ -46,18 +48,21 @@ RegisterKlass.prototype = { const oThis = this ; - - var r = null; - - r = await oThis.validateParams(); - logger.debug("=======register.validateParams.result======="); - logger.debug(r); - if (r.isFailure()) return r; - - r = await oThis.runRegister(); - logger.debug("=======register.runRegister.result======="); - logger.debug(r); - return r; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======register.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.runRegister(); + logger.debug("=======register.runRegister.result======="); + logger.debug(r); + return r; + } catch(err) { + return responseHelper.error('s_am_r_perform_1', 'Something went wrong. ' + err.message); + } }, diff --git a/services/airdrop_management/transfer.js b/services/airdrop_management/transfer.js index 8b500f5..cd362c8 100644 --- a/services/airdrop_management/transfer.js +++ b/services/airdrop_management/transfer.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This is a utility file which would be used for executing transfer amount to airdrop budget holder.

* - * @module lib/airdrop_management/transfer + * @module services/airdrop_management/transfer * */ @@ -36,7 +38,8 @@ const rootPrefix = '../..' */ const TransferKlass = function(params) { logger.debug("\n=========Transfer params========="); - logger.debug(params); + // Don't log passphrase + logger.debug(params.senderAddress, params.airdropContractAddress, params.amount, params.gasPrice, params.chainId, params.options); const oThis = this; oThis.senderAddress = params.senderAddress; oThis.senderPassphrase = params.senderPassphrase; @@ -63,17 +66,21 @@ TransferKlass.prototype = { const oThis = this; - var r = null; - - r = await oThis.validateParams(); - logger.debug("\n=========Transfer.validateParams.result========="); - logger.debug(r); - if(r.isFailure()) return r; - - r = oThis.doTransfer(); - logger.debug("\n=========Transfer.doTransfer.result========="); - logger.debug(r); - return r; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("\n=========Transfer.validateParams.result========="); + logger.debug(r); + if(r.isFailure()) return r; + + r = oThis.doTransfer(); + logger.debug("\n=========Transfer.doTransfer.result========="); + logger.debug(r); + return r; + } catch(err) { + return responseHelper.error('s_am_t_perform_1', 'Something went wrong. ' + err.message); + } }, diff --git a/services/airdrop_management/user_balance.js b/services/airdrop_management/user_balance.js index 0320a5a..0fc133d 100644 --- a/services/airdrop_management/user_balance.js +++ b/services/airdrop_management/user_balance.js @@ -1,8 +1,10 @@ +"use strict"; + /** * * This class would be used for calculating user airdrop balance.

* - * @module lib/airdrop_management/user_balance + * @module services/airdrop_management/user_balance * */ @@ -50,17 +52,21 @@ AirdropUserBalanceKlass.prototype = { const oThis = this; - var r = null; - - r = await oThis.validateParams(); - logger.debug("=======userBalance.validateParams.result======="); - logger.debug(r); - if(r.isFailure()) return r; - - r = await oThis.getUserAirdropBalance(); - logger.debug("=======userBalance.getUserAirdropBalance.result======="); - logger.debug(r); - return r; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======userBalance.validateParams.result======="); + logger.debug(r); + if(r.isFailure()) return r; + + r = await oThis.getUserAirdropBalance(); + logger.debug("=======userBalance.getUserAirdropBalance.result======="); + logger.debug(r); + return r; + } catch(err) { + return responseHelper.error('s_am_ub_perform_1', 'Something went wrong. ' + err.message); + } }, diff --git a/services/deploy/deployer.js b/services/deploy/deployer.js index a17ea45..839b415 100644 --- a/services/deploy/deployer.js +++ b/services/deploy/deployer.js @@ -3,7 +3,7 @@ /** * This is script for deploying any contract.

* - * @module services/deployer + * @module services/deploy/deployer */ const uuid = require('uuid') @@ -51,17 +51,21 @@ DeployerKlass.prototype = { const oThis = this; - var r = null; + try { + var r = null; - r = await oThis.validateParams(); - logger.debug("\n=========Deployer.validateParams.result========="); - logger.debug(r); - if(r.isFailure()) return r; + r = await oThis.validateParams(); + logger.debug("\n=========Deployer.validateParams.result========="); + logger.debug(r); + if(r.isFailure()) return r; - r = oThis.deploy(); - logger.debug("\n=========Deployer.deploy.result========="); - logger.debug(r); - return r; + r = oThis.deploy(); + logger.debug("\n=========Deployer.deploy.result========="); + logger.debug(r); + return r; + } catch(err) { + return responseHelper.error('s_am_ub_perform_1', 'Something went wrong. ' + err.message); + } }, diff --git a/services/manifest.js b/services/manifest.js index cc7c897..430e28c 100644 --- a/services/manifest.js +++ b/services/manifest.js @@ -8,7 +8,8 @@ const rootPrefix = ".." - , deployer = require(rootPrefix + '/services/deploy/deployer') + //, deployWorkers = require(rootPrefix + '/services/deploy/workers') + //, deployAirdrop = require(rootPrefix + '/services/deploy/airdrop') , register = require(rootPrefix + '/services/airdrop_management/register') , transfer = require(rootPrefix + '/services/airdrop_management/transfer') @@ -16,9 +17,13 @@ const rootPrefix = ".." , batchAllocator = require(rootPrefix + '/services/airdrop_management/batch_allocator') , userBalance = require(rootPrefix + '/services/airdrop_management/user_balance') - , workers = require(rootPrefix + '/lib/contract_interact/workers') - , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') - , opsManaged = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") + , setWorker = require(rootPrefix + '/services/workers/set_worker') + , isWorker = require(rootPrefix + '/services/workers/is_worker') + + , pay = require(rootPrefix + '/services/airdrop/pay') + + , getOps = require(rootPrefix + "/services/ops_managed/get_ops") + , setOps = require(rootPrefix + "/services/ops_managed/set_ops") ; /** @@ -29,13 +34,25 @@ const rootPrefix = ".." const ServiceManifestKlass = function() {}; ServiceManifestKlass.prototype = { + /** * deploy any contract * * @constant {object} */ deploy: { - deployer: deployer + //workers: deployWorkers, + //airdrop: deployAirdrop + }, + + /** + * Ops Managed related services + * + * @constant {object} + */ + opsManaged: { + getOps: getOps, + setOps: setOps }, /** @@ -52,16 +69,24 @@ ServiceManifestKlass.prototype = { }, /** - * Contract Interact related services + * workers * * @constant {object} */ - contractInteract: { - workers: workers, - airdrop: airdrop, - opsManaged:opsManaged + workers: { + setWorker: setWorker, + isWorker: isWorker }, + /** + * airdrop + * + * @constant {object} + */ + airdrop: { + pay: pay + } + }; module.exports = new ServiceManifestKlass(); \ No newline at end of file diff --git a/services/ops_managed/get_ops.js b/services/ops_managed/get_ops.js new file mode 100644 index 0000000..c5c8641 --- /dev/null +++ b/services/ops_managed/get_ops.js @@ -0,0 +1,109 @@ +"use strict"; + +/** + * + * This class would be used for executing getOps.

+ * + * @module services/ops_managed/get_ops + * + */ + +const rootPrefix = '../..' + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , OpsManagedContractInteractKlass = require(rootPrefix + '/lib/contract_interact/ops_managed_contract') +; + +/** + * Constructor to create object of get_ops + * + * @constructor + * + * @param {string} contract_address - contract address + * @param {string} gas_price - gas price + * @param {object} chain_id - chain id + * + * @return {Object} + * + */ +const GetOpsKlass = function (params) { + logger.debug("=======GetOpsKlass.params======="); + logger.debug(params); + + const oThis = this + ; + oThis.contractAddress = params.contract_address; + oThis.gasPrice = params.gas_price; + oThis.chainId = params.chain_id; + +}; + +GetOpsKlass.prototype = { + + /** + * Perform method + * + * @return {promise} + * + */ + perform: async function () { + const oThis = this + ; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======GetOpsKlass.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.getOps(); + logger.debug("=======GetOpsKlass.getOps.result======="); + logger.debug(r); + + return r; + + } catch (err) { + return responseHelper.error('s_om_go_perform_1', 'Something went wrong. ' + err.message); + } + + }, + + /** + * Validation of params + * + * @return {promise} + * + */ + validateParams: function () { + const oThis = this + ; + if (!basicHelper.isAddressValid(oThis.contractAddress)) { + return responseHelper.error('s_om_go_validateParams_1', 'contract address is invalid'); + } + + return responseHelper.successWithData({}); + }, + + /** + * get Ops + * + * @return {promise} + * + */ + getOps: function () { + const oThis = this + ; + + const OpsManagedContractInteractObject = new OpsManagedContractInteractKlass( + oThis.contractAddress, + oThis.gasPrice, + oThis.chainId + ); + return OpsManagedContractInteractObject.getOpsAddress(); + } + +}; + +module.exports = GetOpsKlass; \ No newline at end of file diff --git a/services/ops_managed/set_ops.js b/services/ops_managed/set_ops.js new file mode 100644 index 0000000..3c9daeb --- /dev/null +++ b/services/ops_managed/set_ops.js @@ -0,0 +1,123 @@ +"use strict"; + +/** + * + * This class would be used for executing setOps.

+ * + * @module services/ops_managed/set_ops + * + */ + +const rootPrefix = '../..' + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , OpsManagedContractInteractKlass = require(rootPrefix + '/lib/contract_interact/ops_managed_contract') +; + +/** + * Constructor to create object of set_ops + * + * @constructor + * + * @param {string} contract_address - contract address + * @param {Hex} gas_price - gas price + * @param {Number} chain_id - chain id + * @param {string} deployer_address - deployer address + * @param {string} deployer_passphrase - deployer passphrase + * @param {string} ops_address - ops addresses + * @param {object} options - options + * + * @return {Object} + * + */ +const SetOpsKlass = function (params) { + logger.debug("=======GetOpsKlass.params======="); + // Don't log passphrase + logger.debug(params.contract_address, params.gas_price, params.chain_id, params.deployer_address, params.ops_address, params.options); + + const oThis = this + ; + oThis.contractAddress = params.contract_address; + oThis.gasPrice = params.gas_price; + oThis.chainId = params.chain_id; + oThis.deployerAddress = params.deployer_address; + oThis.deployerPassphrase = params.deployer_passphrase; + oThis.opsAddress = params.ops_address; + oThis.options = params.options; + +}; + +SetOpsKlass.prototype = { + + /** + * Perform method + * + * @return {promise} + * + */ + perform: async function () { + const oThis = this + ; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======SetOpsKlass.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.setOps(); + logger.debug("=======SetOpsKlass.setOps.result======="); + logger.debug(r); + + return r; + + } catch (err) { + return responseHelper.error('s_om_go_perform_1', 'Something went wrong. ' + err.message); + } + + }, + + /** + * Validation of params + * + * @return {promise} + * + */ + validateParams: function () { + const oThis = this + ; + if (!basicHelper.isAddressValid(oThis.contractAddress)) { + return responseHelper.error('s_om_go_validateParams_1', 'contract address is invalid'); + } + + return responseHelper.successWithData({}); + }, + + /** + * set Ops + * + * @return {promise} + * + */ + setOps: function () { + const oThis = this + ; + + const OpsManagedContractInteractObject = new OpsManagedContractInteractKlass( + oThis.contractAddress, + oThis.gasPrice, + oThis.chainId + ); + return OpsManagedContractInteractObject.setOpsAddress( + oThis.deployerAddress, + oThis.deployerPassphrase, + oThis.opsAddress, + oThis.options + ); + } + +}; + +module.exports = SetOpsKlass; \ No newline at end of file diff --git a/services/workers/is_worker.js b/services/workers/is_worker.js new file mode 100644 index 0000000..6093fa6 --- /dev/null +++ b/services/workers/is_worker.js @@ -0,0 +1,108 @@ +"use strict"; + +/** + * + * This class would be used for executing worker is_worker.

+ * + * @module services/workers/is_worker + * + */ + +const rootPrefix = '../..' + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , WorkersContractInteractKlass = require(rootPrefix + '/lib/contract_interact/workers') +; + +/** + * Constructor to create object of register + * + * @constructor + * + * @param {string} workers_contract_address - contract address of workers + * @param {string} worker_address - worker address + * @param {object} chain_id - chain id + * + * @return {Object} + * + */ +const IsWorkerKlass = function (params) { + logger.debug("=======IsWorkerKlass.params======="); + logger.debug(params); + + const oThis = this + ; + + oThis.workersContractAddress = params.workers_contract_address; + oThis.workerAddress = params.worker_address; + oThis.chainId = params.chain_id; + +}; + +IsWorkerKlass.prototype = { + + /** + * Perform method + * + * @return {promise} + * + */ + perform: async function () { + const oThis = this + ; + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======IsWorkerKlass.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.isWorker(); + logger.debug("=======IsWorkerKlass.setWorker.result======="); + logger.debug(r); + + return r; + + } catch (err) { + return responseHelper.error('s_w_iw_perform_1', 'Something went wrong. ' + err.message); + } + + }, + + /** + * Validation of params + * + * @return {promise} + * + */ + validateParams: function () { + const oThis = this + ; + if (!basicHelper.isAddressValid(oThis.workerAddress)) { + return responseHelper.error('s_w_iw_validateParams_1', 'worker address is invalid'); + } + + return responseHelper.successWithData({}); + }, + + /** + * is Worker + * + * @return {promise} + * + */ + isWorker: function () { + const oThis = this + ; + const workersContractInteractObject = new WorkersContractInteractKlass( + oThis.workersContractAddress, + oThis.chainId + ); + return workersContractInteractObject.isWorker(oThis.workerAddress); + } + +}; + +module.exports = IsWorkerKlass; \ No newline at end of file diff --git a/services/workers/set_worker.js b/services/workers/set_worker.js new file mode 100644 index 0000000..39d85f4 --- /dev/null +++ b/services/workers/set_worker.js @@ -0,0 +1,142 @@ +"use strict"; + +/** + * + * This class would be used for executing airdrop register.

+ * + * @module services/workers/set_worker + * + */ + +const rootPrefix = '../..' + , responseHelper = require(rootPrefix + '/lib/formatter/response') + , basicHelper = require(rootPrefix + '/helpers/basic_helper') + , logger = require(rootPrefix + '/helpers/custom_console_logger') + , BigNumber = require('bignumber.js') + , WorkersContractInteractKlass = require(rootPrefix + '/lib/contract_interact/workers') +; + +/** + * Constructor to create object of register + * + * @constructor + * + * @param {string} workers_contract_address - contract address of workers + * @param {string} sender_address - address of sender + * @param {string} sender_passphrase - passphrase of sender + * @param {string} worker_address - worker address + * @param {number} deactivation_height - block number till which the worker is valid + * @param {BigNumber} gas_price - gas price + * @param {object} chain_id - chain id + * @param {object} options - for params like returnType, tag. + * + * @return {Object} + * + */ +const SetWorkerKlass = function (params) { + logger.debug("=======SetWorkerKlass.params======="); + // Don't log passphrase + logger.debug(params.workers_contract_address, params.sender_address, params.worker_address, params.deactivation_height, params.gas_price, params.chain_id, params.options); + const oThis = this; + + oThis.workersContractAddress = params.workers_contract_address; + oThis.senderAddress = params.sender_address; + oThis.senderPassphrase = params.sender_passphrase; + oThis.workerAddress = params.worker_address; + oThis.deactivationHeight = params.deactivation_height; + oThis.gasPrice = params.gas_price; + oThis.chainId = params.chain_id; + oThis.options = params.options + +}; + +SetWorkerKlass.prototype = { + + /** + * Perform method + * + * @return {promise} + * + */ + perform: async function () { + const oThis = this + ; + + try { + var r = null; + + r = await oThis.validateParams(); + logger.debug("=======SetWorkerKlass.validateParams.result======="); + logger.debug(r); + if (r.isFailure()) return r; + + r = await oThis.setWorker(); + logger.debug("=======SetWorkerKlass.setWorker.result======="); + logger.debug(r); + + return r; + + } catch (err) { + return responseHelper.error('s_w_sw_perform_1', 'Something went wrong. ' + err.message); + } + + }, + + /** + * Validation of params + * + * @return {promise} + * + */ + validateParams: function () { + const oThis = this; + if (!basicHelper.isAddressValid(oThis.workersContractAddress)) { + return responseHelper.error('s_w_sw_validateParams_1', 'workers contract address is invalid'); + } + if (!oThis.gasPrice) { + return responseHelper.error('s_w_sw_validateParams_2', 'gas is mandatory'); + } + if (!basicHelper.isAddressValid(oThis.senderAddress)) { + return responseHelper.error('s_w_sw_validateParams_3', 'sender address is invalid'); + } + if (!basicHelper.isAddressValid(oThis.workerAddress)) { + return responseHelper.error('s_w_sw_validateParams_4', 'worker address is invalid'); + } + if (!oThis.deactivationHeight) { + return responseHelper.error('s_w_sw_validateParams_5', 'deactivation height is mandatory'); + } + const deactivationHeight = new BigNumber(oThis.deactivationHeight); + if (deactivationHeight.isNaN() || deactivationHeight.lt(0) || !deactivationHeight.isInteger()) { + return responseHelper.error('s_w_sw_validateParams_6', 'deactivation height value is invalid'); + } + + return responseHelper.successWithData({}); + }, + + /** + * Set Worker + * + * @return {promise} + * + */ + setWorker: function () { + const oThis = this + ; + + const workersContractInteractObject = new WorkersContractInteractKlass( + oThis.workersContractAddress, + oThis.chainId + ); + return workersContractInteractObject.setWorker( + oThis.senderAddress, + oThis.senderPassphrase, + oThis.workerAddress, + oThis.deactivationHeight.toString(10), + oThis.gasPrice, + oThis.options + ); + } + +}; + +module.exports = SetWorkerKlass; \ No newline at end of file diff --git a/tools/deploy/airdrop.js b/tools/deploy/airdrop.js index 292e6ef..084b62c 100644 --- a/tools/deploy/airdrop.js +++ b/tools/deploy/airdrop.js @@ -24,9 +24,10 @@ const readline = require('readline') , coreAddresses = require(rootPrefix + '/config/core_addresses') , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') - , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , helper = require(rootPrefix + "/tools/deploy/helper") + , SetOpsKlass = require(rootPrefix + '/services/ops_managed/set_ops') + , GetOpsKlass = require(rootPrefix + '/services/ops_managed/get_ops') ; // Different addresses used for deployment @@ -150,20 +151,29 @@ async function performer(argv) { helper.writeContractAddressToFile(fileForContractAddress, contractAddress); } + const setOpsOptions = { + returnType: returnTypes.transactionReceipt(), + tag: '' + }; logger.debug("Setting Ops Address to: " + opsAddress); - const opsManaged = new OpsManagedContract(contractAddress, gasPrice, chainId) - , setOpsOptions = { - returnType: returnTypes.transactionReceipt(), - tag: '' - } - ; - var setOpsResult = await opsManaged.setOpsAddress(deployerAddress, - deployerPassphrase, - opsAddress, - setOpsOptions - ); + const SetOpsObject = new SetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId, + deployer_address: deployerAddress, + deployer_passphrase: deployerPassphrase, + ops_address: opsAddress, + options: setOpsOptions + }); + var setOpsResult = await SetOpsObject.perform(); logger.debug(setOpsResult); - var contractOpsAddress = await opsManaged.getOpsAddress(); + + const GetOpsObject = new GetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId + }); + var contractOpsAddress = await GetOpsObject.perform(); logger.debug("Ops Address Set to: " + contractOpsAddress); } else { diff --git a/tools/deploy/pricer.js b/tools/deploy/pricer.js index 149ded7..80a82b3 100644 --- a/tools/deploy/pricer.js +++ b/tools/deploy/pricer.js @@ -20,11 +20,12 @@ const readline = require('readline') , web3Provider = require(rootPrefix + '/lib/web3/providers/rpc') , prompts = readline.createInterface(process.stdin, process.stdout) , logger = require(rootPrefix + '/helpers/custom_console_logger') - , OpsManagedContract = require(rootPrefix + "/lib/contract_interact/ops_managed_contract") , Deployer = require(rootPrefix + '/services/deploy/deployer') , coreAddresses = require(rootPrefix + '/config/core_addresses') , returnTypes = require(rootPrefix + "/lib/global_constant/return_types") , helper = require(rootPrefix + "/tools/deploy/helper") + , SetOpsKlass = require(rootPrefix + '/services/ops_managed/set_ops') + , GetOpsKlass = require(rootPrefix + '/services/ops_managed/get_ops') ; // Different addresses used for deployment @@ -145,20 +146,29 @@ async function performer(argv) { helper.writeContractAddressToFile(fileForContractAddress, contractAddress); } - logger.debug("Setting Ops Address to: " + opsAddress); const setOpsOptions = { - returnType: returnTypes.transactionReceipt(), - tag: '' - } - , opsManaged = new OpsManagedContract(contractAddress, gasPrice, chainId) - ; - var setOpsResult = await opsManaged.setOpsAddress( - deployerAddress, - deployerPassphrase, - opsAddress, - setOpsOptions); + returnType: returnTypes.transactionReceipt(), + tag: '' + } + logger.debug("Setting Ops Address to: " + opsAddress); + const SetOpsObject = new SetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId, + deployer_address: deployerAddress, + deployer_passphrase: deployerPassphrase, + ops_address: opsAddress, + options: setOpsOptions + }); + var setOpsResult = await SetOpsObject.perform(); logger.debug(setOpsResult); - const contractOpsAddress = await opsManaged.getOpsAddress(); + + const GetOpsObject = new GetOpsKlass({ + contract_address: contractAddress, + gas_price: gasPrice, + chain_id: chainId + }); + var contractOpsAddress = await GetOpsObject.perform(); logger.debug("Ops Address Set to: " + contractOpsAddress); } else { From 28d5b5b8be6f4ce8c1227b655e2c9d36fa6f53ae Mon Sep 17 00:00:00 2001 From: abhay-pepo Date: Tue, 27 Mar 2018 17:07:35 +0530 Subject: [PATCH 027/115] Worker Services is tested --- lib/contract_interact/workers.js | 35 ---- mocha_test/services/airdrop/pay.js | 31 ++- mocha_test/services/workers/_is_worker.js | 11 +- mocha_test/services/workers/_set_worker.js | 223 +++++++++++++-------- 4 files changed, 162 insertions(+), 138 deletions(-) diff --git a/lib/contract_interact/workers.js b/lib/contract_interact/workers.js index 76c678e..41e18c9 100644 --- a/lib/contract_interact/workers.js +++ b/lib/contract_interact/workers.js @@ -69,10 +69,6 @@ Workers.prototype = { ; try { - const validationResponse = oThis._validateSetWorkersParams(senderAddress, workerAddress, deactivationHeight, gasPrice); - - if (validationResponse.isFailure()) return Promise.resolve(validationResponse); - const returnType = basicHelper.getReturnType(options.returnType) , transactionObject = currContract.methods.setWorker(workerAddress, deactivationHeight); @@ -241,37 +237,6 @@ Workers.prototype = { } }, - /** - * Validate set workers params - * - * @param {string} senderAddress - address of sender - * @param {string} workerAddress - worker address - * @param {number} deactivationHeight - block number till which the worker is valid - * @param {BigNumber} gasPrice - gas price - * - * @return {result} - * - */ - _validateSetWorkersParams: function (senderAddress, workerAddress, deactivationHeight, gasPrice ) { - if (!gasPrice) { - return responseHelper.error('l_ci_w_validateSetWorkersParams_1', 'gas is mandatory'); - } - if (!basicHelper.isAddressValid(senderAddress)) { - return responseHelper.error('l_ci_w_validateSetWorkersParams_2', 'sender address is invalid'); - } - if (!basicHelper.isAddressValid(workerAddress)) { - return responseHelper.error('l_ci_w_validateSetWorkersParams_3', 'worker address is invalid'); - } - if (!deactivationHeight) { - return responseHelper.error('l_ci_w_validateSetWorkersParams_4', 'deactivation height is mandatory'); - } - deactivationHeight = new BigNumber(deactivationHeight); - if (deactivationHeight.isNaN() || deactivationHeight.lt(0) || !deactivationHeight.isInteger()) { - return responseHelper.error('l_ci_w_validateSetWorkersParams_5', 'deactivation height value is invalid'); - } - return responseHelper.successWithData({}); - }, - /** * Validate remove worker params * diff --git a/mocha_test/services/airdrop/pay.js b/mocha_test/services/airdrop/pay.js index 468883d..901ea42 100644 --- a/mocha_test/services/airdrop/pay.js +++ b/mocha_test/services/airdrop/pay.js @@ -8,15 +8,15 @@ const rootPrefix = "../../.." , BigNumber = require('bignumber.js') , utils = require(rootPrefix+'/mocha_test/lib/utils') , airdrop = require(rootPrefix + '/lib/contract_interact/airdrop') - , workers = require(rootPrefix + '/lib/contract_interact/workers') , mockToken = require(rootPrefix + '/lib/contract_interact/EIP20TokenMock') , BrandedTokenKlass = require(rootPrefix + '/lib/contract_interact/branded_token') , web3RpcProvider = require(rootPrefix + '/lib/web3/providers/rpc') , logger = require(rootPrefix + '/helpers/custom_console_logger') + , SetWorkerKlass = require(rootPrefix + '/services/workers/set_worker') + , IsWorkerKlass = require(rootPrefix + '/services/workers/is_worker') ; -const workersContract = new workers(constants.workersContractAddress, constants.chainId) - , airdropOstUsd = new airdrop(constants.airdropOstUsdAddress, constants.chainId) +const airdropOstUsd = new airdrop(constants.airdropOstUsdAddress, constants.chainId) , TC5 = new mockToken(constants.TC5Address) , brandedTokenObject = new BrandedTokenKlass(constants.TC5Address, constants.chainId) ; @@ -100,20 +100,29 @@ async function setPriceOracle(airdropObject, currency, address) { * */ async function setWorker(workerAddress, deactivationHeight) { - const setWorkerResponse = await workersContract.setWorker( - constants.ops, - constants.opsPassphrase, - workerAddress, - deactivationHeight.toString(10), - constants.gasUsed, - constants.optionsReceipt); + const SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: workerAddress, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const setWorkerResponse = await SetWorkerObject.perform(); assert.equal(setWorkerResponse.isSuccess(), true); // verify if the transaction receipt is valid utils.verifyTransactionReceipt(setWorkerResponse); // confirm that worker is a set - const isWorkerResponse = await workersContract.isWorker(workerAddress); + const IsWorkerObject = new IsWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + worker_address: workerAddress, + chain_id: constants.chainId + }); + const isWorkerResponse = await IsWorkerObject.perform(); assert.equal(isWorkerResponse.isSuccess(), true); assert.equal(isWorkerResponse.data.isValid, true); } diff --git a/mocha_test/services/workers/_is_worker.js b/mocha_test/services/workers/_is_worker.js index cd1159b..ef1c2ca 100644 --- a/mocha_test/services/workers/_is_worker.js +++ b/mocha_test/services/workers/_is_worker.js @@ -5,8 +5,7 @@ const chai = require('chai') const rootPrefix = "../../.." , constants = require(rootPrefix + '/mocha_test/lib/constants') - , workersModule = require(rootPrefix + '/lib/contract_interact/workers') - , workers = new workersModule(constants.workersContractAddress, constants.chainId) + , IsWorkerKlass = require(rootPrefix + '/services/workers/is_worker') ; describe('Is worker', function() { @@ -17,8 +16,12 @@ describe('Is worker', function() { // eslint-disable-next-line no-invalid-this this.timeout(100000); - // set worker - const response = await workers.isWorker(0); + const IsWorkerObject = new IsWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + worker_address: 0, + chain_id: constants.chainId + }); + const response = await IsWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); diff --git a/mocha_test/services/workers/_set_worker.js b/mocha_test/services/workers/_set_worker.js index b9a34e0..5c061ab 100644 --- a/mocha_test/services/workers/_set_worker.js +++ b/mocha_test/services/workers/_set_worker.js @@ -7,9 +7,9 @@ const rootPrefix = "../../.." , constants = require(rootPrefix + '/mocha_test/lib/constants') , BigNumber = require('bignumber.js') , utils = require(rootPrefix+'/mocha_test/lib/utils') - , workersModule = require(rootPrefix + '/lib/contract_interact/workers') - , workers = new workersModule(constants.workersContractAddress, constants.chainId) , web3RpcProvider = require(rootPrefix + '/lib/web3/providers/rpc') + , SetWorkerKlass = require(rootPrefix + '/services/workers/set_worker') + , IsWorkerKlass = require(rootPrefix + '/services/workers/is_worker') ; describe('Set worker', function() { @@ -32,13 +32,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - 0, - constants.optionsReceipt); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: 0, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); @@ -56,14 +60,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - 0, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsReceipt); - + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: 0, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); assert.equal(response.err.msg, 'sender address is invalid'); @@ -80,13 +87,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - 0, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsReceipt); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: 0, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); @@ -104,13 +115,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - null, - constants.gasUsed, - constants.optionsReceipt); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: null, + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); @@ -128,14 +143,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - 'NaN', - constants.gasUsed, - constants.optionsReceipt); - + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: 'NaN', + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); assert.equal(response.err.msg, 'deactivation height value is invalid'); @@ -152,14 +170,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - -1, - constants.gasUsed, - constants.optionsReceipt); - + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: -1, + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); assert.equal(response.err.msg, 'deactivation height value is invalid'); @@ -176,14 +197,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - 0.1, - constants.gasUsed, - constants.optionsReceipt); - + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: 0.1, + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // confirm failure reponse and message assert.equal(response.isFailure(), true); assert.equal(response.err.msg, 'deactivation height value is invalid'); @@ -200,27 +224,38 @@ describe('Set worker', function() { ; // confirm that worker is not a worker - const isWorkerBefore = await workers.isWorker(constants.workerAccount1); + var IsWorkerObject = new IsWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + worker_address: constants.workerAccount1, + chain_id: constants.chainId + }); + const isWorkerBefore = await IsWorkerObject.perform(); assert.equal(isWorkerBefore.isSuccess(), true); assert.equal(isWorkerBefore.data.isValid, false); // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsReceipt); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // verify if the transaction receipt is valid utils.verifyTransactionReceipt(response); - // verify if the transaction has was actually mined - await utils.verifyIfMined(workers, response.data.transaction_hash); - // confirm that worker is a worker - const isWorkerAfter = await workers.isWorker(constants.workerAccount1); + var IsWorkerObject = new IsWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + worker_address: constants.workerAccount1, + chain_id: constants.chainId + }); + const isWorkerAfter = await IsWorkerObject.perform(); assert.equal(isWorkerAfter.isSuccess(), true); assert.equal(isWorkerAfter.data.isValid, true); @@ -236,13 +271,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsUUID); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsUUID + }); + const response = await SetWorkerObject.perform(); // verify transaction UUID // we will not verify if it got mined as its just interaction layer testing @@ -260,13 +299,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsHash); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsHash + }); + const response = await SetWorkerObject.perform(); // verify transaction hash utils.verifyTransactionHash(response); @@ -283,13 +326,17 @@ describe('Set worker', function() { ; // set worker - const response = await workers.setWorker( - constants.ops, - constants.opsPassphrase, - constants.workerAccount1, - deactivationHeight.toNumber(), - constants.gasUsed, - constants.optionsReceipt); + var SetWorkerObject = new SetWorkerKlass({ + workers_contract_address: constants.workersContractAddress, + sender_address: constants.ops, + sender_passphrase: constants.opsPassphrase, + worker_address: constants.workerAccount1, + deactivation_height: deactivationHeight.toString(10), + gas_price: constants.gasUsed, + chain_id: constants.chainId, + options: constants.optionsReceipt + }); + const response = await SetWorkerObject.perform(); // verify transaction receipt utils.verifyTransactionReceipt(response); From f645a6b77db424a1efea51897cab78b1b7f54358 Mon Sep 17 00:00:00 2001 From: deepesh KN Date: Tue, 27 Mar 2018 17:20:59 +0530 Subject: [PATCH 028/115] Added websocket provider --- .travis.yml | 2 +- README.md | 1 + config/core_constants.js | 3 +- docs/baseCacheMultiManagementKlass.html | 1137 --- docs/classes.list.html | 396 - docs/fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes docs/fonts/glyphicons-halflings-regular.svg | 288 - docs/fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes docs/fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes docs/fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes docs/global.html | 375 - docs/img/glyphicons-halflings-white.png | Bin 8777 -> 0 bytes docs/img/glyphicons-halflings.png | Bin 12799 -> 0 bytes docs/index.html | 304 - ...helpers_basic_helper-BasicHelperKlass.html | 2419 ------ docs/module-helpers_basic_helper.html | 311 - ...ib_airdrop_management_approve-approve.html | 807 -- ...module-lib_airdrop_management_approve.html | 311 - ...dule-lib_airdrop_management_base-base.html | 1478 ---- docs/module-lib_airdrop_management_base.html | 311 - ...gement_batch_allocator-batchAllocator.html | 881 -- ...ib_airdrop_management_batch_allocator.html | 311 - ..._airdrop_management_register-register.html | 735 -- ...odule-lib_airdrop_management_register.html | 311 - ..._airdrop_management_transfer-transfer.html | 855 -- ...odule-lib_airdrop_management_transfer.html | 311 - ...user_balance-AdjustAirdropAmountKlass.html | 831 -- ..._user_balance-AirdropUserBalanceKlass.html | 759 -- ...e-lib_airdrop_management_user_balance.html | 407 - ...ent_airdrop_cache-AirdropBalanceCache.html | 428 - ...le-lib_cache_management_airdrop_cache.html | 311 - ...management_balance_cache-BalanceCache.html | 889 -- ...le-lib_cache_management_balance_cache.html | 311 - ...e_management_pricer_cache-PricerCache.html | 3891 --------- ...ule-lib_cache_management_pricer_cache.html | 311 - ...lib_contract_interact_airdrop-Airdrop.html | 1075 --- .../module-lib_contract_interact_airdrop.html | 311 - ...t_interact_branded_token-BrandedToken.html | 1953 ----- ...e-lib_contract_interact_branded_token.html | 311 - ...nteract_helper-ContractInteractHelper.html | 4009 --------- docs/module-lib_contract_interact_helper.html | 311 - ...s_managed_contract-OpsManagedContract.html | 774 -- ...ontract_interact_ops_managed_contract.html | 311 - ...interact_owned_contract-OwnedContract.html | 763 -- ...-lib_contract_interact_owned_contract.html | 311 - ...ib_contract_interact_pricer-MockToken.html | 1199 --- ...e-lib_contract_interact_pricer-Pricer.html | 5207 ----------- docs/module-lib_contract_interact_pricer.html | 407 - ...lib_contract_interact_workers-Workers.html | 2038 ----- .../module-lib_contract_interact_workers.html | 311 - docs/module-lib_deployer-Deploy.html | 894 -- docs/module-lib_deployer.html | 316 - ..._builder_mysql-MySQLQueryBuilderKlass.html | 2662 ------ docs/module-lib_query_builder_mysql.html | 339 - ...e-lib_set_worker_and_ops-SetWorkerOps.html | 603 -- docs/module-lib_set_worker_and_ops.html | 311 - ..._transaction_helper-TransactionHelper.html | 4093 --------- docs/module-lib_transaction_helper.html | 311 - ...b3_events_formatter-web3EventsDecoder.html | 491 -- ..._events_formatter-web3EventsFormatter.html | 457 - docs/module-lib_web3_events_formatter.html | 407 - docs/module-tools_deploy_DeployHelper.html | 821 -- docs/module-tools_deploy_EIP20TokenMock.html | 448 - docs/module-tools_deploy_helper.html | 306 - docs/module-tools_deploy_pricer.html | 1495 ---- docs/module-tools_deploy_workers.html | 406 - docs/modules.list.html | 396 - docs/namespaces.list.html | 396 - docs/quicksearch.html | 31 - docs/scripts/docstrap.lib.js | 11 - docs/scripts/fulltext-search-ui.js | 89 - docs/scripts/fulltext-search.js | 36 - docs/scripts/lunr.min.js | 6 - docs/scripts/prettify/Apache-License-2.0.txt | 202 - docs/scripts/prettify/jquery.min.js | 6 - docs/scripts/prettify/lang-css.js | 21 - docs/scripts/prettify/prettify.js | 496 -- docs/scripts/sunlight.js | 1157 --- docs/scripts/toc.js | 203 - docs/styles/darkstrap.css | 960 --- docs/styles/prettify-tomorrow.css | 132 - docs/styles/site.cerulean.css | 7008 --------------- docs/styles/site.cosmo.css | 7061 --------------- docs/styles/site.cyborg.css | 7048 --------------- docs/styles/site.darkly.css | 7171 ---------------- docs/styles/site.darkstrap.css | 5638 ------------ docs/styles/site.dibs-bootstrap.css | 5899 ------------- docs/styles/site.flatly.css | 7147 ---------------- docs/styles/site.journal.css | 6973 --------------- docs/styles/site.lumen.css | 7298 ---------------- docs/styles/site.paper.css | 7623 ----------------- docs/styles/site.readable.css | 6997 --------------- docs/styles/site.sandstone.css | 7035 --------------- docs/styles/site.simplex.css | 7023 --------------- docs/styles/site.slate.css | 7343 ---------------- docs/styles/site.spacelab.css | 7055 --------------- docs/styles/site.superhero.css | 7131 --------------- docs/styles/site.united.css | 6895 --------------- docs/styles/site.yeti.css | 7195 ---------------- docs/styles/sunlight.dark.css | 345 - docs/styles/sunlight.default.css | 344 - docs/userAirdropDetailCache.html | 864 -- helpers/custom_console_logger.js | 4 +- lib/contract_interact/EIP20TokenMock.js | 18 +- lib/contract_interact/airdrop.js | 14 +- lib/contract_interact/branded_token.js | 16 +- lib/contract_interact/helper.js | 86 +- lib/contract_interact/ops_managed_contract.js | 16 +- lib/contract_interact/owned_contract.js | 12 +- lib/contract_interact/pricer.js | 60 +- lib/contract_interact/workers.js | 20 +- lib/deployer.js | 2 +- lib/web3/providers/rpc.js | 2 - lib/web3/providers/ws.js | 8 + mocha_test/scripts/geth_checker.js | 4 +- mocha_test/scripts/nohup.out | 0 mocha_test/scripts/run_chain.sh | 2 +- mocha_test/scripts/set_env_vars.sh | 2 +- mocha_test/scripts/travis_test.sh | 6 +- .../services/airdrop/airdrop_budget_holder.js | 4 +- mocha_test/services/airdrop/get_workers.js | 4 +- mocha_test/services/airdrop/pay.js | 18 +- mocha_test/services/workers/_set_worker.js | 24 +- mocha_test/services/workers/remove.js | 4 +- tools/deploy/airdrop.js | 2 +- tools/deploy/pricer.js | 2 +- 126 files changed, 172 insertions(+), 184729 deletions(-) delete mode 100644 docs/baseCacheMultiManagementKlass.html delete mode 100644 docs/classes.list.html delete mode 100644 docs/fonts/glyphicons-halflings-regular.eot delete mode 100644 docs/fonts/glyphicons-halflings-regular.svg delete mode 100644 docs/fonts/glyphicons-halflings-regular.ttf delete mode 100644 docs/fonts/glyphicons-halflings-regular.woff delete mode 100644 docs/fonts/glyphicons-halflings-regular.woff2 delete mode 100644 docs/global.html delete mode 100644 docs/img/glyphicons-halflings-white.png delete mode 100644 docs/img/glyphicons-halflings.png delete mode 100644 docs/index.html delete mode 100644 docs/module-helpers_basic_helper-BasicHelperKlass.html delete mode 100644 docs/module-helpers_basic_helper.html delete mode 100644 docs/module-lib_airdrop_management_approve-approve.html delete mode 100644 docs/module-lib_airdrop_management_approve.html delete mode 100644 docs/module-lib_airdrop_management_base-base.html delete mode 100644 docs/module-lib_airdrop_management_base.html delete mode 100644 docs/module-lib_airdrop_management_batch_allocator-batchAllocator.html delete mode 100644 docs/module-lib_airdrop_management_batch_allocator.html delete mode 100644 docs/module-lib_airdrop_management_register-register.html delete mode 100644 docs/module-lib_airdrop_management_register.html delete mode 100644 docs/module-lib_airdrop_management_transfer-transfer.html delete mode 100644 docs/module-lib_airdrop_management_transfer.html delete mode 100644 docs/module-lib_airdrop_management_user_balance-AdjustAirdropAmountKlass.html delete mode 100644 docs/module-lib_airdrop_management_user_balance-AirdropUserBalanceKlass.html delete mode 100644 docs/module-lib_airdrop_management_user_balance.html delete mode 100644 docs/module-lib_cache_management_airdrop_cache-AirdropBalanceCache.html delete mode 100644 docs/module-lib_cache_management_airdrop_cache.html delete mode 100644 docs/module-lib_cache_management_balance_cache-BalanceCache.html delete mode 100644 docs/module-lib_cache_management_balance_cache.html delete mode 100644 docs/module-lib_cache_management_pricer_cache-PricerCache.html delete mode 100644 docs/module-lib_cache_management_pricer_cache.html delete mode 100644 docs/module-lib_contract_interact_airdrop-Airdrop.html delete mode 100644 docs/module-lib_contract_interact_airdrop.html delete mode 100644 docs/module-lib_contract_interact_branded_token-BrandedToken.html delete mode 100644 docs/module-lib_contract_interact_branded_token.html delete mode 100644 docs/module-lib_contract_interact_helper-ContractInteractHelper.html delete mode 100644 docs/module-lib_contract_interact_helper.html delete mode 100644 docs/module-lib_contract_interact_ops_managed_contract-OpsManagedContract.html delete mode 100644 docs/module-lib_contract_interact_ops_managed_contract.html delete mode 100644 docs/module-lib_contract_interact_owned_contract-OwnedContract.html delete mode 100644 docs/module-lib_contract_interact_owned_contract.html delete mode 100644 docs/module-lib_contract_interact_pricer-MockToken.html delete mode 100644 docs/module-lib_contract_interact_pricer-Pricer.html delete mode 100644 docs/module-lib_contract_interact_pricer.html delete mode 100644 docs/module-lib_contract_interact_workers-Workers.html delete mode 100644 docs/module-lib_contract_interact_workers.html delete mode 100644 docs/module-lib_deployer-Deploy.html delete mode 100644 docs/module-lib_deployer.html delete mode 100644 docs/module-lib_query_builder_mysql-MySQLQueryBuilderKlass.html delete mode 100644 docs/module-lib_query_builder_mysql.html delete mode 100644 docs/module-lib_set_worker_and_ops-SetWorkerOps.html delete mode 100644 docs/module-lib_set_worker_and_ops.html delete mode 100644 docs/module-lib_transaction_helper-TransactionHelper.html delete mode 100644 docs/module-lib_transaction_helper.html delete mode 100644 docs/module-lib_web3_events_formatter-web3EventsDecoder.html delete mode 100644 docs/module-lib_web3_events_formatter-web3EventsFormatter.html delete mode 100644 docs/module-lib_web3_events_formatter.html delete mode 100644 docs/module-tools_deploy_DeployHelper.html delete mode 100644 docs/module-tools_deploy_EIP20TokenMock.html delete mode 100644 docs/module-tools_deploy_helper.html delete mode 100644 docs/module-tools_deploy_pricer.html delete mode 100644 docs/module-tools_deploy_workers.html delete mode 100644 docs/modules.list.html delete mode 100644 docs/namespaces.list.html delete mode 100644 docs/quicksearch.html delete mode 100644 docs/scripts/docstrap.lib.js delete mode 100644 docs/scripts/fulltext-search-ui.js delete mode 100644 docs/scripts/fulltext-search.js delete mode 100644 docs/scripts/lunr.min.js delete mode 100644 docs/scripts/prettify/Apache-License-2.0.txt delete mode 100644 docs/scripts/prettify/jquery.min.js delete mode 100644 docs/scripts/prettify/lang-css.js delete mode 100644 docs/scripts/prettify/prettify.js delete mode 100644 docs/scripts/sunlight.js delete mode 100644 docs/scripts/toc.js delete mode 100644 docs/styles/darkstrap.css delete mode 100644 docs/styles/prettify-tomorrow.css delete mode 100644 docs/styles/site.cerulean.css delete mode 100644 docs/styles/site.cosmo.css delete mode 100644 docs/styles/site.cyborg.css delete mode 100644 docs/styles/site.darkly.css delete mode 100644 docs/styles/site.darkstrap.css delete mode 100644 docs/styles/site.dibs-bootstrap.css delete mode 100644 docs/styles/site.flatly.css delete mode 100644 docs/styles/site.journal.css delete mode 100644 docs/styles/site.lumen.css delete mode 100644 docs/styles/site.paper.css delete mode 100644 docs/styles/site.readable.css delete mode 100644 docs/styles/site.sandstone.css delete mode 100644 docs/styles/site.simplex.css delete mode 100644 docs/styles/site.slate.css delete mode 100644 docs/styles/site.spacelab.css delete mode 100644 docs/styles/site.superhero.css delete mode 100644 docs/styles/site.united.css delete mode 100644 docs/styles/site.yeti.css delete mode 100644 docs/styles/sunlight.dark.css delete mode 100644 docs/styles/sunlight.default.css delete mode 100644 docs/userAirdropDetailCache.html create mode 100644 lib/web3/providers/ws.js delete mode 100644 mocha_test/scripts/nohup.out diff --git a/.travis.yml b/.travis.yml index bccdfeb..df3066b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ before_install: - sudo apt-get install software-properties-common - sudo add-apt-repository -y ppa:ethereum/ethereum - sudo apt-get update - - sudo apt-get install ethereum + - sudo bash mocha_test/scripts/install_geth_1_7_3.sh - sudo apt-get install solc - geth version install: diff --git a/README.md b/README.md index 5f203bb..09f7a47 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ sh start_test_chain.sh ```bash export OST_UTILITY_GETH_RPC_PROVIDER='' +export OST_UTILITY_GETH_WS_PROVIDER='' export OST_UTILITY_DEPLOYER_ADDR='' export OST_UTILITY_DEPLOYER_PASSPHRASE='' export OST_UTILITY_OPS_ADDR='' diff --git a/config/core_constants.js b/config/core_constants.js index eb6ac87..4d3ba21 100644 --- a/config/core_constants.js +++ b/config/core_constants.js @@ -16,10 +16,11 @@ function define(name, value) { }); } //Cache engine -define('CACHING_ENGINE', process.env.OST_CACHING_ENGINE), +define('CACHING_ENGINE', process.env.OST_CACHING_ENGINE); // Geth define('OST_UTILITY_GETH_RPC_PROVIDER', process.env.OST_UTILITY_GETH_RPC_PROVIDER); +define('OST_UTILITY_GETH_WS_PROVIDER', process.env.OST_UTILITY_GETH_WS_PROVIDER); // Gas limit define('OST_GAS_LIMIT', 9000000); define('OST_PAY_GAS_LIMIT', 150000); diff --git a/docs/baseCacheMultiManagementKlass.html b/docs/baseCacheMultiManagementKlass.html deleted file mode 100644 index 284a793..0000000 --- a/docs/baseCacheMultiManagementKlass.html +++ /dev/null @@ -1,1137 +0,0 @@ - - - - - - - OpenST Payments Class: baseCacheMultiManagementKlass - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: baseCacheMultiManagementKlass

-
- -
- -

- baseCacheMultiManagementKlass -

- - -
- - -
-
- - -
-
-

new baseCacheMultiManagementKlass(params)

- - -
-
- - -
- constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
params - - -Object - - - - - cache key generation & expiry related params
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

_fetchFromCache()

- - -
-
- - -
- fetch from cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - - -
-
-

_setCache(dataToSet)

- - -
-
- - -
- set data in cache. -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
dataToSet - - -Object - - - - - data to set in cache
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Result - - - -
-
- - - - - -
- - - -
-
-

clear()

- - -
-
- - -
- clear cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise.<Result> - - - -
-
- - - - - -
- - - -
-
-

fetch()

- - -
-
- - -
- Fetch data from cache, in case of cache miss calls sub class method to fetch data from source -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- - On success, data.value has value. On failure, error details returned. -
- - - -
-
- Type -
-
- -Promise.<Result> - - - -
-
- - - - - -
- - - -
-
-

fetchDataFromSource()

- - -
-
- - -
- fetch data from source -return should be of klass Result -data attr of return is returned and set in cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Result - - - -
-
- - - - - -
- - - -
-
-

setCacheExpiry()

- - -
-
- - -
- set cache expiry in oThis.cacheExpiry and return it -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Number - - - -
-
- - - - - -
- - - -
-
-

setCacheKeys()

- - -
-
- - -
- set cache keys in oThis.cacheKeys and return it -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -String - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/classes.list.html b/docs/classes.list.html deleted file mode 100644 index d73d5c4..0000000 --- a/docs/classes.list.html +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - OpenST Payments Classes - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Classes

-
- -
- -

- -

- - -
- - -
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
baseCacheMultiManagementKlass
-
- -
BasicHelperKlass
-
- -
approve
-
- -
base
-
- -
batchAllocator
-
- -
register
-
- -
transfer
-
- -
AdjustAirdropAmountKlass
-
- -
AirdropUserBalanceKlass
-
- -
AirdropBalanceCache
-
- -
BalanceCache
-
- -
PricerCache
-
- -
Airdrop
-
- -
BrandedToken
-
- -
ContractInteractHelper
-
- -
OpsManagedContract
-
- -
OwnedContract
-
- -
MockToken
-
- -
Pricer
-
- -
Workers
-
- -
Deploy
-
- -
MySQLQueryBuilderKlass
-
- -
SetWorkerOps
-
- -
TransactionHelper
-
- -
userAirdropDetailCache
-
-
- - - - - -

Namespaces

- -
-
web3EventsDecoder
-
- -
web3EventsFormatter
-
-
- - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/fonts/glyphicons-halflings-regular.eot b/docs/fonts/glyphicons-halflings-regular.eot deleted file mode 100644 index b93a4953fff68df523aa7656497ee339d6026d64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20127 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/fonts/glyphicons-halflings-regular.ttf b/docs/fonts/glyphicons-halflings-regular.ttf deleted file mode 100644 index 1413fc609ab6f21774de0cb7e01360095584f65b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 45404 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 G`u_lkUM?>H diff --git a/docs/fonts/glyphicons-halflings-regular.woff2 b/docs/fonts/glyphicons-halflings-regular.woff2 deleted file mode 100644 index 64539b54c3751a6d9adb44c8e3a45ba5a73b77f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18028 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 diff --git a/docs/global.html b/docs/global.html deleted file mode 100644 index 7a82c15..0000000 --- a/docs/global.html +++ /dev/null @@ -1,375 +0,0 @@ - - - - - - - OpenST Payments Global - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Global

-
- -
- -

- -

- - -
- - -
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - -

Members

- -
- -
-
-

<constant> rootPrefix

- - -
-
- -
- List of all addresses and there respective abi, bin, passphrase -required for platform. - -And helper methods to access this information using human readable -names. -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -
- - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/img/glyphicons-halflings-white.png b/docs/img/glyphicons-halflings-white.png deleted file mode 100644 index 3bf6484a29d8da269f9bc874b25493a45fae3bae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8777 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 B7G?kd diff --git a/docs/img/glyphicons-halflings.png b/docs/img/glyphicons-halflings.png deleted file mode 100644 index a9969993201f9cee63cf9f49217646347297b643..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12799 zcma*OWmH^Ivn@*S;K3nSf_t!#;0f+&pm7Po8`nk}2q8f5;M%x$SdAkd9FAvlc$ zx660V9e3Ox@4WZ^?7jZ%QFGU-T~%||Ug4iK6bbQY@zBuF2$hxOw9wF=A)nUSxR_5@ zEX>HBryGrjyuOFFv$Y4<+|3H@gQfEqD<)+}a~mryD|1U9*I_FOG&F%+Ww{SJ-V2BR zjt<81Ek$}Yb*95D4RS0HCps|uLyovt;P05hchQb-u2bzLtmog&f2}1VlNhxXV);S9 zM2buBg~!q9PtF)&KGRgf3#z7B(hm5WlNClaCWFs!-P!4-u*u5+=+D|ZE9e`KvhTHT zJBnLwGM%!u&vlE%1ytJ=!xt~y_YkFLQb6bS!E+s8l7PiPGSt9xrmg?LV&&SL?J~cI zS(e9TF1?SGyh+M_p@o1dyWu7o7_6p;N6hO!;4~ z2B`I;y`;$ZdtBpvK5%oQ^p4eR2L)BH>B$FQeC*t)c`L71gXHPUa|vyu`Bnz)H$ZcXGve(}XvR!+*8a>BLV;+ryG1kt0=)ytl zNJxFUN{V7P?#|Cp85QTa@(*Q3%K-R(Pkv1N8YU*(d(Y}9?PQ(j;NzWoEVWRD-~H$=f>j9~PN^BM2okI(gY-&_&BCV6RP&I$FnSEM3d=0fCxbxA6~l>54-upTrw zYgX@%m>jsSGi`0cQt6b8cX~+02IghVlNblR7eI;0ps}mpWUcxty1yG56C5rh%ep(X z?)#2d?C<4t-KLc*EAn>>M8%HvC1TyBSoPNg(4id~H8JwO#I)Bf;N*y6ai6K9_bA`4 z_g9(-R;qyH&6I$`b42v|0V3Z8IXN*p*8g$gE98+JpXNY+jXxU0zsR^W$#V=KP z3AEFp@OL}WqwOfsV<)A^UTF4&HF1vQecz?LWE@p^Z2){=KEC_3Iopx_eS42>DeiDG zWMXGbYfG~W7C8s@@m<_?#Gqk;!&)_Key@^0xJxrJahv{B&{^!>TV7TEDZlP|$=ZCz zmX=ZWtt4QZKx**)lQQoW8y-XLiOQy#T`2t}p6l*S`68ojyH@UXJ-b~@tN`WpjF z%7%Yzv807gsO!v=!(2uR)16!&U5~VPrPHtGzUU?2w(b1Xchq}(5Ed^G|SD7IG+kvgyVksU) z(0R)SW1V(>&q2nM%Z!C9=;pTg!(8pPSc%H01urXmQI6Gi^dkYCYfu6b4^tW))b^U+ z$2K&iOgN_OU7n#GC2jgiXU{caO5hZt0(>k+c^(r><#m|#J^s?zA6pi;^#*rp&;aqL zRcZi0Q4HhVX3$ybclxo4FFJW*`IV`)Bj_L3rQe?5{wLJh168Ve1jZv+f1D}f0S$N= zm4i|9cEWz&C9~ZI3q*gwWH^<6sBWuphgy@S3Qy?MJiL>gwd|E<2h9-$3;gT9V~S6r z)cAcmE0KXOwDA5eJ02-75d~f?3;n7a9d_xPBJaO;Z)#@s7gk5$Qn(Fc^w@9c5W0zY z59is0?Mt^@Rolcn{4%)Ioat(kxQH6}hIykSA)zht=9F_W*D#<}N(k&&;k;&gKkWIL z0Of*sP=X(Uyu$Pw;?F@?j{}=>{aSHFcii#78FC^6JGrg-)!)MV4AKz>pXnhVgTgx8 z1&5Y=>|8RGA6++FrSy=__k_imx|z-EI@foKi>tK0Hq2LetjUotCgk2QFXaej!BWYL zJc{fv(&qA7UUJ|AXLc5z*_NW#yWzKtl(c8mEW{A>5Hj^gfZ^HC9lQNQ?RowXjmuCj4!!54Us1=hY z0{@-phvC}yls!PmA~_z>Y&n&IW9FQcj}9(OLO-t^NN$c0o}YksCUWt|DV(MJB%%Sr zdf}8!9ylU2TW!=T{?)g-ojAMKc>3pW;KiZ7f0;&g)k}K^#HBhE5ot)%oxq$*$W@b# zg4p<Ou`ME|Kd1WHK@8 zzLD+0(NHWa`B{em3Ye?@aVsEi>y#0XVZfaFuq#;X5C3{*ikRx7UY4FF{ZtNHNO?A_ z#Q?hwRv~D8fPEc%B5E-ZMI&TAmikl||EERumQCRh7p;)>fdZMxvKq;ky0}7IjhJph zW*uuu*(Y6)S;Od--8uR^R#sb$cmFCnPcj9PPCWhPN;n`i1Q#Qn>ii z{WR|0>8F`vf&#E(c2NsoH=I7Cd-FV|%(7a`i}gZw4N~QFFG2WtS^H%@c?%9UZ+kez z;PwGgg_r6V>Kn5n(nZ40P4qMyrCP3bDkJp@hp6&X3>gzC>=f@Hsen<%I~7W+x@}b> z0}Et*vx_50-q@PIV=(3&Tbm}}QRo*FP2@)A#XX-8jYspIhah`9ukPBr)$8>Tmtg&R z?JBoH17?+1@Y@r>anoKPQ}F8o9?vhcG79Cjv^V6ct709VOQwg{c0Q#rBSsSmK3Q;O zBpNihl3S0_IGVE)^`#94#j~$;7+u870yWiV$@={|GrBmuz4b)*bCOPkaN0{6$MvazOEBxFdKZDlbVvv{8_*kJ zfE6C`4&Kkz<5u%dEdStd85-5UHG5IOWbo8i9azgg#zw-(P1AA049hddAB*UdG3Vn0 zX`OgM+EM|<+KhJ<=k?z~WA5waVj?T9eBdfJGebVifBKS1u<$#vl^BvSg)xsnT5Aw_ZY#}v*LXO#htB>f}x3qDdDHoFeb zAq7;0CW;XJ`d&G*9V)@H&739DpfWYzdQt+Kx_E1K#Cg1EMtFa8eQRk_JuUdHD*2;W zR~XFnl!L2A?48O;_iqCVr1oxEXvOIiN_9CUVTZs3C~P+11}ebyTRLACiJuMIG#`xP zKlC|E(S@QvN+%pBc6vPiQS8KgQAUh75C0a2xcPQDD$}*bM&z~g8+=9ltmkT$;c;s z5_=8%i0H^fEAOQbHXf0;?DN5z-5+1 zDxj50yYkz4ox9p$HbZ|H?8ukAbLE^P$@h}L%i6QVcY>)i!w=hkv2zvrduut%!8>6b zcus3bh1w~L804EZ*s96?GB&F7c5?m?|t$-tp2rKMy>F*=4;w*jW}^;8v`st&8)c; z2Ct2{)?S(Z;@_mjAEjb8x=qAQvx=}S6l9?~H?PmP`-xu;ME*B8sm|!h@BX4>u(xg_ zIHmQzp4Tgf*J}Y=8STR5_s)GKcmgV!$JKTg@LO402{{Wrg>#D4-L%vjmtJ4r?p&$F!o-BOf7ej~ z6)BuK^^g1b#(E>$s`t3i13{6-mmSp7{;QkeG5v}GAN&lM2lQT$@(aQCcFP(%UyZbF z#$HLTqGT^@F#A29b0HqiJsRJAlh8kngU`BDI6 zJUE~&!cQ*&f95Ot$#mxU5+*^$qg_DWNdfu+1irglB7yDglzH()2!@#rpu)^3S8weW z_FE$=j^GTY*|5SH95O8o8W9FluYwB=2PwtbW|JG6kcV^dMVmX(wG+Otj;E$%gfu^K z!t~<3??8=()WQSycsBKy24>NjRtuZ>zxJIED;YXaUz$@0z4rl+TW zWxmvM$%4jYIpO>j5k1t1&}1VKM~s!eLsCVQ`TTjn3JRXZD~>GM z$-IT~(Y)flNqDkC%DfbxaV9?QuWCV&-U1yzrV@0jRhE;)ZO0=r-{s@W?HOFbRHDDV zq;eLo+wOW;nI|#mNf(J?RImB9{YSO2Y`9825Lz#u4(nk3)RGv3X8B(A$TsontJ8L! z9JP^eWxtKC?G8^xAZa1HECx*rp35s!^%;&@Jyk)NexVc)@U4$^X1Dag6`WKs|(HhZ#rzO2KEw3xh~-0<;|zcs0L>OcO#YYX{SN8m6`9pp+ zQG@q$I)T?aoe#AoR@%om_#z=c@ych!bj~lV13Qi-xg$i$hXEAB#l=t7QWENGbma4L zbBf*X*4oNYZUd_;1{Ln_ZeAwQv4z?n9$eoxJeI?lU9^!AB2Y~AwOSq67dT9ADZ)s@ zCRYS7W$Zpkdx$3T>7$I%3EI2ik~m!f7&$Djpt6kZqDWZJ-G{*_eXs*B8$1R4+I}Kf zqniwCI64r;>h2Lu{0c(#Atn)%E8&)=0S4BMhq9$`vu|Ct;^ur~gL`bD>J@l)P$q_A zO7b3HGOUG`vgH{}&&AgrFy%K^>? z>wf**coZ2vdSDcNYSm~dZ(vk6&m6bVKmVgrx-X<>{QzA!)2*L+HLTQz$e8UcB&Djq zl)-%s$ZtUN-R!4ZiG=L0#_P=BbUyH+YPmFl_ogkkQ$=s@T1v}rNnZ^eMaqJ|quc+6 z*ygceDOrldsL30w`H;rNu+IjlS+G~p&0SawXCA1+D zC%cZtjUkLNq%FadtHE?O(yQTP486A{1x<{krq#rpauNQaeyhM3*i0%tBpQHQo-u)x z{0{&KS`>}vf2_}b160XZO2$b)cyrHq7ZSeiSbRvaxnKUH{Q`-P(nL&^fcF2){vhN- zbX&WEjP7?b4A%0y6n_=m%l00uZ+}mCYO(!x?j$+O$*TqoD_Q5EoyDJ?w?^UIa491H zE}87(bR`X;@u#3Qy~9wWdWQIg1`cXrk$x9=ccR|RY1~%{fAJ@uq@J3e872x0v$hmv ze_KcL(wM|n0EOp;t{hKoohYyDmYO;!`7^Lx;0k=PWPGZpI>V5qYlzjSL_(%|mud50 z7#{p97s`U|Sn$WYF>-i{i4`kzlrV6a<}=72q2sAT7Zh{>P%*6B;Zl;~0xWymt10Mo zl5{bmR(wJefJpNGK=fSRP|mpCI-)Nf6?Pv==FcFmpSwF1%CTOucV{yqxSyx4Zws3O z8hr5Uyd%ezIO7?PnEO0T%af#KOiXD$e?V&OX-B|ZX-YsgSs%sv-6U+sLPuz{D4bq| zpd&|o5tNCmpT>(uIbRf?8c}d3IpOb3sn6>_dr*26R#ev<_~vi)wleW$PX|5)$_ z+_|=pi(0D(AB_sjQ;sQQSM&AWqzDO1@NHw;C9cPdXRKRI#@nUW)CgFxzQ1nyd!+h& zcjU!U=&u|>@}R(9D$%lu2TlV>@I2-n@fCr5PrZNVyKWR7hm zWjoy^p7v8m#$qN0K#8jT- zq`mSirDZDa1Jxm;Rg3rAPhC)LcI4@-RvKT+@9&KsR3b0_0zuM!Fg7u>oF>3bzOxZPU&$ab$Z9@ zY)f7pKh22I7ZykL{YsdjcqeN++=0a}elQM-4;Q)(`Ep3|VFHqnXOh14`!Bus& z9w%*EWK6AiAM{s$6~SEQS;A>ey$#`7)khZvamem{P?>k)5&7Sl&&NXKk}o!%vd;-! zpo2p-_h^b$DNBO>{h4JdGB=D>fvGIYN8v&XsfxU~VaefL?q} z3ekM?iOKkCzQHkBkhg=hD!@&(L}FcHKoa zbZ7)H1C|lHjwEb@tu=n^OvdHOo7o+W`0-y3KdP#bb~wM=Vr_gyoEq|#B?$&d$tals ziIs-&7isBpvS|CjC|7C&3I0SE?~`a%g~$PI%;au^cUp@ER3?mn-|vyu!$7MV6(uvt z+CcGuM(Ku2&G0tcRCo7#D$Dirfqef2qPOE5I)oCGzmR5G!o#Q~(k~)c=LpIfrhHQk zeAva6MilEifE7rgP1M7AyWmLOXK}i8?=z2;N=no)`IGm#y%aGE>-FN zyXCp0Sln{IsfOBuCdE*#@CQof%jzuU*jkR*Su3?5t}F(#g0BD0Zzu|1MDes8U7f9; z$JBg|mqTXt`muZ8=Z`3wx$uizZG_7>GI7tcfOHW`C2bKxNOR)XAwRkLOaHS4xwlH4 zDpU29#6wLXI;H?0Se`SRa&I_QmI{zo7p%uveBZ0KZKd9H6@U?YGArbfm)D*^5=&Rp z`k{35?Z5GbZnv>z@NmJ%+sx=1WanWg)8r}C_>EGR8mk(NR$pW<-l8OTU^_u3M@gwS z7}GGa1)`z5G|DZirw;FB@VhH7Dq*0qc=|9lLe{w2#`g+_nt>_%o<~9(VZe=zI*SSz4w43-_o>4E4`M@NPKTWZuQJs)?KXbWp1M zimd5F;?AP(LWcaI-^Sl{`~>tmxsQB9Y$Xi*{Zr#py_+I$vx7@NY`S?HFfS!hUiz$a z{>!&e1(16T!Om)m)&k1W#*d#GslD^4!TwiF2WjFBvi=Ms!ADT)ArEW6zfVuIXcXVk z>AHjPADW+mJzY`_Ieq(s?jbk4iD2Rb8*V3t6?I+E06(K8H!!xnDzO%GB;Z$N-{M|B zeT`jo%9)s%op*XZKDd6*)-^lWO{#RaIGFdBH+;XXjI(8RxpBc~azG1H^2v7c^bkFE zZCVPE+E*Q=FSe8Vm&6|^3ki{9~qafiMAf7i4APZg>b%&5>nT@pHH z%O*pOv(77?ZiT{W zBibx}Q12tRc7Py1NcZTp`Q4ey%T_nj@1WKg5Fz_Rjl4wlJQj)rtp8yL3r!Shy zvZvnmh!tH4T6Js-?vI0<-rzzl{mgT*S0d_7^AU_8gBg^03o-J=p(1o6kww2hx|!%T z-jqp}m^G*W?$!R#M%Ef?&2jYxmx+lXWZszpI4d$pUN`(S)|*c^CgdwY>Fa>> zgGBJhwe8y#Xd*q0=@SLEgPF>+Qe4?%E*v{a`||luZ~&dqMBrRfJ{SDMaJ!s_;cSJp zSqZHXIdc@@XteNySUZs^9SG7xK`8=NBNM)fRVOjw)D^)w%L2OPkTQ$Tel-J)GD3=YXy+F4in(ILy*A3m@3o73uv?JC}Q>f zrY&8SWmesiba0|3X-jmlMT3 z*ST|_U@O=i*sM_*48G)dgXqlwoFp5G6qSM3&%_f_*n!PiT>?cNI)fAUkA{qWnqdMi+aNK_yVQ&lx4UZknAc9FIzVk% zo6JmFH~c{_tK!gt4+o2>)zoP{sR}!!vfRjI=13!z5}ijMFQ4a4?QIg-BE4T6!#%?d&L;`j5=a`4is>U;%@Rd~ zXC~H7eGQhhYWhMPWf9znDbYIgwud(6$W3e>$W4$~d%qoJ z+JE`1g$qJ%>b|z*xCKenmpV$0pM=Gl-Y*LT8K+P)2X#;XYEFF4mRbc~jj?DM@(1e`nL=F4Syv)TKIePQUz)bZ?Bi3@G@HO$Aps1DvDGkYF50O$_welu^cL7;vPiMGho74$;4fDqKbE{U zd1h{;LfM#Fb|Z&uH~Rm_J)R~Vy4b;1?tW_A)Iz#S_=F|~pISaVkCnQ0&u%Yz%o#|! zS-TSg87LUfFSs{tTuM3$!06ZzH&MFtG)X-l7>3)V?Txuj2HyG*5u;EY2_5vU0ujA? zHXh5G%6e3y7v?AjhyX79pnRBVr}RmPmtrxoB7lkxEzChX^(vKd+sLh?SBic=Q)5nA zdz7Mw3_iA>;T^_Kl~?1|5t%GZ;ki_+i>Q~Q1EVdKZ)$Sh3LM@ea&D~{2HOG++7*wF zAC6jW4>fa~!Vp5+$Z{<)Qxb|{unMgCv2)@%3j=7)Zc%U<^i|SAF88s!A^+Xs!OASYT%7;Jx?olg_6NFP1475N z#0s<@E~FI}#LNQ{?B1;t+N$2k*`K$Hxb%#8tRQi*Z#No0J}Pl;HWb){l7{A8(pu#@ zfE-OTvEreoz1+p`9sUI%Y{e5L-oTP_^NkgpYhZjp&ykinnW;(fu1;ttpSsgYM8ABX4dHe_HxU+%M(D=~) zYM}XUJ5guZ;=_ZcOsC`_{CiU$zN3$+x&5C`vX-V3`8&RjlBs^rf00MNYZW+jCd~7N z%{jJuUUwY(M`8$`B>K&_48!Li682ZaRknMgQ3~dnlp8C?__!P2z@=Auv;T^$yrsNy zCARmaA@^Yo2sS%2$`031-+h9KMZsIHfB>s@}>Y(z988e!`%4=EDoAQ0kbk>+lCoK60Mx9P!~I zlq~wf7kcm_NFImt3ZYlE(b3O1K^QWiFb$V^a2Jlwvm(!XYx<`i@ZMS3UwFt{;x+-v zhx{m=m;4dgvkKp5{*lfSN3o^keSpp9{hlXj%=}e_7Ou{Yiw(J@NXuh*;pL6@$HsfB zh?v+r^cp@jQ4EspC#RqpwPY(}_SS$wZ{S959`C25777&sgtNh%XTCo9VHJC-G z;;wi9{-iv+ETiY;K9qvlEc04f;ZnUP>cUL_T*ms``EtGoP^B#Q>n2dSrbAg8a>*Lg zd0EJ^=tdW~7fbcLFsqryFEcy*-8!?;n%;F+8i{eZyCDaiYxghr z$8k>L|2&-!lhvuVdk!r-kpSFl`5F5d4DJr%M4-qOy3gdmQbqF1=aBtRM7)c_Ae?$b8 zQg4c8*KQ{XJmL)1c7#0Yn0#PTMEs4-IHPjkn0!=;JdhMXqzMLeh`yOylXROP- zl#z3+fwM9l3%VN(6R77ua*uI9%hO7l7{+Hcbr(peh;afUK?B4EC09J{-u{mv)+u#? zdKVBCPt`eU@IzL)OXA`Ebu`Xp?u0m%h&X41}FNfnJ*g1!1wcbbpo%F4x!-#R9ft!8{5`Ho}04?FI#Kg zL|k`tF1t_`ywdy8(wnTut>HND(qNnq%Sq=AvvZbXnLx|mJhi!*&lwG2g|edBdVgLy zjvVTKHAx(+&P;P#2Xobo7_RttUi)Nllc}}hX>|N?-u5g7VJ-NNdwYcaOG?NK=5)}` zMtOL;o|i0mSKm(UI_7BL_^6HnVOTkuPI6y@ZLR(H?c1cr-_ouSLp{5!bx^DiKd*Yb z{K78Ci&Twup zTKm)ioN|wcYy%Qnwb)IzbH>W!;Ah5Zdm_jRY`+VRJ2 zhkspZ9hbK3iQD91A$d!0*-1i#%x81|s+SPRmD}d~<1p6!A13(!vABP2kNgqEG z?AMgl^P+iRoIY(9@_I?n1829lGvAsRnHwS~|5vD2+Zi53j<5N4wNn0{q>>jF9*bI) zL$kMXM-awNOElF>{?Jr^tOz1glbwaD-M0OKOlTeW3C!1ZyxRbB>8JDof(O&R1bh%3x#>y2~<>OXO#IIedH0Q`(&&?eo-c~ z>*Ah#3~09unym~UC-UFqqI>{dmUD$Y4@evG#ORLI*{ZM)Jl=e1it!XzY($S3V zLG!Y6fCjE>x6r@5FG1n|8ompSZaJ>9)q6jqU;XxCQk9zV(?C9+i*>w z21+KYt1gXX&0`x3E)hS7I5}snbBzox9C@Xzcr|{B8Hw;SY1$}&BoYKXH^hpjW-RgJ z-Fb}tannKCv>y~^`r|(1Q9;+sZlYf3XPSX|^gR01UFtu$B*R;$sPZdIZShRr>|b@J z;#G{EdoY+O;REEjQ}X7_YzWLO+Ey3>a_KDe1CjSe| z6arqcEZ)CX!8r(si`dqbF$uu&pnf^Np{1f*TdJ`r2;@SaZ z#hb4xlaCA@Pwqj#LlUEe5L{I$k(Zj$d3(~)u(F%&xb8={N9hKxlZIO1ABsM{Mt|)2 zJ^t9Id;?%4PfR4&Ph9B9cFK~@tG3wlFW-0fXZS_L4U*EiAA%+`h%q2^6BCC;t0iO4V=s4Qug{M|iDV@s zC7|ef-dxiR7T&Mpre!%hiUhHM%3Qxi$Lzw6&(Tvlx9QA_7LhYq<(o~=Y>3ka-zrQa zhGpfFK@)#)rtfz61w35^sN1=IFw&Oc!Nah+8@qhJ0UEGr;JplaxOGI82OVqZHsqfX ze1}r{jy;G?&}Da}a7>SCDsFDuzuseeCKof|Dz2BPsP8? zY;a)Tkr2P~0^2BeO?wnzF_Ul-ekY=-w26VnU%U3f19Z-pj&2 z4J_a|o4Dci+MO)mPQIM>kdPG1xydiR9@#8m zh27D7GF{p|a{8({Q-Pr-;#jV{2zHR>lGoFtIfIpoMo?exuQyX_A;;l0AP4!)JEM$EwMInZkj+8*IHP4vKRd zKx_l-i*>A*C@{u%ct`y~s6MWAfO{@FPIX&sg8H{GMDc{4M3%$@c8&RAlw0-R<4DO3 trJqdc$mBpWeznn?E0M$F`|3v=`3%T2A17h;rxP7$%JLd=6(2u;`(N3pt&so# diff --git a/docs/index.html b/docs/index.html deleted file mode 100644 index 7df5100..0000000 --- a/docs/index.html +++ /dev/null @@ -1,304 +0,0 @@ - - - - - - - OpenST Payments Index - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - - - - - - - - - - - - - - - - - - - - - -
-

OpenST Payments - Advance Payment infrastructure on top of the OpenST network

Latest version -Travis -Downloads per month -Gitter: JOIN CHAT

-

While OpenST 0.9 is available as-is for anyone to use, we caution that this is early stage software and under heavy ongoing development and improvement. Please report bugs and suggested improvements.

-

Install OpenST Payments

npm install @openstfoundation/openst-payments --save

Run Test Chain

cd mocha_test/scripts/
-sh start_test_chain.sh

Set EVN Variables

Setup Initial Setup Variables:

export OST_UTILITY_GETH_RPC_PROVIDER=''
-export OST_UTILITY_DEPLOYER_ADDR=''
-export OST_UTILITY_DEPLOYER_PASSPHRASE=''
-export OST_UTILITY_OPS_ADDR=''
-export OST_UTILITY_OPS_PASSPHRASE=''

Deploy Branded Token Contract:

node tools/deploy/EIP20TokenMock.js conversionRate symbol name decimals gasPrice

Deploy Workers Contract:

node tools/deploy/workers.js gasPrice chainId

Deploy Airdrop Contract:

node tools/deploy/airdrop.js brandedTokenContractAddress baseCurrency workerContractAddress airdropBudgetHolder gasPrice chainId

Set Caching Engine:

export OST_CACHING_ENGINE='none'
-For using redis/memcache as cache engine refer - [OpenSTFoundation/ost-price-oracle](https://github.com/OpenSTFoundation/ost-price-oracle)

Set DB Details For Payments/Airdrop:

export OP_MYSQL_HOST=''
-export OP_MYSQL_USER=''
-export OP_MYSQL_PASSWORD=''
-export OP_MYSQL_DATABASE=''
-export OP_MYSQL_CONNECTION_POOL_SIZE='5'

Create Airdrop Tables:

node migrations/create_tables.js

Example:

const OpenSTPayment = require('@openstfoundation/openst-payments')
-  , deployer = new OpenSTPayment.deployer()
-  , opsManaged = new OpenSTPayment.opsManaged(contractAddress, gasPrice, chainId)
-  , workers = new OpenSTPayment.worker(workerContractAddress, chainId)
-  , airdrop = new OpenSTPayment.airdrop(airdropContractAddress, chainId)
-  , airdropManager = OpenSTPayment.airdropManager
-;  
-  // Deploy Contract
-  deployer.deploy( contractName, constructorArgs, gasPrice, options);
-  // Register Airdrop
-  airdropManager.registerAirdrop(airdropContractAddress, chainId);
-  // Set Ops Address
-  opsManaged.setOpsAddress(deployerAddress, deployerPassphrase, opsAddress, options);
-  // Set Worker
-  workers.setWorker(senderAddress, senderPassphrase, workerAddress, deactivationHeight, gasPrice, options);
-  // Set Price Oracle
-  airdrop.setPriceOracle(senderAddress, senderPassphrase, currency, address, gasPrice, options);
-  // Set Accepted Margin
-  airdrop.setAcceptedMargin(senderAddress, senderPassphrase, currency, acceptedMargin, gasPrice, options);
-  // Transfer Amount to airdrop budget holder
-  airdropManager.transfer(senderAddress, senderPassphrase, airdropContractAddress, amount, gasPrice, chainId, options);
-  // Approve airdrop budget holder
-  airdropManager.approve(airdropContractAddress, airdropBudgetHolderPassphrase, gasPrice, chainId, options);
-  // Allocate airdrop amount to users in batch
-  airdropManager.batchAllocate(airdropContractAddress, transactionHash, airdropUsers, chainId);
-  // Get Users Airdrop Balance
-  airdropManager.getAirdropBalance(chainId, airdropContractAddress, userAddresses);
-  // Call Pay method
-  airdrop.pay(workerAddress,
-              WorkerPassphrase,
-              beneficiaryAddress,
-              transferAmount,
-              commissionBeneficiaryAddress,
-              commissionAmount,
-              currency,
-              intendedPricePoint,
-              spender,
-              gasPrice,
-              {tag:'airdrop.pay', returnType: 'txHash'});

For further implementation details, please refer to the API documentation.

-
- - - - - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-helpers_basic_helper-BasicHelperKlass.html b/docs/module-helpers_basic_helper-BasicHelperKlass.html deleted file mode 100644 index bdc1135..0000000 --- a/docs/module-helpers_basic_helper-BasicHelperKlass.html +++ /dev/null @@ -1,2419 +0,0 @@ - - - - - - - OpenST Payments Class: BasicHelperKlass - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: BasicHelperKlass

-
- -
- -

- helpers/basic_helper~ - - BasicHelperKlass -

- - -
- - -
-
- - -
-
-

new BasicHelperKlass()

- - -
-
- - -
- Basic helper methods constructor -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

convertToBigNumber(amountInWei)

- - -
-
- - -
- Convert number to big number. Make sure it's a valid number -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
amountInWei - - -number - - - - - amount in wei to be formatted
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -BigNumber - - - -
-
- - - - - -
- - - -
-
-

formatWeiToString(amountInWei)

- - -
-
- - -
- Convert wei to proper string. Make sure it's a valid number -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
amountInWei - - -number - - - - - amount in wei to be formatted
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -string - - - -
-
- - - - - -
- - - -
-
-

getReturnType(returnType)

- - -
-
- - -
- get return type for transaction -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
returnType - - -string - - - - - return from geth transactions when following event is received
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -string - - - -
-
- - - - - -
- - - -
-
-

isAddressValid(address)

- - -
-
- - -
- Check if address is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
address - - -string - - - - - Address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isBTConversionRateValid(conversionRate)

- - -
-
- - -
- Check if branded token conversion rate is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
conversionRate - - -number - - - - - Branded token conversion rate
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isBTNameValid(name)

- - -
-
- - -
- Check if branded token name is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
name - - -string - - - - - Branded token name
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isBTSymbolValid(symbol)

- - -
-
- - -
- Check if branded token symbol is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
symbol - - -string - - - - - Branded token symbol
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isNonZeroWeiValid(amountInWei)

- - -
-
- - -
- Check if amount is valid wei number and not zero -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
amountInWei - - -number - - - - - amount in wei
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isReturnTypeTxHash(returnType)

- - -
-
- - -
- check if return type is txHash or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
returnType - - -string - - - - - return type
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isReturnTypeTxReceipt(returnType)

- - -
-
- - -
- check if return type is txReceipt or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
returnType - - -string - - - - - return type
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isReturnTypeUUID(returnType)

- - -
-
- - -
- check if return type is uuid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
returnType - - -string - - - - - return type
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isTxHashValid(transactionHash)

- - -
-
- - -
- Check if transaction hash is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transactionHash - - -string - - - - - Transaction hash
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isUuidValid(uuid)

- - -
-
- - -
- Check if uuid is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
uuid - - -string - - - - - Branded Token UUID
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isValidChainId(chainId)

- - -
-
- - -
- Check if chainId is valid -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -Number - - - - - chainId
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Bool - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-helpers_basic_helper.html b/docs/module-helpers_basic_helper.html deleted file mode 100644 index f06aca7..0000000 --- a/docs/module-helpers_basic_helper.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: helpers/basic_helper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: helpers/basic_helper

-
- -
- -
- - -
-
- - -
Perform basic validations
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
BasicHelperKlass
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_approve-approve.html b/docs/module-lib_airdrop_management_approve-approve.html deleted file mode 100644 index bc91d23..0000000 --- a/docs/module-lib_airdrop_management_approve-approve.html +++ /dev/null @@ -1,807 +0,0 @@ - - - - - - - OpenST Payments Class: approve - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: approve

-
- -
- -

- lib/airdrop_management/approve~ - - approve -

- - -
- - -
-
- - -
-
-

new approve(airdropContractAddress, airdropBudgetHolderPassphrase, gasPrice, chainId, options)

- - -
-
- - -
- Constructor to create object of approve -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
airdropBudgetHolderPassphrase - - -String - - - - - airdropBudgetHolder Passphrase
gasPrice - - -String - - - - - gas price
chainId - - -Number - - - - - chain Id
options - - -Object - - - - - chain Id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

doApprove()

- - -
-
- - -
- Perform Approve to airdrop budget holder -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

perform()

- - -
-
- - -
- Perform approve by airdrop budget holder to contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

validateParams()

- - -
-
- - -
- Validate params -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_approve.html b/docs/module-lib_airdrop_management_approve.html deleted file mode 100644 index a8a2ad2..0000000 --- a/docs/module-lib_airdrop_management_approve.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/approve - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/approve

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing approve by airdrop budget holder.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
approve
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_base-base.html b/docs/module-lib_airdrop_management_base-base.html deleted file mode 100644 index 3539446..0000000 --- a/docs/module-lib_airdrop_management_base-base.html +++ /dev/null @@ -1,1478 +0,0 @@ - - - - - - - OpenST Payments Class: base - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: base

-
- -
- -

- lib/airdrop_management/base~ - - base -

- - -
- - -
-
- - -
-
-

new base()

- - -
-
- - -
- Constructor to create object of base -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

approve(airdropContractAddress, airdropBudgetHolderPassphrase, gasPrice, chainId, options)

- - -
-
- - -
- approve airdrop amount to airdrop contract address -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
airdropBudgetHolderPassphrase - - -string - - - - - passphrase
gasPrice - - -Hex - - - - - gasPrice
chainId - - -Number - - - - - chainId
options - - -Object - - - - - options e.g. {returnType: '', tag: ''}
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

batchAllocate(airdropContractAddress, transactionHash, airdropUsers, chainId)

- - -
-
- - -
- batch allocate to users -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
transactionHash - - -Hex - - - - - transfer transaction hash
airdropUsers - - -Object - - - - - airdropUsers => {address: {airdropAmount:2, expiryTimestamp: timestamp}}
chainId - - -Number - - - - - chainId
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -response - - - -
-
- - - - - -
- - - -
-
-

getAirdropBalance(chainId, airdropContractAddress, userAddresses)

- - -
-
- - -
- Get user airdrop balance -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -Integer - - - - - chain Id
airdropContractAddress - - -Hex - - - - - airdrop contract address
userAddresses - - -Array - - - - - array of user addresses
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- - { - '0x934ebd34b2a4f16d4de16256df36a6013785557d': {totalAirdropAmount: '10000000000000000', totalAirdropUsedAmount: '10000000000000000', balanceAirdropAmount: '10000000000000000'}, - '0x934ebd34b2a4f16d4de16256df36a6013785557e': {totalAirdropAmount: '20000000000000000', totalAirdropUsedAmount: '20000000000000000', balanceAirdropAmount: '10000000000000000'} -} -
- - - -
-
- Type -
-
- -response - - - -
-
- - - - - -
- - - -
-
-

registerAirdrop(airdropContractAddress, chainId)

- - -
-
- - -
- Register Airdrop -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
chainId - - -Number - - - - - chain Id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

transfer(senderAddress, senderPassphrase, airdropContractAddress, amount, gasPrice, chainId, options)

- - -
-
- - -
- Transfer airdrop amount to airdrop budget holder -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -Hex - - - - - Sender Address
senderPassphrase - - -string - - - - - passphrase
airdropContractAddress - - -Hex - - - - - airdrop contract address
amount - - -BigNumber - - - - - amount to transfer
gasPrice - - -Hex - - - - - gasPrice
chainId - - -Number - - - - - chainId
options - - -Object - - - - - options e.g. {returnType: '', tag: ''}
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_base.html b/docs/module-lib_airdrop_management_base.html deleted file mode 100644 index c16fc3a..0000000 --- a/docs/module-lib_airdrop_management_base.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/base - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/base

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods related to airdrop.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
base
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_batch_allocator-batchAllocator.html b/docs/module-lib_airdrop_management_batch_allocator-batchAllocator.html deleted file mode 100644 index 8c5e4eb..0000000 --- a/docs/module-lib_airdrop_management_batch_allocator-batchAllocator.html +++ /dev/null @@ -1,881 +0,0 @@ - - - - - - - OpenST Payments Class: batchAllocator - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: batchAllocator

-
- -
- -

- lib/airdrop_management/batch_allocator~ - - batchAllocator -

- - -
- - -
-
- - -
-
-

new batchAllocator(airdropContractAddress, transactionHash, airdropUsers, chainId)

- - -
-
- - -
- Constructor to create object of batch allocator -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
transactionHash - - -Hex - - - - - airdrop transfer transactio hash
airdropUsers - - -Object - - - - - {userAddress: {airdropAmount: inwei, expiryTimestamp: 0}}
chainId - - -Number - - - - - chain ID
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

allocateAirdropAmountToUsers()

- - -
-
- - -
- Allocate airdrop amount to users -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

clearCache()

- - -
-
- - -
- Clear all users cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -nil - - - -
-
- - - - - -
- - - -
-
-

perform()

- - -
-
- - -
- Perform batch allocation to airdrop users -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

validateParams()

- - -
-
- - -
- Validate params -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_batch_allocator.html b/docs/module-lib_airdrop_management_batch_allocator.html deleted file mode 100644 index 306ca28..0000000 --- a/docs/module-lib_airdrop_management_batch_allocator.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/batch_allocator - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/batch_allocator

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for allocating amount to airdrop users.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
batchAllocator
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_register-register.html b/docs/module-lib_airdrop_management_register-register.html deleted file mode 100644 index 8b27abf..0000000 --- a/docs/module-lib_airdrop_management_register-register.html +++ /dev/null @@ -1,735 +0,0 @@ - - - - - - - OpenST Payments Class: register - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: register

-
- -
- -

- lib/airdrop_management/register~ - - register -

- - -
- - -
-
- - -
-
-

new register(airdropContractAddress, chainId)

- - -
-
- - -
- Constructor to create object of register -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
chainId - - -Number - - - - - chain Id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

perform()

- - -
-
- - -
- Perform method -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -responseHelper - - - -
-
- - - - - -
- - - -
-
-

runRegister()

- - -
-
- - -
- Run the register -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

validateParams()

- - -
-
- - -
- Validation of params -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_register.html b/docs/module-lib_airdrop_management_register.html deleted file mode 100644 index 3cf66b5..0000000 --- a/docs/module-lib_airdrop_management_register.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/register - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/register

-
- -
- -
- - -
-
- - -
This class would be used for executing airdrop register.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
register
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_transfer-transfer.html b/docs/module-lib_airdrop_management_transfer-transfer.html deleted file mode 100644 index 5b04245..0000000 --- a/docs/module-lib_airdrop_management_transfer-transfer.html +++ /dev/null @@ -1,855 +0,0 @@ - - - - - - - OpenST Payments Class: transfer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: transfer

-
- -
- -

- lib/airdrop_management/transfer~ - - transfer -

- - -
- - -
-
- - -
-
-

new transfer(senderAddress, senderPassphrase, airdropContractAddress, amount, gasPrice, chainId, options)

- - -
-
- - -
- Constructor to create object of transfer -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -Hex - - - - - sender address
senderPassphrase - - -String - - - - - sender Passphrase
airdropContractAddress - - -Hex - - - - - airdrop contract address
amount - - -String - - - - - amount in wei
gasPrice - - -String - - - - - gas price
chainId - - -Number - - - - - chain Id
options - - -Object - - - - - chain Id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

doTransfer()

- - -
-
- - -
- Transfer amount to airdrop budget holder -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

perform()

- - -
-
- - -
- Perform method -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

validateParams()

- - -
-
- - -
- validation of params -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_transfer.html b/docs/module-lib_airdrop_management_transfer.html deleted file mode 100644 index dd6ef9a..0000000 --- a/docs/module-lib_airdrop_management_transfer.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/transfer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/transfer

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing transfer amount to airdrop budget holder.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
transfer
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_user_balance-AdjustAirdropAmountKlass.html b/docs/module-lib_airdrop_management_user_balance-AdjustAirdropAmountKlass.html deleted file mode 100644 index 9435744..0000000 --- a/docs/module-lib_airdrop_management_user_balance-AdjustAirdropAmountKlass.html +++ /dev/null @@ -1,831 +0,0 @@ - - - - - - - OpenST Payments Class: AdjustAirdropAmountKlass - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: AdjustAirdropAmountKlass

-
- -
- -

- lib/airdrop_management/user_balance~ - - AdjustAirdropAmountKlass -

- - -
- - -
-
- - -
-
-

new AdjustAirdropAmountKlass(airdropContractAddress, userAddress, airdropAmountUsed)

- - -
-
- - -
- Constructor to create object of userBalance -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -Hex - - - - - airdrop contract address
userAddress - - -Array - - - - - Array of user addressed
airdropAmountUsed - - -BigNumber - - - - - used airdrop amount
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

creditAirdropUsedAmount()

- - -
-
- - -
- Credit airdrop used amount. decreases airdrop_used_amount of user_airdrop_details table -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

debitAirdropUsedAmount()

- - -
-
- - -
- Debit airdrop used amount -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

rollbackCreditAirdropAdjustedAmount()

- - -
-
- - -
- Rollback credit airdrop used amount -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

rollbackDebitAirdropAdjustedAmount()

- - -
-
- - -
- Rollback debit airdrop used amount -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_user_balance-AirdropUserBalanceKlass.html b/docs/module-lib_airdrop_management_user_balance-AirdropUserBalanceKlass.html deleted file mode 100644 index d15a2a1..0000000 --- a/docs/module-lib_airdrop_management_user_balance-AirdropUserBalanceKlass.html +++ /dev/null @@ -1,759 +0,0 @@ - - - - - - - OpenST Payments Class: AirdropUserBalanceKlass - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: AirdropUserBalanceKlass

-
- -
- -

- lib/airdrop_management/user_balance~ - - AirdropUserBalanceKlass -

- - -
- - -
-
- - -
-
-

new AirdropUserBalanceKlass(chainId, airdropContractAddress, userAddresses)

- - -
-
- - -
- Constructor to create object of userBalance -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -Number - - - - - chain Id
airdropContractAddress - - -Hex - - - - - airdrop contract address
userAddresses - - -Array - - - - - Array of user addressed
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Object - - - -
-
- - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

getUserAirdropBalance()

- - -
-
- - -
- Run the register -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

perform()

- - -
-
- - -
- Perform method -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -responseHelper - - - -
-
- - - - - -
- - - -
-
-

validateParams()

- - -
-
- - -
- Validation of params -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_airdrop_management_user_balance.html b/docs/module-lib_airdrop_management_user_balance.html deleted file mode 100644 index 22b8b0f..0000000 --- a/docs/module-lib_airdrop_management_user_balance.html +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - OpenST Payments Module: lib/airdrop_management/user_balance - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/airdrop_management/user_balance

-
- -
- -
- - -
-
- - -
This class would be used for calculating user airdrop balance.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
AdjustAirdropAmountKlass
-
- -
AirdropUserBalanceKlass
-
-
- - - - - - - - - - - - - -
- -
- - - - -

Module: lib/airdrop_management/user_balance

-
- -
- -
- - -
-
- - -
This class would be used for calculating user airdrop balance.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
AdjustAirdropAmountKlass
-
- -
AirdropUserBalanceKlass
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_airdrop_cache-AirdropBalanceCache.html b/docs/module-lib_cache_management_airdrop_cache-AirdropBalanceCache.html deleted file mode 100644 index 9d21a17..0000000 --- a/docs/module-lib_cache_management_airdrop_cache-AirdropBalanceCache.html +++ /dev/null @@ -1,428 +0,0 @@ - - - - - - - OpenST Payments Class: AirdropBalanceCache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: AirdropBalanceCache

-
- -
- -

- lib/cache_management/airdrop_cache~ - - AirdropBalanceCache -

- - -
- - -
-
- - -
-
-

new AirdropBalanceCache(chainId, airdropAddress)

- - -
-
- - -
- constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -string - - - - - Chain id
airdropAddress - - -string - - - - - address of airdrop contract
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - -

Extends

- - - - -
    -
  • PricerCacheKlass
    • -
- - - - - - - - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_airdrop_cache.html b/docs/module-lib_cache_management_airdrop_cache.html deleted file mode 100644 index 27af12a..0000000 --- a/docs/module-lib_cache_management_airdrop_cache.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/cache_management/airdrop_cache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/cache_management/airdrop_cache

-
- -
- -
- - -
-
- - -
This is cache layer for airdrop balance related caching

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
AirdropBalanceCache
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_balance_cache-BalanceCache.html b/docs/module-lib_cache_management_balance_cache-BalanceCache.html deleted file mode 100644 index 91fc800..0000000 --- a/docs/module-lib_cache_management_balance_cache-BalanceCache.html +++ /dev/null @@ -1,889 +0,0 @@ - - - - - - - OpenST Payments Class: BalanceCache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: BalanceCache

-
- -
- -

- lib/cache_management/balance_cache~ - - BalanceCache -

- - -
- - -
-
- - -
-
-

new BalanceCache(chainId, brandedTokenAddress)

- - -
-
- - -
- constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -string - - - - - Chain id
brandedTokenAddress - - -string - - - - - address of branded token contract
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

clearBalance(owner)

- - -
-
- - -
- Clear balance from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address of user whose balance is to be set
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getBalance(owner)

- - -
-
- - -
- Get balance from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address of user whose balance is to be found
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setBalance(owner, balance)

- - -
-
- - -
- Set balance to cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address of user whose balance is to be set
balance - - -BigNumber - - - - - balance of the user
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_balance_cache.html b/docs/module-lib_cache_management_balance_cache.html deleted file mode 100644 index 0ea4d9c..0000000 --- a/docs/module-lib_cache_management_balance_cache.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/cache_management/balance_cache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/cache_management/balance_cache

-
- -
- -
- - -
-
- - -
This is cache layer for balance related caching

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
BalanceCache
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_pricer_cache-PricerCache.html b/docs/module-lib_cache_management_pricer_cache-PricerCache.html deleted file mode 100644 index 14a3808..0000000 --- a/docs/module-lib_cache_management_pricer_cache-PricerCache.html +++ /dev/null @@ -1,3891 +0,0 @@ - - - - - - - OpenST Payments Class: PricerCache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: PricerCache

-
- -
- -

- lib/cache_management/pricer_cache~ - - PricerCache -

- - -
- - -
-
- - -
-
-

new PricerCache(chainId, contractAddress)

- - -
-
- - -
- constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -string - - - - - Chain id
contractAddress - - -string - - - - - address of pricer/airdrop contract
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

clearAcceptedMargins(currency)

- - -
-
- - -
- reset accepted margin cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearBrandedTokenAddress(brandedTokenAddress)

- - -
-
- - -
- clear branded token address cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearCache(key)

- - -
-
- - -
- Clear cache for given key -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
key - - -string - - - - - cache key
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearConversionRate()

- - -
-
- - -
- Clear conversion rate from cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearConversionRateDecimals()

- - -
-
- - -
- Clear conversion rate decimals from cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearDecimals()

- - -
-
- - -
- clear decimals from cache -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearPriceOracles(currency, address)

- - -
-
- - -
- Clear price oracle address for given currency in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
address - - -string - - - - - price oracle address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearPricePoint(address)

- - -
-
- - -
- Clear price point of price oracle from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
address - - -string - - - - - price oracle address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getAcceptedMargins(currency)

- - -
-
- - -
- Get accepted margin -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getBrandedTokenAddress()

- - -
-
- - -
- Get branded token address for pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getCacheKey(owner)

- - -
-
- - -
- Get conversion rate for pricer -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address of user whose balance is to be found
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getCacheValue(key)

- - -
-
- - -
- Get cached value -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
key - - -string - - - - - key
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getConversionRate()

- - -
-
- - -
- Get conversion rate for pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getConversionRateDecimals()

- - -
-
- - -
- Get conversion rate decimals for pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getDecimals()

- - -
-
- - -
- Get decimals for pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getPriceOracles(currency)

- - -
-
- - -
- Get price oracle address for given currency from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getPricePoint(address)

- - -
-
- - -
- Get price point of price oracle from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
address - - -string - - - - - price oracle address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setAcceptedMargins(currency, margin)

- - -
-
- - -
- Set accepted margin -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
margin - - -BigNumber - - - - - accepted margin value
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setBrandedTokenAddress(brandedTokenAddress)

- - -
-
- - -
- Set branded token address for pricer -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setCacheValue(key, value)

- - -
-
- - -
- Set value in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
key - - -string - - - - - key
value - - -string - - - - - value
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setConversionRate(conversionRate)

- - -
-
- - -
- Set conversion rate to cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
conversionRate - - -BigNumber - - - - - conversion rate of pricer/airdrop
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setConversionRateDecimals(conversionRateDecimals)

- - -
-
- - -
- Set conversion rate decimals to cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
conversionRateDecimals - - -BigNumber - - - - - conversion rate of pricer/airdrop
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setDecimals(conversionRateDecimals)

- - -
-
- - -
- Set decimals to cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
conversionRateDecimals - - -BigNumber - - - - - conversion rate of pricer/airdrop
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setPriceOracles(currency, address)

- - -
-
- - -
- Set price oracle address for given currency in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
address - - -string - - - - - price oracle address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setPricePoint(pricePoint, address)

- - -
-
- - -
- Set price point of price oracle from cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pricePoint - - -string - - - - - price oracle price point
address - - -string - - - - - price oracle address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_cache_management_pricer_cache.html b/docs/module-lib_cache_management_pricer_cache.html deleted file mode 100644 index d7ca325..0000000 --- a/docs/module-lib_cache_management_pricer_cache.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/cache_management/pricer_cache - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/cache_management/pricer_cache

-
- -
- -
- - -
-
- - -
This is cache layer for pricer balance related caching

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
PricerCache
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_airdrop-Airdrop.html b/docs/module-lib_contract_interact_airdrop-Airdrop.html deleted file mode 100644 index fa5ff26..0000000 --- a/docs/module-lib_contract_interact_airdrop-Airdrop.html +++ /dev/null @@ -1,1075 +0,0 @@ - - - - - - - OpenST Payments Class: Airdrop - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: Airdrop

-
- -
- -

- lib/contract_interact/airdrop~ - - Airdrop -

- - -
- - -
-
- - -
-
-

new Airdrop(airdropContractAddress, chainId)

- - -
-
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -string - - - - - airdrop contract address
chainId - - -string - - - - - chain ID
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

airdropBudgetHolder()

- - -
-
- - -
- Get airdrop budget holder address of airdrop -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getAirdropBudgetHolderFromContract()

- - -
-
- - -
- Get airdrop budget holder address of airdrop from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getWorkers()

- - -
-
- - -
- Get worker contract address -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

pay(senderWorkerAddress, senderWorkerPassphrase, beneficiaryAddress, transferAmount, commissionBeneficiaryAddress, commissionAmount, currency, intendedPricePoint, spender, options)

- - -
-
- - -
- Pay -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderWorkerAddress - - -string - - - - - address of worker
senderWorkerPassphrase - - -string - - - - - passphrase of worker
beneficiaryAddress - - -string - - - - - address of beneficiary account
transferAmount - - -BigNumber - - - - - transfer amount (in wei)
commissionBeneficiaryAddress - - -string - - - - - address of commision beneficiary account
commissionAmount - - -BigNumber - - - - - commission amount (in wei)
currency - - -string - - - - - quote currency
intendedPricePoint - - -BigNumber - - - - - price point at which the pay is intended (in wei)
spender - - -string - - - - - User address
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_airdrop.html b/docs/module-lib_contract_interact_airdrop.html deleted file mode 100644 index caa9b54..0000000 --- a/docs/module-lib_contract_interact_airdrop.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/airdrop - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/airdrop

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on Pricer.sol contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
Airdrop
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_branded_token-BrandedToken.html b/docs/module-lib_contract_interact_branded_token-BrandedToken.html deleted file mode 100644 index c54bcb8..0000000 --- a/docs/module-lib_contract_interact_branded_token-BrandedToken.html +++ /dev/null @@ -1,1953 +0,0 @@ - - - - - - - OpenST Payments Class: BrandedToken - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: BrandedToken

-
- -
- -

- lib/contract_interact/branded_token~ - - BrandedToken -

- - -
- - -
-
- - -
-
-

new BrandedToken(brandedTokenAddress, chainId)

- - -
-
- - -
- Constructor to create object of BrandedToken -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - Branded token address
chainId - - -number - - - - - chainId
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - -

Members

- -
- -
-
-

balanceCache

- - -
-
- -
- balance cache -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
-
-

brandedTokenAddress

- - -
-
- -
- branded token address -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
-
-

chainId

- - -
-
- -
- chain id -
- - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- -
- - - -

Methods

- -
- -
-
-

approveByBudgetHolder(airdropBudgetHolderAddress, airdropBudgetHolderPassphrase, airdropContractAddress, amount, gasPrice, options)

- - -
-
- - -
- Approve amount to budget holder -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropBudgetHolderAddress - - -string - - - - - address of airdropBudgetHolder
airdropBudgetHolderPassphrase - - -string - - - - - Passphrase of airdropBudgetHolder
airdropContractAddress - - -string - - - - - airdrop contract address
amount - - -BigNumber - - - - - amount in wei
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

creditBalance(owner, bigAmount)

- - -
-
- - -
- Credit balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be credited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

debitBalance(owner, bigAmount)

- - -
-
- - -
- Debit balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be debited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getBalanceFromContract(owner)

- - -
-
- - -
- Fetch Balance For a given address from contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address for which balance is to be fetched
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getBalanceOf(owner)

- - -
-
- - -
- Fetch Balance For a given address -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - address for which balance is to be fetched
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setBalanceInCache(owner, bigAmount)

- - -
-
- - -
- Set balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be set
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

transferToAirdropBudgetHolder(senderAddress, senderPassphrase, airdropBudgetHolderAddress, amount, gasPrice, options)

- - -
-
- - -
- Transfer amount to budget holder -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
airdropBudgetHolderAddress - - -string - - - - - recipient address
amount - - -BigNumber - - - - - amount in wei
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_branded_token.html b/docs/module-lib_contract_interact_branded_token.html deleted file mode 100644 index dfe6183..0000000 --- a/docs/module-lib_contract_interact_branded_token.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/branded_token - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/branded_token

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on EIP20Token contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
BrandedToken
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_helper-ContractInteractHelper.html b/docs/module-lib_contract_interact_helper-ContractInteractHelper.html deleted file mode 100644 index fa1ed72..0000000 --- a/docs/module-lib_contract_interact_helper-ContractInteractHelper.html +++ /dev/null @@ -1,4009 +0,0 @@ - - - - - - - OpenST Payments Class: ContractInteractHelper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: ContractInteractHelper

-
- -
- -

- lib/contract_interact/helper~ - - ContractInteractHelper -

- - -
- - -
-
- - -
-
-

new ContractInteractHelper()

- - -
-
- - -
- contract interact helper constructor -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

call(web3RpcProvider, currContractAddr, encodeABI [, options] [, transactionOutputs])

- - -
-
- - -
- Call methods (execute methods which DO NOT modify state of contracts) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
web3RpcProvider - - -object - - - - - - - - - - - It could be value chain or utility chain provider
currContractAddr - - -String - - - - - - - - - - - current contract address
encodeABI - - -Object - - - - - - - - - - - encoded method ABI data
options - - -Object - - - - - - - <optional>
- - - - - - 		optional params
transactionOutputs - - -Object - - - - - - - <optional>
- - - - - - 		optional transactionOutputs
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise - - - -
-
- - - - - -
- - - -
-
-

generateManagedKeyPassphrase()

- - -
-
- - -
- Stub method to generate managed key passphrase -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -String - - - -
-
- - - - - -
- - - -
-
-

getNotificationData(topics, publisher, method, contractName, contractAddress, web3RpcProvider, options)

- - -
-
- - -
- get notification event formatted data -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
topics - - -array - - - - - topics where the event will be published
publisher - - -String - - - - - publisher name
method - - -String - - - - - method name
contractName - - -String - - - - - name of contract
contractAddress - - -String - - - - - address of contract
web3RpcProvider - - -Object - - - - - address of contract
options - - -Object - - - - - options
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

getTransactionOutputs(transactionObject)

- - -
-
- - -
- get outputs of a given transaction -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transactionObject - - -object - - - - - transactionObject is returned from call method.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -array - - - -
-
- - - - - -
- - - -
-
-

getTransactionReceiptFromTrasactionHash(web3RpcProvider, transactionHash)

- - -
-
- - -
- Get transaction receipt -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
web3RpcProvider - - -Web3 - - - - - It could be value chain or utility chain provider
transactionHash - - -String - - - - - transaction hash
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

isDecimal(num)

- - -
-
- - -
- check if return type is true/false -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
num - - -Number - - - - - Number
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- Note - Don't use for BigNumbers -
- - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

isValidCurrency(currency, allow_blank)

- - -
-
- - -
- valid currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - currency
allow_blank - - -bool - - - - - true / false, '' if allow_blank is true
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- - true / false -
- - - -
-
- Type -
-
- -Bool - - - -
-
- - - - - -
- - - -
-
-

performSend(Object, string, senderAddr)

- - -
-
- - -
- Perform send -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
Object - - -params - - - - - parmaters
string - - -returnType - - - - - return type
senderAddr - - -String - - - - - address of transaction's sender senderAddr
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

safeSend(web3RpcProvider, currContractAddr, senderName, encodeABI [, txOptions] [, addressToNameMap])

- - -
-
- - -
- Safe Send a transaction (this internally waits for transaction to be mined) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
web3RpcProvider - - -Web3 - - - - - - - - - - - It could be value chain or utility chain provider
currContractAddr - - -String - - - - - - - - - - - current contract address
senderName - - -String - - - - - - - - - - - name of transaction's sender
encodeABI - - -Object - - - - - - - - - - - encoded method ABI data
txOptions - - -Object - - - - - - - <optional>
- - - - - - 		optional txOptions
addressToNameMap - - -Object - - - - - - - <optional>
- - - - - - 		optional addressToNameMap
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

safeSendFromAddr(web3RpcProvider, currContractAddr, senderAddr, senderPassphrase, encodeABI [, txOptions] [, addressToNameMap])

- - -
-
- - -
- Safe Send a transaction (this internally waits for transaction to be mined) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
web3RpcProvider - - -Web3 - - - - - - - - - - - It could be value chain or utility chain provider
currContractAddr - - -String - - - - - - - - - - - current contract address
senderAddr - - -String - - - - - - - - - - - address of transaction's sender senderAddr
senderPassphrase - - -String - - - - - - - - - - - passphrase of
encodeABI - - -Object - - - - - - - - - - - encoded method ABI data
txOptions - - -Object - - - - - - - <optional>
- - - - - - 		optional txOptions
addressToNameMap - - -Object - - - - - - - <optional>
- - - - - - 		optional addressToNameMap
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

send(web3RpcProvider, currContractAddr, encodeABI [, options] [, transactionOutputs])

- - -
-
- - -
- Send methods (execute methods which modify state of a contracts) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
web3RpcProvider - - -Web3 - - - - - - - - - - - It could be value chain or utility chain provider
currContractAddr - - -String - - - - - - - - - - - current contract address
encodeABI - - -Object - - - - - - - - - - - encoded method ABI data
options - - -Object - - - - - - - <optional>
- - - - - - 		optional params
transactionOutputs - - -Object - - - - - - - <optional>
- - - - - - 		optional transactionOutputs
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise - - - -
-
- - - - - -
- - - -
-
-

toAddress(web3RpcProvider, result)

- - -
-
- - -
- Decode result and typecast it to an Address -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
web3RpcProvider - - -Web3 - - - - - It could be value chain or utility chain provider
result - - -String - - - - - current contract address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

toNumber(web3RpcProvider, result)

- - -
-
- - -
- Decode result and typecast it to a Number -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
web3RpcProvider - - -Web3 - - - - - It could be value chain or utility chain provider
result - - -String - - - - - current contract address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

toString(web3RpcProvider, result)

- - -
-
- - -
- Decode result and typecast it to a String -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
web3RpcProvider - - -Web3 - - - - - It could be value chain or utility chain provider
result - - -String - - - - - current contract address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

validateAirdropPayParams(senderAddress, beneficiaryAddress, transferAmount, commissionBeneficiaryAddress, commissionAmount, currency, intendedPricePoint, gasPrice, user)

- - -
-
- - -
- Validate Airdrop pay params -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
beneficiaryAddress - - -string - - - - - address of beneficiary account
transferAmount - - -BigNumber - - - - - transfer amount (in wei)
commissionBeneficiaryAddress - - -string - - - - - address of commision beneficiary account
commissionAmount - - -BigNumber - - - - - commission amount (in wei)
currency - - -string - - - - - quote currency
intendedPricePoint - - -BigNumber - - - - - price point at which the pay is intended (in wei)
gasPrice - - -BigNumber - - - - - gas price
user - - -Hex - - - - - User address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

validatePayParams(senderAddress, beneficiaryAddress, transferAmount, commissionBeneficiaryAddress, commissionAmount, currency, intendedPricePoint, gasPrice)

- - -
-
- - -
- Validate Airdrop params -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
beneficiaryAddress - - -string - - - - - address of beneficiary account
transferAmount - - -BigNumber - - - - - transfer amount (in wei)
commissionBeneficiaryAddress - - -string - - - - - address of commision beneficiary account
commissionAmount - - -BigNumber - - - - - commission amount (in wei)
currency - - -string - - - - - quote currency
intendedPricePoint - - -BigNumber - - - - - price point at which the pay is intended (in wei)
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_helper.html b/docs/module-lib_contract_interact_helper.html deleted file mode 100644 index 036f913..0000000 --- a/docs/module-lib_contract_interact_helper.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/helper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/helper

-
- -
- -
- - -
-
- - -
This is utility class for contract interacts

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
ContractInteractHelper
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_ops_managed_contract-OpsManagedContract.html b/docs/module-lib_contract_interact_ops_managed_contract-OpsManagedContract.html deleted file mode 100644 index 8c2f0cb..0000000 --- a/docs/module-lib_contract_interact_ops_managed_contract-OpsManagedContract.html +++ /dev/null @@ -1,774 +0,0 @@ - - - - - - - OpenST Payments Class: OpsManagedContract - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: OpsManagedContract

-
- -
- -

- lib/contract_interact/ops_managed_contract~ - - OpsManagedContract -

- - -
- - -
-
- - -
-
-

new OpsManagedContract(contractAddress, defaultGasPrice, chainId)

- - -
-
- - -
- Ops managed contract interact constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
contractAddress - - -string - - - - - address where Contract has been deployed
defaultGasPrice - - -string - - - - - default Gas Price
chainId - - -number - - - - - chain id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - -

Extends

- - - - -
    -
  • OwnedContract
    • -
- - - - - - - - - - - - - - - -

Methods

- -
- -
-
-

getOpsAddress()

- - -
-
- - -
- Get currContract's Ops Address -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setOpsAddress(senderAddress, senderPassphrase, opsAddress, options)

- - -
-
- - -
- Set currContract's Ops Address -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - Sender Address
senderPassphrase - - -String - - - - - Sender Passphrase
opsAddress - - -String - - - - - address which is to be made Ops Address of currContract
options - - -Object - - - - - options for this transaction
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_ops_managed_contract.html b/docs/module-lib_contract_interact_ops_managed_contract.html deleted file mode 100644 index 9c789ed..0000000 --- a/docs/module-lib_contract_interact_ops_managed_contract.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/ops_managed_contract - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/ops_managed_contract

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on OpsManaged Contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
OpsManagedContract
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_owned_contract-OwnedContract.html b/docs/module-lib_contract_interact_owned_contract-OwnedContract.html deleted file mode 100644 index 0d90df6..0000000 --- a/docs/module-lib_contract_interact_owned_contract-OwnedContract.html +++ /dev/null @@ -1,763 +0,0 @@ - - - - - - - OpenST Payments Class: OwnedContract - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: OwnedContract

-
- -
- -

- lib/contract_interact/owned_contract~ - - OwnedContract -

- - -
- - -
-
- - -
-
-

new OwnedContract(contractAddress, web3RpcProvider, currContract, defaultGasPrice)

- - -
-
- - -
- Owned contract interact constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
contractAddress - - -String - - - - - address where Contract has been deployed
web3RpcProvider - - -String - - - - - webRpc provider of network where currContract has been deployed
currContract - - -String - - - - - Contract Instance
defaultGasPrice - - -String - - - - - default Gas Price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

getOwner()

- - -
-
- - -
- Get address of Owner of currContract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<string> - - - -
-
- - - - - -
- - - -
-
-

initiateOwnerShipTransfer(senderName, proposedOwner, customOptions)

- - -
-
- - -
- Initiate Ownership of currContract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderName - - -string - - - - - Sender of this Transaction
proposedOwner - - -string - - - - - address to which ownership needs to be transferred
customOptions - - -object - - - - - custom params of this transaction
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_owned_contract.html b/docs/module-lib_contract_interact_owned_contract.html deleted file mode 100644 index 29efa5c..0000000 --- a/docs/module-lib_contract_interact_owned_contract.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/owned_contract - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/owned_contract

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on Owned Contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
OwnedContract
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_pricer-MockToken.html b/docs/module-lib_contract_interact_pricer-MockToken.html deleted file mode 100644 index 9cc8086..0000000 --- a/docs/module-lib_contract_interact_pricer-MockToken.html +++ /dev/null @@ -1,1199 +0,0 @@ - - - - - - - OpenST Payments Class: MockToken - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: MockToken

-
- -
- -

- lib/contract_interact/pricer~ - - MockToken -

- - -
- - -
-
- - -
-
-

new MockToken()

- - -
-
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

approve(senderAddr, senderPassphrase, spenderAddress, value, gasPrice)

- - -
-
- - -
- Approve -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddr - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
spenderAddress - - -string - - - - - address which will be approved for spending
value - - -BigNumber - - - - - amount which is being approved (in wei)
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

balanceOf(ownerAddress)

- - -
-
- - -
- Get balance of address -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
ownerAddress - - -String - - - - - address for which balance is to be fetched
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

setBalance(senderAddr, senderPassphrase, ownerAddress, value, gasPrice)

- - -
-
- - -
- Set balance -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddr - - -string - - - - - address of user who is sending amount
senderPassphrase - - -string - - - - - sender address passphrase
ownerAddress - - -string - - - - - address for which balance is to be set
value - - -BigNumber - - - - - amount which is being transferred (in wei)
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

setConversionRate(senderAddr, senderPassphrase, conversionRate, gasPrice)

- - -
-
- - -
- Set conversion rate -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddr - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
conversionRate - - -number - - - - - conversion rate of branded token
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_pricer-Pricer.html b/docs/module-lib_contract_interact_pricer-Pricer.html deleted file mode 100644 index 77e33ed..0000000 --- a/docs/module-lib_contract_interact_pricer-Pricer.html +++ /dev/null @@ -1,5207 +0,0 @@ - - - - - - - OpenST Payments Class: Pricer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: Pricer

-
- -
- -

- lib/contract_interact/pricer~ - - Pricer -

- - -
- - -
-
- - -
-
-

new Pricer(pricerAddress, chainId)

- - -
-
- - - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
pricerAddress - - -string - - - - - Pricer contract address
chainId - - -string - - - - - chain ID
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

acceptedMargins(currency)

- - -
-
- - -
- Get acceptable margin for the given currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

baseCurrency()

- - -
-
- - -
- Get base currency of pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

brandedToken()

- - -
-
- - -
- Get branded token address of pricer from cache, if not found in cache get from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

conversionRate()

- - -
-
- - -
- Get conversion rate of pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

conversionRateDecimals()

- - -
-
- - -
- Get conversion rate decimals of pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

decimals()

- - -
-
- - -
- Get decimal of pricer -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getAcceptedMarginsFromContract(currency)

- - -
-
- - -
- Get acceptable margin for the given currency from contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getBalanceOf(owner)

- - -
-
- - -
- Get balance of the account -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
owner - - -string - - - - - account address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- 10^18 -
- - - -
-
- Type -
-
- -BigNumer - - - -
-
- - - - - -
- - - -
-
-

getBrandedTokenAddressFromContract()

- - -
-
- - -
- Get branded token address of pricer from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getConversionRateDecimalsFromContract()

- - -
-
- - -
- Get conversion rate decimals of pricer from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getConversionRateFromContract()

- - -
-
- - -
- Get conversion rate of pricer from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getDecimalsFromContract()

- - -
-
- - -
- Get decimal of pricer from contract -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getEstimatedTotalAmount(transferAmount, commissionAmount, intendedPricePoint)

- - -
-
- - -
- Get estimated total amount -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transferAmount - - -BigNumber - - - - - Transfer amount
commissionAmount - - -BigNumber - - - - - Commission amount
intendedPricePoint - - -BigNumber - - - - - Intended price point
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -BigNumber - - - -
-
- - - - - -
- - - -
-
-

getPriceOraclesFromContract(currency)

- - -
-
- - -
- Get address of price oracle for the given currency from contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getPricePoint(currency)

- - -
-
- - -
- Get current price point from the price oracle for the give currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getPricePointAndCalculatedAmounts(transferAmount, commissionAmount, currency)

- - -
-
- - -
- Get current price point and calculated token amounts -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transferAmount - - -BigNumber - - - - - transfer amount (in wei)
commissionAmount - - -BigNumber - - - - - commision amount (in wei)
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getPricePointFromContract(currency)

- - -
-
- - -
- Get current price point from the price oracle for the give currency from contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getTxReceipt(transactionHash)

- - -
-
- - -
- Get transaction receipt from transaction hash -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transactionHash - - -string - - - - - transaction hash
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- 10^18 -
- - - -
-
- Type -
-
- -BigNumer - - - -
-
- - - - - -
- - - -
-
-

pay(senderAddress, senderPassphrase, beneficiaryAddress, transferAmount, commissionBeneficiaryAddress, commissionAmount, currency, intendedPricePoint, gasPrice, options)

- - -
-
- - -
- Pay -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
beneficiaryAddress - - -string - - - - - address of beneficiary account
transferAmount - - -BigNumber - - - - - transfer amount (in wei)
commissionBeneficiaryAddress - - -string - - - - - address of commision beneficiary account
commissionAmount - - -BigNumber - - - - - commission amount (in wei)
currency - - -string - - - - - quote currency
intendedPricePoint - - -BigNumber - - - - - price point at which the pay is intended (in wei)
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

priceOracles(currency)

- - -
-
- - -
- Get address of price oracle for the given currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
currency - - -string - - - - - quote currency
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setAcceptedMargin(senderAddress, senderPassphrase, currency, acceptedMargin, gasPrice, options)

- - -
-
- - -
- Set or update the acceptable margin range for a given currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
currency - - -string - - - - - quote currency
acceptedMargin - - -BigNumber - - - - - accepted margin for the given currency (in wei)
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setAddressToNameMap()

- - -
-
- - -
- set address to name map -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setPriceOracle(senderAddress, senderPassphrase, currency, address, gasPrice, options)

- - -
-
- - -
- Set or updates the price oracle address for a given currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
currency - - -string - - - - - quote currency
address - - -string - - - - - address of price pracle
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setTokenObj()

- - -
-
- - -
- set token object -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

toWei(value)

- - -
-
- - -
- Convert value in wei -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
value - - -BigNumber - - - - - amount in decimal
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- 10^18 -
- - - -
-
- Type -
-
- -BigNumer - - - -
-
- - - - - -
- - - -
-
-

unsetPriceOracle(senderAddress, senderPassphrase, currency, gasPrice, options)

- - -
-
- - -
- Remove the price oracle address for a given currency -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
currency - - -string - - - - - quote currency
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

validateSetAcceptedMarginParams(senderAddress, currency, acceptedMargin, gasPrice)

- - -
-
- - -
- Validate set accepted margin params parameters -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
currency - - -string - - - - - quote currency
acceptedMargin - - -BigNumber - - - - - accepted margin for the given currency (in wei)
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

validateSetPriceOracleParams(senderAddress, currency, address, gasPrice)

- - -
-
- - -
- Validate set price oracle parameters -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
currency - - -string - - - - - quote currency
address - - -string - - - - - address of price pracle
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

validateUnsetPriceOracleParams(senderAddress, currency, gasPrice)

- - -
-
- - -
- Validate unset price oracle parameters -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
currency - - -string - - - - - quote currency
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

verifyReceiptAndUpdateAcceptedMarginCache(acceptedMargin, currency, receipt)

- - -
-
- - -
- Verify receipt and update accepted margin in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
acceptedMargin - - -BigNumber - - - - - accepted margin for the given currency (in wei)
currency - - -string - - - - - quote currency
receipt - - -Object - - - - - transaction receipt
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_pricer.html b/docs/module-lib_contract_interact_pricer.html deleted file mode 100644 index a4199a3..0000000 --- a/docs/module-lib_contract_interact_pricer.html +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/pricer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/pricer

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on Pricer contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
MockToken
-
- -
Pricer
-
-
- - - - - - - - - - - - - -
- -
- - - - -

Module: lib/contract_interact/pricer

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on Pricer contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
MockToken
-
- -
Pricer
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_workers-Workers.html b/docs/module-lib_contract_interact_workers-Workers.html deleted file mode 100644 index 7655d48..0000000 --- a/docs/module-lib_contract_interact_workers-Workers.html +++ /dev/null @@ -1,2038 +0,0 @@ - - - - - - - OpenST Payments Class: Workers - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: Workers

-
- -
- -

- lib/contract_interact/workers~ - - Workers -

- - -
- - -
-
- - -
-
-

new Workers(workerAddress, chainId)

- - -
-
- - -
- Workers contract interact class constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
workerAddress - - -string - - - - - address of worker (external address)
chainId - - -number - - - - - chain id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

_validateRemoveParams(senderAddress, gasPrice)

- - -
-
- - -
- Validate Remove (selfdestruct) params -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

_validateRemoveWorkerParams(senderAddress, workerAddress, gasPrice)

- - -
-
- - -
- Validate remove worker params -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
workerAddress - - -string - - - - - worker address
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

_validateSetWorkersParams(senderAddress, workerAddress, deactivationHeight, gasPrice)

- - -
-
- - -
- Validate set workers params -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
workerAddress - - -string - - - - - worker address
deactivationHeight - - -number - - - - - block number till which the worker is valid
gasPrice - - -BigNumber - - - - - gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

getTxReceipt(transactionHash)

- - -
-
- - -
- Get transaction receipt from transaction hash -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transactionHash - - -string - - - - - transaction hash -TODO - this can be moved to a util class
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

isWorker(workerAddress)

- - -
-
- - -
- Check if the given worker address is valid or not -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
workerAddress - - -string - - - - - worker address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

remove(senderAddr, senderPassphrase, gasPrice, object)

- - -
-
- - -
- Remove (selfdestruct) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddr - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
gasPrice - - -BigNumber - - - - - gas price
object - - -options - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise - - - -
-
- - - - - -
- - - -
-
-

removeWorker(senderAddress, senderPassphrase, workerAddress, gasPrice, options)

- - -
-
- - -
- Remove worker -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
workerAddress - - -string - - - - - worker address
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

setWorker(senderAddress, senderPassphrase, workerAddress, deactivationHeight, gasPrice, options)

- - -
-
- - -
- Set or update the worker -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
senderAddress - - -string - - - - - address of sender
senderPassphrase - - -string - - - - - passphrase of sender
workerAddress - - -string - - - - - worker address
deactivationHeight - - -number - - - - - block number till which the worker is valid
gasPrice - - -BigNumber - - - - - gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_contract_interact_workers.html b/docs/module-lib_contract_interact_workers.html deleted file mode 100644 index 3aec85a..0000000 --- a/docs/module-lib_contract_interact_workers.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/contract_interact/workers - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/contract_interact/workers

-
- -
- -
- - -
-
- - -
This is a utility file which would be used for executing all methods on Workers contract.

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
Workers
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_deployer-Deploy.html b/docs/module-lib_deployer-Deploy.html deleted file mode 100644 index 99eda48..0000000 --- a/docs/module-lib_deployer-Deploy.html +++ /dev/null @@ -1,894 +0,0 @@ - - - - - - - OpenST Payments Class: Deploy - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: Deploy

-
- -
- -

- lib/deployer~ - - Deploy -

- - -
- - -
-
- - -
-
-

new Deploy()

- - -
-
- - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

deploy(contractName, constructorArgs, gasPrice, options)

- - -
-
- - -
- Deploy contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
contractName - - -string - - - - - Contract name - pricer / airdrop / workers
constructorArgs - - -Array - - - - - Contract constructor params
gasPrice - - -BigNumber - - - - - Gas price
options - - -object - - - - - for params like returnType, tag.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -response - - - -
-
- - - - - -
- - - -
-
-

validateDeployParams(contractName, gasPrice)

- - -
-
- - -
- Validate deploy parameters -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
contractName - - -string - - - - - Contract name
gasPrice - - -BigNumber - - - - - Gas price
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -response - - - -
-
- - - - - -
- - - -
-
-

writeContractAddressToFile(fileName, contractAddress)

- - -
-
- - -
- Write contract address to file based on parameter -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
fileName - - -String - - - - - file name
contractAddress - - -Hex - - - - - contract Address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_deployer.html b/docs/module-lib_deployer.html deleted file mode 100644 index 919e3b6..0000000 --- a/docs/module-lib_deployer.html +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - OpenST Payments Module: lib/deployer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/deployer

-
- -
- -
- - -
-
- - -
This is script for deploying any contract.

- - Prerequisite: -
    -
  1. Deployer Address
    2. -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
Deploy
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_query_builder_mysql-MySQLQueryBuilderKlass.html b/docs/module-lib_query_builder_mysql-MySQLQueryBuilderKlass.html deleted file mode 100644 index d06f573..0000000 --- a/docs/module-lib_query_builder_mysql-MySQLQueryBuilderKlass.html +++ /dev/null @@ -1,2662 +0,0 @@ - - - - - - - OpenST Payments Class: MySQLQueryBuilderKlass - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: MySQLQueryBuilderKlass

-
- -
- -

- lib/query_builder/mysql~ - - MySQLQueryBuilderKlass -

- - -
- - -
-
- - -
-
-

new MySQLQueryBuilderKlass(params)

- - -
-
- - -
- MySQL query builder constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
params - - -Object - - - - - - -
Properties
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
table_name - - -String - - - - - - - <optional>
- - - - - - 		MySQL table name for which query need to be build
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<private> _generateDelete()

- - -
-
- - -
- Generate the final DELETE statement -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - -
-
-

<private> _generateInsert()

- - -
-
- - -
- Generate the final INSERT statement -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - -
-
-

<private> _generateSelect()

- - -
-
- - -
- Generate the final SELECT statement -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - -
-
-

<private> _generateUpdate()

- - -
-
- - -
- Generate the final UPDATE statement -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - - -
-
-

delete()

- - -
-
- - -
- Delete row from table - -Example 1: -delete() -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

generate()

- - -
-
- - -
- Generate final query supported by mysql node module -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -object.<response> - - - -
-
- - - - - -
- - - -
-
-

group_by()

- - -
-
- - -
- List of fields to be grouped by from table. If called multiple times, group by conditions will be joined by COMMA. - -Possible data types: -* Array - list of field names will be joined by comma -* String - list of field names will be used as it is - -Example 1: -group_by(['name', 'created_at']) - -Example 2: -group_by('name, created_at') -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

having()

- - -
-
- - -
- List of fields for having clause. If called multiple times, having conditions will be joined by AND. - -Possible data types: -* Array - index 0 should have the having sub query and other indexes should have the valued to be replaced in sub query -* String - where sub query, used as it is. - -Example 1: Where in array format -having(['MIN(`salary`) < ?', 10]) - -Example 2: condition in string. Will be used as it is -having('MIN(`salary`) < 10') -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

insert((object), (object), (object))

- - -
-
- - -
- Insert single record in table. Method can't be called twice on same object - -Example 1: Insert in object format. -insert({name: 'ACMA', id: 10}) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
(object) - - insertFields - key and value pairs of columns and values to be inserted
(object) - - insertOptions -
(object) - - [insertOptions.touch] - if true, auto insert created_at and updated_at values. Default is true.
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

insertMultiple(insertColumns, insertValues, insertOptions)

- - -
-
- - -
- Insert multiple records in table. Method can't be called twice on same object - -Example 1: -insertMultiple(['name', 'symbol'], [['ABC', '123'], ['ABD', '456']]) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
insertColumns - - -array - - - - - list of columns. also columns are mandatory
insertValues - - -array - - - - - array of array with values
insertOptions - - -object - - - - - - -
Properties
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
touch - - -object - - - - - - - <optional>
- - - - - - 		if true, auto insert created_at and updated_at values. Default is true.
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

limit((number))

- - -
-
- - -
- Limit of records to be fetched. If called multiple times, it will overwrite the previous value - -Example 1: -limit(100) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
(number) - - recordsLimit - limit for select query
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

offset((number))

- - -
-
- - -
- Offset for records to be fetched. If called multiple times, it will overwrite the previous value. limit is mandatory for offset - -Example 1: -offset(10) -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
(number) - - recordsOffset - offset for select query
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

onDuplicate()

- - -
-
- - -
- On Duplicate conditions to be applied to the INSERT query. If called multiple times, conditions will be joined by COMMA. - -Possible data types: -* Array - index 0 should have the On Duplicate sub query and other indexes should have the valued to be replaced in sub query -* Object - key and value pairs of columns and values to be joined by COMMA to form On Duplicate sub query -* String - sub query, used as it is. - -Example 1: ON DUPLICATE in array format -onDuplicate(['name=? , id=?', 'ACMA', 10]) - -Example 2: ON DUPLICATE in object format. Conditions will be joined by , -onDuplicate({name: 'ACMA', id: 10}) - -Example 3: ON DUPLICATE in string. Will be used as it is -onDuplicate('id=10') -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

order_by()

- - -
-
- - -
- List of fields to be ordered by from table. If called multiple times, order by conditions will be joined by COMMA. - -Possible data types: -* Object - where keys are column names and value is order -* String - order will be used as it is - -Example 1: -order_by({'name': 'ASC', 'created_at': 'DESC'}) - -Example 2: -order_by('name ASC, created_at DESC') - -Example 3: -order_by([1, 2, 3]) -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

select()

- - -
-
- - -
- List of fields to be selected from table. If called multiple times, select columns will be joined by COMMA. - -Possible data types: -* blank/undefined - '*' will be used to fetch all columns -* Array - list of field names will be joined by comma -* String - list of field names will be used as it is - -Example 1: '*' will be used to fetch all columns -select() - -Example 2: list of field names in array. Will be joined by comma -select(['name', 'created_at']) - -Example 3: list of field names in string. Will be used as it is -select('name, created_at') -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

update(updateFields, insertOptions)

- - -
-
- - -
- Update columns to be applied to the query. If called multiple times, update fields will be joined by COMMA. - -Possible data types: -* Array - index 0 should have the update sub query and other indexes should have the valued to be replaced in sub query -* Object - key and value pairs of columns and values to be joined by COMMA to form update sub query -* String - update sub query, used as it is. -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
updateFields - - -* - - - - - refer possible data types
insertOptions - - -object - - - - - - -
Properties
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
touch - - -object - - - - - - - <optional>
- - - - - - 		if true, auto insert created_at and updated_at values. Default is true. - -Example 1: update in array format -update(['name=?, id=?', 'ACMA', 10]) - -Example 2: Update in object format. Fields will be joined by {,} -update({name: 'ACMA', id: 10}) - -Example 3: Update in string. Will be used as it is -update('id=10')
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- - - -
-
-

where()

- - -
-
- - -
- Where conditions to be applied to the query. If called multiple times, where conditions will be joined by AND. - -Possible data types: -* Array - index 0 should have the where sub query and other indexes should have the valued to be replaced in sub query -* Object - key and value pairs of columns and values to be joined by AND to form where sub query -* String - where sub query, used as it is. - -Example 1: Where in array format -where(['name=? AND id=?', 'ACMA', 10]) - -Example 2: Where in object format. Conditions will be joined by AND -where({name: 'ACMA', id: 10}) -where({name: [1,2,3], id: 10}) - -Example 3: condition in string. Will be used as it is -where('id=10') -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- oThis -
- - - -
-
- Type -
-
- -object.<self> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_query_builder_mysql.html b/docs/module-lib_query_builder_mysql.html deleted file mode 100644 index 0fd7ba0..0000000 --- a/docs/module-lib_query_builder_mysql.html +++ /dev/null @@ -1,339 +0,0 @@ - - - - - - - OpenST Payments Module: lib/query_builder/mysql - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/query_builder/mysql

-
- -
- -
- - -
-
- - -
Form mysql query

- - -Max supported SELECT query: -SELECT [columns] - FROM [table] - WHERE [where conditions] - GROUP BY [columns] - ORDER BY [order by columns] - HAVING [having condition] - LIMIT [limit and offset]; - -Max supported INSERT query: -INSERT INTO [table] ([columns]) - VALUES ([values]), ([values]) - ON DUPLICATE KEY UPDATE [conditions]; - -Max supported UPDATE query: -UPDATE [table] - SET [column=value], [column=value] - WHERE [where conditions] - ORDER BY [order by columns] - LIMIT [limit]; - -Max supported DELETE query: -DELETE FROM [table] - WHERE [where conditions] - ORDER BY [order by columns] - LIMIT [limit];
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
MySQLQueryBuilderKlass
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_set_worker_and_ops-SetWorkerOps.html b/docs/module-lib_set_worker_and_ops-SetWorkerOps.html deleted file mode 100644 index 4e4ced0..0000000 --- a/docs/module-lib_set_worker_and_ops-SetWorkerOps.html +++ /dev/null @@ -1,603 +0,0 @@ - - - - - - - OpenST Payments Class: SetWorkerOps - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: SetWorkerOps

-
- -
- -

- lib/set_worker_and_ops~ - - SetWorkerOps -

- - -
- - -
-
- - -
-
-

new SetWorkerOps()

- - -
-
- - -
- Set Worker Contract and OPS Address -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

perform( [options])

- - -
-
- - -
- Set Worker and Ops for a contract. -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
options - - -object - - - - - - - <optional>
- - - - - - 		-
Properties
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
gasPrice - - -number - - - - - - - <optional>
- - - - - - 		Gas Price to use
chainId - - -number - - - - - - - <optional>
- - - - - - 		Chain Id where contract need to be deployed
- -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_set_worker_and_ops.html b/docs/module-lib_set_worker_and_ops.html deleted file mode 100644 index 934c5d1..0000000 --- a/docs/module-lib_set_worker_and_ops.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/set_worker_and_ops - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/set_worker_and_ops

-
- -
- -
- - -
-
- - -
Set Worker Contract and OPS Address
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
SetWorkerOps
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_transaction_helper-TransactionHelper.html b/docs/module-lib_transaction_helper-TransactionHelper.html deleted file mode 100644 index 6f7a7b2..0000000 --- a/docs/module-lib_transaction_helper-TransactionHelper.html +++ /dev/null @@ -1,4093 +0,0 @@ - - - - - - - OpenST Payments Class: TransactionHelper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Class: TransactionHelper

-
- -
- -

- lib/transaction_helper~ - - TransactionHelper -

- - -
- - -
-
- - -
-
-

new TransactionHelper(chainId)

- - -
-
- - -
- constructor -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
chainId - - -string - - - - - chain id
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - -
- - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

_getPromiseArrayForBalanceChange(brandedTokenAddress, airdropAddress, addressToBalanceChangeMap, addressToAirdropBalanceChangeMap)

- - -
-
- - -
- Get promise array for balance change -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
airdropAddress - - -string - - - - - airdrop contract address
addressToBalanceChangeMap - - -string - - - - - address to balance change map
addressToAirdropBalanceChangeMap - - -BigNumber - - - - - address to airdrop balance change map
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -array.<promise> - - - -
-
- - - - - -
- - - -
-
-

afterAirdropPayFailure(brandedTokenAddress, airdropAddress, spender, estimatedPayAmount, estimatedAirdropAmount, airdropBugdetAddress)

- - -
-
- - -
- After airdrop pay function, this is called after the pay is failed -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
airdropAddress - - -string - - - - - airdrop contract address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
estimatedAirdropAmount - - -BigNumber - - - - - estimated airdrop amount
airdropBugdetAddress - - -string - - - - - airdrop budget holder address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

afterAirdropPaySuccess(brandedTokenAddress, airdropAddress, spender, estimatedPayAmount, estimatedAirdropAmount, beneficiaryAddress, actualBeneficiaryAmount, commissionBeneficiaryAddress, actualCommissionBeneficiaryAmount, actualAirdropAmount, airdropBugdetAddress)

- - -
-
- - -
- After airdrop pay function, this is called after the pay is successfull -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
airdropAddress - - -string - - - - - airdrop contract address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
estimatedAirdropAmount - - -BigNumber - - - - - estimated airdrop amount
beneficiaryAddress - - -string - - - - - beneficiary address
actualBeneficiaryAmount - - -BigNumber - - - - - actual beneficiary amount in weis
commissionBeneficiaryAddress - - -string - - - - - commission beneficiary address
actualCommissionBeneficiaryAmount - - -BigNumber - - - - - actual commission beneficiary amount
actualAirdropAmount - - -BigNumber - - - - - actual airdrop amount
airdropBugdetAddress - - -string - - - - - airdrop budget holder address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

afterPayFailure(brandedTokenAddress, spender, estimatedPayAmount)

- - -
-
- - -
- After pay function, this is called after the pay is failed -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

afterPaySuccess(brandedTokenAddress, spender, estimatedPayAmount, beneficiaryAddress, actualBeneficiaryAmount, commissionBeneficiaryAddress, actualCommissionBeneficiaryAmount)

- - -
-
- - -
- After pay function, this is called after the pay is successfull -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
beneficiaryAddress - - -string - - - - - beneficiary address
actualBeneficiaryAmount - - -BigNumber - - - - - actual beneficiary amount in weis
commissionBeneficiaryAddress - - -string - - - - - commission beneficiary address
actualCommissionBeneficiaryAmount - - -BigNumber - - - - - actual commission beneficiary amount
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

beforeAirdropPay(brandedTokenAddress, airdropAddress, spender, estimatedPayAmount, estimatedAirdropAmount, airdropBugdetAddress)

- - -
-
- - -
- Before airdrop pay function, this is called before the pay is called -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
airdropAddress - - -string - - - - - airdrop contract address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
estimatedAirdropAmount - - -BigNumber - - - - - estimated airdrop amount
airdropBugdetAddress - - -string - - - - - airdrop budget holder address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

beforePay(brandedTokenAddress, spender, estimatedPayAmount)

- - -
-
- - -
- Before pay function, this is called before the pay is called -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
spender - - -string - - - - - spender address
estimatedPayAmount - - -BigNumber - - - - - estimated pay amount in weis
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

clearUserDetailCache(airdropContractAddress, owner)

- - -
-
- - -
- Clear user detail cache for the user addressess -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -string - - - - - airdrop contract address
owner - - -string - - - - - Account address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

creditAirdropBalance(airdropContractAddress, owner, bigAmount)

- - -
-
- - -
- Credit airdrop balance in db and clear cache -It decreases airdrop_used_amount for user in user_airdrop_details table -Clears the cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -string - - - - - airdrop contract address
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be credited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

creditBalance(brandedTokenAddress, owner, bigAmount)

- - -
-
- - -
- Credit balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be credited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

debitAirdropBalance(airdropContractAddress, owner, bigAmount)

- - -
-
- - -
- Debit airdrop balance in db and clear cache -It increases airdrop_used_amount for user in user_airdrop_details table -Clears the cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -string - - - - - airdrop contract address
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be debited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

debitBalance(brandedTokenAddress, owner, bigAmount)

- - -
-
- - -
- Debit balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be debited
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

getActualAmountsFromReceipt(transactionReceipt, addressToNameMap)

- - -
-
- - -
- Get actual beneficiary amount, actual commission amount and actual airdrop amount from transaction receipt -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
transactionReceipt - - -Object - - - - - transaction receipt
addressToNameMap - - -Object - - - - - address to name map object
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- - - -
-
-

isAllResponseSuccessful(results)

- - -
-
- - -
- Check if all response is success -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
results - - -array - - - - - response array
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -boolean - - - -
-
- - - - - -
- - - -
-
-

setBalanceInCache(brandedTokenAddress, owner, bigAmount)

- - -
-
- - -
- Set balance in cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
owner - - -string - - - - - Account address
bigAmount - - -BigNumber - - - - - amount to be set
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

updateAirdropBalance(airdropContractAddress, owner, toCreditBigAmount)

- - -
-
- - -
- Update airdrop balance -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
airdropContractAddress - - -string - - - - - airdrop contract address
owner - - -string - - - - - Account address
toCreditBigAmount - - -BigNumber - - - - - to credit amount - this can be negative also
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- - - -
-
-

updateBalance(brandedTokenAddress, owner, toCreditBigAmount)

- - -
-
- - -
- Update balance to cache -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
brandedTokenAddress - - -string - - - - - branded token address
owner - - -string - - - - - Account address
toCreditBigAmount - - -BigNumber - - - - - to credit amount - this can be negative also
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -promise.<result> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_transaction_helper.html b/docs/module-lib_transaction_helper.html deleted file mode 100644 index 5f1a819..0000000 --- a/docs/module-lib_transaction_helper.html +++ /dev/null @@ -1,311 +0,0 @@ - - - - - - - OpenST Payments Module: lib/transaction_helper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/transaction_helper

-
- -
- -
- - -
-
- - -
This is transaction helper that manages the cache updation

- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
TransactionHelper
-
-
- - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_web3_events_formatter-web3EventsDecoder.html b/docs/module-lib_web3_events_formatter-web3EventsDecoder.html deleted file mode 100644 index d03956b..0000000 --- a/docs/module-lib_web3_events_formatter-web3EventsDecoder.html +++ /dev/null @@ -1,491 +0,0 @@ - - - - - - - OpenST Payments Namespace: web3EventsDecoder - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Namespace: web3EventsDecoder

-
- -
- -

- lib/web3/events/formatter~ - - web3EventsDecoder -

- - -
- - -
-
- - -
Ivent Decoder.
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

perform(txReceipt, addressToNameMap)

- - -
-
- - -
- performer -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
txReceipt - - -Object - - - - -
addressToNameMap - - -Hash - - - - - Map of the address(key) to name(value)
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - -
- object of resulthelpwe\\er -
- - - -
-
- Type -
-
- -result - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_web3_events_formatter-web3EventsFormatter.html b/docs/module-lib_web3_events_formatter-web3EventsFormatter.html deleted file mode 100644 index e940659..0000000 --- a/docs/module-lib_web3_events_formatter-web3EventsFormatter.html +++ /dev/null @@ -1,457 +0,0 @@ - - - - - - - OpenST Payments Namespace: web3EventsFormatter - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Namespace: web3EventsFormatter

-
- -
- -

- lib/web3/events/formatter~ - - web3EventsFormatter -

- - -
- - -
-
- - -
Event Formatter.
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

perform(formattedTransactionReceipt)

- - -
-
- - -
- performer -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
formattedTransactionReceipt - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise.<{}> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-lib_web3_events_formatter.html b/docs/module-lib_web3_events_formatter.html deleted file mode 100644 index 48a3719..0000000 --- a/docs/module-lib_web3_events_formatter.html +++ /dev/null @@ -1,407 +0,0 @@ - - - - - - - OpenST Payments Module: lib/web3/events/formatter - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: lib/web3/events/formatter

-
- -
- -
- - -
-
- - -
Format decoded event into Hash with all the events received into it.
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - -

Namespaces

- -
-
web3EventsDecoder
-
- -
web3EventsFormatter
-
-
- - - - - - - - - -
- -
- - - - -

Module: lib/web3/events/formatter

-
- -
- -
- - -
-
- - -
Decode logs from a transaction receipt
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - -

Namespaces

- -
-
web3EventsDecoder
-
- -
web3EventsFormatter
-
-
- - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-tools_deploy_DeployHelper.html b/docs/module-tools_deploy_DeployHelper.html deleted file mode 100644 index 655db06..0000000 --- a/docs/module-tools_deploy_DeployHelper.html +++ /dev/null @@ -1,821 +0,0 @@ - - - - - - - OpenST Payments Module: tools/deploy/DeployHelper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: tools/deploy/DeployHelper

-
- -
- -
- - -
-
- - -
Deploy Helper class to perform deploy
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<static> writeContractAddressToFile(fileName, contractAddress)

- - -
-
- - -
- Write contract address to file based on parameter -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
fileName - - -String - - - - - file name
contractAddress - - -Hex - - - - - contract Address
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<async, inner> perform(contractName, web3Provider, contractAbi, contractBin, deployerName [, customOptions] [, constructorArgs])

- - -
-
- - -
- Method deploys contract -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeArgumentDescription
contractName - - -String - - - - - - - - - - - Contract Name to be deployed
web3Provider - - -Web3 - - - - - - - - - - - Web3 Provider object
contractAbi - - -String - - - - - - - - - - - Contract Abi to be deployed
contractBin - - -String - - - - - - - - - - - Contract Bin file to be deployed
deployerName - - -String - - - - - - - - - - - Deployer name
customOptions - - -Object - - - - - - - <optional>
- - - - - - 		Custom options for value/utility chain
constructorArgs - - -Object - - - - - - - <optional>
- - - - - - 		Arguments to be passed while deploying contract
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - -
-
- Type -
-
- -Promise.<Object> - - - -
-
- - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-tools_deploy_EIP20TokenMock.html b/docs/module-tools_deploy_EIP20TokenMock.html deleted file mode 100644 index dafd63c..0000000 --- a/docs/module-tools_deploy_EIP20TokenMock.html +++ /dev/null @@ -1,448 +0,0 @@ - - - - - - - OpenST Payments Module: tools/deploy/EIP20TokenMock - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: tools/deploy/EIP20TokenMock

-
- -
- -
- - -
-
- - -
This is script for deploying Pricer contract on any chain.

- - Prerequisite: -
    -
  1. Deployer Address
    2. -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<async, inner> performer(arguments)

- - -
-
- - -
- It is the main performer method of this deployment script -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-tools_deploy_helper.html b/docs/module-tools_deploy_helper.html deleted file mode 100644 index 86c008d..0000000 --- a/docs/module-tools_deploy_helper.html +++ /dev/null @@ -1,306 +0,0 @@ - - - - - - - OpenST Payments Module: tools/deploy/helper - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: tools/deploy/helper

-
- -
- -
- - -
-
- - -
This is utility class for deploying contract

- -Ref: module:tools/deploy/DeployHelper
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-tools_deploy_pricer.html b/docs/module-tools_deploy_pricer.html deleted file mode 100644 index 996ef44..0000000 --- a/docs/module-tools_deploy_pricer.html +++ /dev/null @@ -1,1495 +0,0 @@ - - - - - - - OpenST Payments Module: tools/deploy/pricer - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: tools/deploy/pricer

-
- -
- -
- - -
-
- - -
This is script for deploying Pricer contract on any chain.

- - Prerequisite: -
    -
  1. Deployer Address
    2. -
- - These are the following steps:
-
    -
  1. Deploy Pricer contract
    2. -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<async, inner> performer(arguments)

- - -
-
- - -
- It is the main performer method of this deployment script -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<async, inner> performer(arguments)

- - -
-
- - -
- It is the main performer method of this deployment script -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<inner> validate(arguments)

- - -
-
- - -
- Validation Method -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<inner> validate(arguments)

- - -
-
- - -
- Validation Method -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -

Module: tools/deploy/pricer

-
- -
- -
- - -
-
- - -
This is script for deploying Pricer contract on any chain.

- - Prerequisite: -
    -
  1. Deployer Address
    2. -
- - These are the following steps:
-
    -
  1. Deploy Airdrop contract
    2. -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<async, inner> performer(arguments)

- - -
-
- - -
- It is the main performer method of this deployment script -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<async, inner> performer(arguments)

- - -
-
- - -
- It is the main performer method of this deployment script -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<inner> validate(arguments)

- - -
-
- - -
- Validation Method -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- - - -
-
-

<inner> validate(arguments)

- - -
-
- - -
- Validation Method -
- - - - - - - - -
Parameters:
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameTypeDescription
arguments - - -Array - - - - -
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/module-tools_deploy_workers.html b/docs/module-tools_deploy_workers.html deleted file mode 100644 index fdda390..0000000 --- a/docs/module-tools_deploy_workers.html +++ /dev/null @@ -1,406 +0,0 @@ - - - - - - - OpenST Payments Module: tools/deploy/workers - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Module: tools/deploy/workers

-
- -
- -
- - -
-
- - -
This is script for deploying Workers contract on any chain.

- - Prerequisite: -
    -
  1. Deployer Address
    2. -
- - These are the following steps:
-
    -
  1. Deploy Workers contract
    2. -
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - - - - - - - - - -

Methods

- -
- -
-
-

<async, inner> performer()

- - -
-
- - -
- It is the main performer method of this deployment script - -Example: -node tools/deploy/worker.js gasPrice chainId -
- - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - -
Returns:
- - - - - - - - -
- -
- - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/modules.list.html b/docs/modules.list.html deleted file mode 100644 index 08dfae7..0000000 --- a/docs/modules.list.html +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - OpenST Payments Modules - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Modules

-
- -
- -

- -

- - -
- - -
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
baseCacheMultiManagementKlass
-
- -
BasicHelperKlass
-
- -
approve
-
- -
base
-
- -
batchAllocator
-
- -
register
-
- -
transfer
-
- -
AdjustAirdropAmountKlass
-
- -
AirdropUserBalanceKlass
-
- -
AirdropBalanceCache
-
- -
BalanceCache
-
- -
PricerCache
-
- -
Airdrop
-
- -
BrandedToken
-
- -
ContractInteractHelper
-
- -
OpsManagedContract
-
- -
OwnedContract
-
- -
MockToken
-
- -
Pricer
-
- -
Workers
-
- -
Deploy
-
- -
MySQLQueryBuilderKlass
-
- -
SetWorkerOps
-
- -
TransactionHelper
-
- -
userAirdropDetailCache
-
-
- - - - - -

Namespaces

- -
-
web3EventsDecoder
-
- -
web3EventsFormatter
-
-
- - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/namespaces.list.html b/docs/namespaces.list.html deleted file mode 100644 index 05e55e7..0000000 --- a/docs/namespaces.list.html +++ /dev/null @@ -1,396 +0,0 @@ - - - - - - - OpenST Payments Namespaces - - - - - - - - - - -
-
-
- OpenST Payments - -
- - -
-
- - -
-
- - -
- -
- - -

Namespaces

-
- -
- -

- -

- - -
- - -
-
- - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- - - - - - -

Classes

- -
-
baseCacheMultiManagementKlass
-
- -
BasicHelperKlass
-
- -
approve
-
- -
base
-
- -
batchAllocator
-
- -
register
-
- -
transfer
-
- -
AdjustAirdropAmountKlass
-
- -
AirdropUserBalanceKlass
-
- -
AirdropBalanceCache
-
- -
BalanceCache
-
- -
PricerCache
-
- -
Airdrop
-
- -
BrandedToken
-
- -
ContractInteractHelper
-
- -
OpsManagedContract
-
- -
OwnedContract
-
- -
MockToken
-
- -
Pricer
-
- -
Workers
-
- -
Deploy
-
- -
MySQLQueryBuilderKlass
-
- -
SetWorkerOps
-
- -
TransactionHelper
-
- -
userAirdropDetailCache
-
-
- - - - - -

Namespaces

- -
-
web3EventsDecoder
-
- -
web3EventsFormatter
-
-
- - - - - - - - - -
- -
- - - - -
-
- -
- - -
- -
- - -
-
- - - - - -
- - - - - - OpenST Foundation Ltd. - - - - Documentation generated by JSDoc 3.5.5 - - using the DocStrap template. - -
- - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/docs/quicksearch.html b/docs/quicksearch.html deleted file mode 100644 index a57571d..0000000 --- a/docs/quicksearch.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/docs/scripts/docstrap.lib.js b/docs/scripts/docstrap.lib.js deleted file mode 100644 index 09d9272..0000000 --- a/docs/scripts/docstrap.lib.js +++ /dev/null @@ -1,11 +0,0 @@ -if(!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){function c(a){var b="length"in a&&a.length,c=_.type(a);return"function"!==c&&!_.isWindow(a)&&(!(1!==a.nodeType||!b)||("array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a))}function d(a,b,c){if(_.isFunction(b))return _.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return _.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(ha.test(b))return _.filter(b,a,c);b=_.filter(b,a)}return _.grep(a,function(a){return U.call(b,a)>=0!==c})}function e(a,b){for(;(a=a[b])&&1!==a.nodeType;);return a}function f(a){var b=oa[a]={};return _.each(a.match(na)||[],function(a,c){b[c]=!0}),b}function g(){Z.removeEventListener("DOMContentLoaded",g,!1),a.removeEventListener("load",g,!1),_.ready()}function h(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=_.expando+h.uid++}function i(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(ua,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c||"false"!==c&&("null"===c?null:+c+""===c?+c:ta.test(c)?_.parseJSON(c):c)}catch(a){}sa.set(a,b,c)}else c=void 0;return c}function j(){return!0}function k(){return!1}function l(){try{return Z.activeElement}catch(a){}}function m(a,b){return _.nodeName(a,"table")&&_.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function n(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function o(a){var b=Ka.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function p(a,b){for(var c=0,d=a.length;d>c;c++)ra.set(a[c],"globalEval",!b||ra.get(b[c],"globalEval"))}function q(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(ra.hasData(a)&&(f=ra.access(a),g=ra.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)_.event.add(b,e,j[e][c])}sa.hasData(a)&&(h=sa.access(a),i=_.extend({},h),sa.set(b,i))}}function r(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&_.nodeName(a,b)?_.merge([a],c):c}function s(a,b){var c=b.nodeName.toLowerCase();"input"===c&&ya.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function t(b,c){var d,e=_(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:_.css(e[0],"display");return e.detach(),f}function u(a){var b=Z,c=Oa[a];return c||(c=t(a,b),"none"!==c&&c||(Na=(Na||_("