diff --git a/app/manifest.json b/app/manifest.json
index 6ae5b01c23..f4f462905b 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -1,6 +1,6 @@
{
"name": "MyEtherWallet",
- "version": "3.21.07",
+ "version": "3.21.08",
"manifest_version": 2,
"description": "MyEtherWallet Chrome Extension",
"homepage_url": "https://www.myetherwallet.com/",
diff --git a/app/scripts/controllers/swapCtrl.js b/app/scripts/controllers/swapCtrl.js
index 440f09bf90..488a2019a6 100644
--- a/app/scripts/controllers/swapCtrl.js
+++ b/app/scripts/controllers/swapCtrl.js
@@ -1,5 +1,5 @@
'use strict';
-var swapCtrl = function ($scope, $sce, walletService) {
+var swapCtrl = function($scope, $sce, walletService) {
var lStorageKey = "swapOrder";
$scope.ajaxReq = ajaxReq;
$scope.showedMinMaxError = false;
@@ -7,7 +7,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
$scope.bity = new bity();
$scope.kyber = new kyber();
$scope.kyberNetworkEnabled = true;
- $scope.kyber.refreshRates();
+ // /$scope.kyber.refreshRates();
$scope.isKyberSwap = false;
$scope.bityOptions = ["ETH", "REP", "BTC"];
@@ -15,7 +15,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
$scope.fromExclude = [];
// Currently Not Really Used (kept for usage in a future feature)
- $scope.showInFromList = function (coin) {
+ $scope.showInFromList = function(coin) {
if (coin == 'REP') return false;
return true;
// if ($scope.fromExclude.indexOf(coin) > -1) return false;
@@ -23,7 +23,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Currently Not Really Used (kept for usage in a future feature)
- $scope.showInToList = function (coin) {
+ $scope.showInToList = function(coin) {
return true;
// if ($scope.toExclude.indexOf(coin) > -1) return false;
// else return true;
@@ -31,19 +31,26 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- setInterval(function () {
+ setInterval(function() {
$scope.bity.refreshRates();
- $scope.kyber.refreshRates();
- $scope.checkKyberNetwork();
+ // $scope.kyber.refreshRates();
+ //$scope.checkKyberNetwork();
}, 30000);
- $scope.priceTicker = {ETHBTC: 1, ETHREP: 1, BTCREP: 1, BTCETH: 1, REPBTC: 1, REPETH: 1};
+ $scope.priceTicker = {
+ ETHBTC: 1,
+ ETHREP: 1,
+ BTCREP: 1,
+ BTCETH: 1,
+ REPBTC: 1,
+ REPETH: 1
+ };
$scope.availableCoins = ["ETH", "BTC", "REP"];
$scope.availableTokens = [];
$scope.availableOptions = [...$scope.availableCoins, ...$scope.availableTokens];
- var initValues = function () {
- $scope.bity.refreshRates(function () {
+ var initValues = function() {
+ $scope.bity.refreshRates(function() {
$scope.setOrderCoin(true, "ETH");
});
$scope.kyberInit();
@@ -53,7 +60,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
});
$scope.availableTokens = $scope.kyber.getTokenList();
$scope.availableTokens.slice($scope.availableTokens.indexOf("ETH"), 1);
- $scope.availableFromOptions = [...$scope.availableCoins];
+ $scope.availableFromOptions = [...$scope.availableCoins, ...$scope.availableTokens];
$scope.availableToOptions = [...$scope.availableCoins, ...$scope.availableTokens];
$scope.showStage1 = true;
@@ -73,13 +80,13 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.resetErrorShownStates = function () {
+ $scope.resetErrorShownStates = function() {
$scope.showedMinMaxError = false;
if ($scope.showedKyberPairAvailableError) $scope.showedKyberPairAvailableError = false
};
- $scope.verifyMinMaxValues = function () {
+ $scope.verifyMinMaxValues = function() {
if ($scope.checkIfKyber()) {
return $scope.verifyKyberMinMaxValues();
} else {
@@ -87,8 +94,8 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
};
- $scope.verifyBityMinMaxValues = function () {
- if($scope.swapOrder.toVal=='' || $scope.swapOrder.fromVal == '' || $scope.swapOrder.toVal=='0' || $scope.swapOrder.fromVal == '0' || $scope.showedMinMaxError ) return false;
+ $scope.verifyBityMinMaxValues = function() {
+ if ($scope.swapOrder.toVal == '' || $scope.swapOrder.fromVal == '' || $scope.swapOrder.toVal == '0' || $scope.swapOrder.fromVal == '0' || $scope.showedMinMaxError) return false;
var errors = {
priceNotLoaded: 0,
lessThanMin: 1,
@@ -116,7 +123,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// todo: devise a Cleaner method
- $scope.setOrderCoin = function (isFrom, coin) {
+ $scope.setOrderCoin = function(isFrom, coin) {
$scope.kyberSwapRateDisplay();
let bityOptions = ["ETH", "BTC", "REP"];
let kyberOptions = $scope.availableTokens;
@@ -136,6 +143,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
} else {
$scope.availableToOptions = ["ETH"]
+ $scope.swapOrder.toCoin = "ETH";
}
$scope.swapOrder.fromCoin = coin;
} else {
@@ -154,8 +162,8 @@ var swapCtrl = function ($scope, $sce, walletService) {
})
}
} else {
- if($scope.swapOrder.fromCoin == "ETH"){
- // console.log(coin); //todo remove dev item
+ if ($scope.swapOrder.fromCoin == "ETH") {
+ $scope.availableToOptions = []
bityOptions.forEach((_item) => {
if (_item != coin) $scope.availableToOptions.push(_item)
})
@@ -185,7 +193,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.setBityOrderCoin = function (isFrom) {
+ $scope.setBityOrderCoin = function(isFrom) {
$scope.swapOrder.swapRate = $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin];
$scope.swapOrder.swapPair = $scope.swapOrder.fromCoin + "/" + $scope.swapOrder.toCoin;
$scope.updateBityEstimate(isFrom);
@@ -193,7 +201,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.updateEstimate = function (isFrom) {
+ $scope.updateEstimate = function(isFrom) {
if ($scope.checkIfKyber()) {
$scope.updateKyberEstimate(isFrom);
} else {
@@ -202,14 +210,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.updateBityEstimate = function (isFrom) {
+ $scope.updateBityEstimate = function(isFrom) {
if (isFrom) $scope.swapOrder.toVal = parseFloat(($scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin] * $scope.swapOrder.fromVal).toFixed(bity.decimals));
else $scope.swapOrder.fromVal = parseFloat(($scope.swapOrder.toVal / $scope.bity.curRate[$scope.swapOrder.fromCoin + $scope.swapOrder.toCoin]).toFixed(bity.decimals));
$scope.swapOrder.isFrom = isFrom;
};
- $scope.setFinalPrices = function () {
+ $scope.setFinalPrices = function() {
$scope.showedMinMaxError = false;
if ($scope.checkIfKyber()) {
$scope.setKyberFinalPrices();
@@ -227,7 +235,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
};
- var getProgressBarArr = function (index, len) {
+ var getProgressBarArr = function(index, len) {
var tempArr = [];
for (var i = 0; i < len; i++) {
if (i < index) tempArr.push('progress-true');
@@ -238,13 +246,13 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
// Only Bity orders are stored in local storage
- var isStorageOrderExists = function () {
+ var isStorageOrderExists = function() {
var order = globalFuncs.localStorage.getItem(lStorageKey, null);
return order && $scope.Validator.isJSON(order);
}
// Only Bity orders are stored in local storage
- var setOrderFromStorage = function () {
+ var setOrderFromStorage = function() {
var order = JSON.parse(globalFuncs.localStorage.getItem(lStorageKey, null));
$scope.orderResult = order;
$scope.swapOrder = order.swapOrder;
@@ -252,11 +260,11 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
// Only Bity orders are stored in local storage
- var saveOrderToStorage = function (order) {
+ var saveOrderToStorage = function(order) {
globalFuncs.localStorage.setItem(lStorageKey, JSON.stringify(order));
}
- var processOrder = function () {
+ var processOrder = function() {
var orderResult = $scope.orderResult;
orderResult.progress = {
status: "OPEN",
@@ -267,7 +275,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
pendingStatusReq: false,
checkDelay: 1000
};
- var timeRem = setInterval(function () {
+ var timeRem = setInterval(function() {
if (!orderResult) clearInterval(timeRem);
if (orderResult.progress.secsRemaining > 0) {
if (orderResult.progress.status == "OPEN")
@@ -285,11 +293,13 @@ var swapCtrl = function ($scope, $sce, walletService) {
clearInterval(timeRem);
}
}, 1000);
- var progressCheck = setInterval(function () {
+ var progressCheck = setInterval(function() {
if (!orderResult) clearInterval(progressCheck);
if (!orderResult.progress.pendingStatusReq) {
orderResult.progress.pendingStatusReq = true;
- $scope.bity.getStatus({orderid: orderResult.id}, function (data) {
+ $scope.bity.getStatus({
+ orderid: orderResult.id
+ }, function(data) {
if (data.error) $scope.notifier.danger(data.msg);
else {
data = data.data;
@@ -327,20 +337,20 @@ var swapCtrl = function ($scope, $sce, walletService) {
if ($scope.orderResult.input.currency == 'BTC') $scope.showStage3Btc = true;
else {
$scope.parentTxConfig = {
- to: ethUtil.toChecksumAddress($scope.orderResult.payment_address),
- value: $scope.orderResult.input.amount,
- sendMode: $scope.orderResult.input.currency == 'ETH' ? 'ether' : 'token',
- tokensymbol: $scope.orderResult.input.currency == 'ETH' ? '' : $scope.orderResult.input.currency,
- readOnly: true
- }
- // console.log(document.getElementById('sendTransaction')); //todo remove dev item
- // new Modal(document.getElementById('sendTransaction'));
+ to: ethUtil.toChecksumAddress($scope.orderResult.payment_address),
+ value: $scope.orderResult.input.amount,
+ sendMode: $scope.orderResult.input.currency == 'ETH' ? 'ether' : 'token',
+ tokensymbol: $scope.orderResult.input.currency == 'ETH' ? '' : $scope.orderResult.input.currency,
+ readOnly: true
+ }
+ // console.log(document.getElementById('sendTransaction')); //todo remove dev item
+ // new Modal(document.getElementById('sendTransaction'));
$scope.showStage3Eth = true;
}
}
- $scope.openOrder = function () {
+ $scope.openOrder = function() {
if (($scope.swapOrder.toCoin != 'BTC' && $scope.Validator.isValidAddress($scope.swapOrder.toAddress)) || ($scope.swapOrder.toCoin == 'BTC' && $scope.Validator.isValidBTCAddress($scope.swapOrder.toAddress))) {
var order = {
@@ -349,7 +359,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
pair: $scope.swapOrder.fromCoin + $scope.swapOrder.toCoin,
destAddress: $scope.swapOrder.toAddress
}
- $scope.bity.openOrder(order, function (data) {
+ $scope.bity.openOrder(order, function(data) {
if (!data.error) {
$scope.orderResult = data.data;
$scope.orderResult.swapOrder = $scope.swapOrder;
@@ -390,7 +400,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
};
- $scope.kyberInit = function () {
+ $scope.kyberInit = function() {
$scope.checkKyberNetwork();
$scope.receiveDecimals = 6;
$scope.sendDecimals = 6;
@@ -430,7 +440,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
status: "READY"
},
input: {
- amount: "", // $scope.swapOrder.fromVal
+ amount: "", // $scope.swapOrder.fromVal
currency: "" //$scope.swapOrder.fromCoin
},
output: {
@@ -444,7 +454,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ------------------------- MAIN SWAP PAGE FUNCTIONALITY TIE-INs (START) ------------------------------------- */
// called in setOrderCoin if selected pair is a kyber network pair
- $scope.setKyberOrderCoin = function (isFrom) {
+ $scope.setKyberOrderCoin = function(isFrom) {
$scope.isKyberPairAvailable();
$scope.swapOrder.swapRate = $scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)];
$scope.swapOrder.swapPair = $scope.swapOrder.fromCoin + "/" + $scope.swapOrder.toCoin;
@@ -452,7 +462,8 @@ var swapCtrl = function ($scope, $sce, walletService) {
$scope.dropdownFrom = $scope.dropdownTo = false;
};
- $scope.isKyberPairAvailable = function () {
+ $scope.isKyberPairAvailable = async function() {
+ await $scope.kyber.setKyberRate($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin);
if ($scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)] == 0 ||
$scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)] == "0") {
$scope.displayKyberErrorMessage("unAvailable");
@@ -463,18 +474,18 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// calculates the rate for display when a kyber pair is selected
- $scope.kyberSwapRateDisplay = function () {
+ $scope.kyberSwapRateDisplay = function() {
if ($scope.checkIfKyber()) $scope.kyberSwapRateDisplayValue = $scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)]
};
//used in updateEstimate and verifyBityMinMaxValues
- $scope.checkIfKyber = function () {
- return (($scope.availableTokens.indexOf($scope.swapOrder.fromCoin) >= 0 || $scope.swapOrder.fromCoin == "ETH") && ($scope.availableTokens.indexOf($scope.swapOrder.toCoin) >= 0 || $scope.swapOrder.toCoin == "ETH"));
- // return $scope.isKyberSwap;
+ $scope.checkIfKyber = function() {
+ $scope.isKyberRateSwap = (($scope.availableTokens.indexOf($scope.swapOrder.fromCoin) >= 0 || $scope.swapOrder.fromCoin == "ETH") && ($scope.availableTokens.indexOf($scope.swapOrder.toCoin) >= 0 || $scope.swapOrder.toCoin == "ETH"));
+ return $scope.isKyberRateSwap;
};
// Only Bity orders are stored in local storage
- $scope.verifyKyberMinMaxValues = function () {
+ $scope.verifyKyberMinMaxValues = function() {
// check if pair is available. Display message if is is not;
if ($scope.swapOrder.toVal == '' || $scope.swapOrder.fromVal == '' || $scope.swapOrder.toVal == '0' || $scope.swapOrder.fromVal == '0' || $scope.showedMinMaxError) return false;
var errors = {
@@ -484,7 +495,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
noErrors: 3,
pairNotAvailable: 4
};
- let verify = function () {
+ let verify = function() {
if (!$scope.kyber.priceLoaded) return errors.priceNotLoaded;
else if ($scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)] == 0) return errors.pairNotAvailable;
else if ($scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)] == "0") return errors.pairNotAvailable;
@@ -502,7 +513,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// called in updateEstimate if selected pair is a kyber network pair
- $scope.updateKyberEstimate = function (isFrom) {
+ $scope.updateKyberEstimate = function(isFrom) {
try {
if (/,/.test($scope.swapOrder.fromVal) || /,/.test($scope.swapOrder.toVal)) {
$scope.displayKyberErrorMessage("commas");
@@ -512,8 +523,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
let toDecimalsToUse = $scope.kyber.tokenDetails[$scope.swapOrder.toCoin].decimals < bity.decimals ? $scope.kyber.tokenDetails[$scope.swapOrder.toCoin].decimals : bity.decimals;
let _toVal = $scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)] * $scope.swapOrder.fromVal;
$scope.swapOrder.toVal = parseFloat((_toVal).toFixed(toDecimalsToUse));
- }
- else {
+ } else {
let fromDecimalsToUse = $scope.kyber.tokenDetails[$scope.swapOrder.fromCoin].decimals < bity.decimals ? $scope.kyber.tokenDetails[$scope.swapOrder.fromCoin].decimals : bity.decimals;
let _fromVal = $scope.swapOrder.toVal / $scope.kyber.kyberRates[kyber.toPairKey($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin)];
$scope.swapOrder.fromVal = parseFloat((_fromVal).toFixed(fromDecimalsToUse));
@@ -523,12 +533,11 @@ var swapCtrl = function ($scope, $sce, walletService) {
$scope.swapOrder.fromVal = "";
}
$scope.swapOrder.isFrom = isFrom;
- } catch (e) {
- }
+ } catch (e) {}
};
// called in setFinalPrices if selected pair is a kyber network pair
- $scope.setKyberFinalPrices = function () {
+ $scope.setKyberFinalPrices = function() {
$scope.showedMinMaxError = false;
$scope.isKyberSwap = $scope.checkIfKyber();
if ($scope.validKyberPair()) {
@@ -537,7 +546,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
if (!$scope.Validator.isPositiveNumber($scope.swapOrder.fromVal) || !$scope.Validator.isPositiveNumber($scope.swapOrder.toVal)) throw "Invalid Value Present";
else if (!$scope.verifyMinMaxValues()) throw "Invalid Value Present";
- $scope.updateFinalKyberEstimate($scope.swapOrder.isFrom, function () {
+ $scope.updateFinalKyberEstimate($scope.swapOrder.isFrom, function() {
// $scope.canSetKyberFinal = true;
if ($scope.swapOrder.finalRate > 0) {
$scope.showStage1 = false;
@@ -550,10 +559,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
} catch (e) {
console.error(e);
if (e == "Invalid Value Present") {
- $scope.displayKyberErrorMessage("tryCatch", {e: "$scope.displayKyberErrorMessage(\"tryCatch\", {e: e});"});
+ $scope.displayKyberErrorMessage("tryCatch", {
+ e: "$scope.displayKyberErrorMessage(\"tryCatch\", {e: e});"
+ });
}
// $scope.canSetKyberFinal = true;
- $scope.displayKyberErrorMessage("tryCatch", {e: e});
+ $scope.displayKyberErrorMessage("tryCatch", {
+ e: e
+ });
}
} else {
$scope.displayKyberErrorMessage("invalidPair");
@@ -562,9 +575,9 @@ var swapCtrl = function ($scope, $sce, walletService) {
// called with actual transaction source value to provide the most accurate estimate through the confirmation stages
// added callback so the progression waits for getExpected rate to return a value
- $scope.updateFinalKyberEstimate = function (isFrom, callback) {
+ $scope.updateFinalKyberEstimate = function(isFrom, callback) {
try {
- $scope.kyber.getExpectedRate($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin, $scope.swapOrder.fromVal, function (_rates) {
+ $scope.kyber.getExpectedRate($scope.swapOrder.fromCoin, $scope.swapOrder.toCoin, $scope.swapOrder.fromVal, function(_rates) {
let finalRate = $scope.kyber.convertToTokenBase(_rates.data.slippageRate, "ETH");
// todo: provide message and option to return if the rate value for the specified qty is 0.
// todo: or just provide the message and don't 'route' to the next page (I like this better)
@@ -573,8 +586,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
$scope.receiveDecimals = $scope.kyber.tokenDetails[$scope.swapOrder.toCoin].decimals < bity.decimals ? $scope.kyber.tokenDetails[$scope.swapOrder.toCoin].decimals : bity.decimals;
let _toVal = finalRate * $scope.swapOrder.fromVal;
$scope.swapOrder.toVal = parseFloat((_toVal).toFixed(bity.decimals));
- }
- else {
+ } else {
$scope.sendDecimals = 6;
let fromDecimalsToUse = $scope.kyber.tokenDetails[$scope.swapOrder.fromCoin].decimals < bity.decimals ? $scope.kyber.tokenDetails[$scope.swapOrder.fromCoin].decimals : bity.decimals;
@@ -596,14 +608,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ------------------------------------- KYBER CHECKS ------------------------------------- */
- $scope.checkKyberNetwork = function () {
- $scope.kyber.kyberNetworkState(function (data) {
+ $scope.checkKyberNetwork = function() {
+ $scope.kyber.kyberNetworkState(function(data) {
$scope.kyberNetworkEnabled = data.data;
})
};
// if user cap is below the entered amount allow the user to go back and change their inputs
- $scope.returnToStart = function () {
+ $scope.returnToStart = function() {
$scope.showStage1 = true;
$scope.showStage2Kyber = false;
$scope.showStage3Kyber = false;
@@ -616,22 +628,22 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.checkIfUserCanDo = function (_userAddress) {
+ $scope.checkIfUserCanDo = function(_userAddress) {
// console.log("checkIfUserCanDo 1", $scope.checkTokenBalance); //todo remove dev item
try {
if ($scope.checkTokenBalance) {
// console.log("checkIfUserCanDo 2", $s/cope.checkTokenBalance); //todo remove dev item
$scope.indicatorhacked = [];
- var makeIndicator = setInterval(function () {
+ var makeIndicator = setInterval(function() {
$scope.indicatorhacked.push(".");
if ($scope.indicatorhacked.length > 10) $scope.indicatorhacked = [];
}, 100);
$scope.checkTokenBalance = false;
- $scope.checkUserCap(_userAddress, function (result) {
+ $scope.checkUserCap(_userAddress, function(result) {
// console.log("checkIfUserCanDo result", result); //todo remove dev item
if (!result.error) {
- $scope.kyber.getBalance($scope.swapOrder.fromCoin, _userAddress, function (_result) {
+ $scope.kyber.getBalance($scope.swapOrder.fromCoin, _userAddress, function(_result) {
// console.log(_result); //todo remove dev item
let userTokenBalance = new BigNumber($scope.kyber.convertToTokenBase(_result.data, $scope.swapOrder.fromCoin));
let enoughTokens = userTokenBalance.gte($scope.swapOrder.fromVal);
@@ -642,7 +654,9 @@ var swapCtrl = function ($scope, $sce, walletService) {
} else {
clearInterval(makeIndicator);
$scope.kyberReturnToStart = true;
- $scope.displayKyberErrorMessage("tokenBalance", {userTokenBalance: userTokenBalance});
+ $scope.displayKyberErrorMessage("tokenBalance", {
+ userTokenBalance: userTokenBalance
+ });
$scope.userTokenBalanceChecked = userTokenBalance.toNumber();
}
});
@@ -663,7 +677,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
};
- $scope.checkUserCap = function (_userAddress, callback) {
+ $scope.checkUserCap = function(_userAddress, callback) {
let swapValue, isFrom;
if ($scope.swapOrder.fromCoin == "ETH") {
swapValue = $scope.swapOrder.fromVal;
@@ -687,7 +701,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
- $scope.validKyberPair = function () {
+ $scope.validKyberPair = function() {
let hasEth = ($scope.swapOrder.fromCoin == "ETH" || $scope.swapOrder.toCoin == "ETH");
let notBTC = ($scope.swapOrder.fromCoin !== "BTC" || $scope.swapOrder.toCoin !== "BTC");
let notREP = ($scope.swapOrder.fromCoin !== "REP" || $scope.swapOrder.toCoin !== "REP");
@@ -696,7 +710,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ------------------------------------- KYBER SPECIFIC (tx related) ------------------------------------- */
- $scope.prepareKyber = function () {
+ $scope.prepareKyber = function() {
try {
$scope.showStage2Kyber = true;
$scope.kyberOrderResult.input = {
@@ -717,7 +731,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ----------- Kyber ETH & TOKEN ----------- */
// Setup the kyber transaction at the point where the user enters the destAddress (enter address stage)
- $scope.startKyber = function () {
+ $scope.startKyber = function() {
try {
// console.log("startKyber 1", walletService.wallet); //todo remove dev item
// Enable checking if user can proceed
@@ -747,14 +761,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Set status to reflect a token to ETH (or Token to Token) swap to trigger proper UI elements and processing flow
- $scope.startKyberTokenSwap = function () {
+ $scope.startKyberTokenSwap = function() {
$scope.kyberOrderResult.progress = $scope.buildKyberOrderResultProgress();
$scope.setKyberStatus($scope.kyberStatus.token.prepare);
if (!$scope.$$phase) $scope.$apply();
};
// Stage 3 'Start Swap'. Based on selected swap pair determine which processing flow to follow
- $scope.openKyberOrder = function (wallet) {
+ $scope.openKyberOrder = function(wallet) {
// console.log($scope.walletKyber); //todo remove dev item
$scope.wallet = walletService.wallet;
if ($scope.availableTokens.indexOf($scope.swapOrder.fromCoin) >= 0) {
@@ -767,11 +781,11 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ----------- Kyber [ETH -> Token] (specific functions) ----------- */
// Set status to reflect a ETH to token swap to trigger proper UI elements and processing flow
- $scope.startKyberEthSwap = function () {
+ $scope.startKyberEthSwap = function() {
try {
$scope.kyberEthToToken = true;
$scope.kyberOrderResult.progress = $scope.buildKyberOrderResultProgress();
- $scope.setKyberStatus($scope.kyberStatus.eth.prepare);//OPEN_ETH
+ $scope.setKyberStatus($scope.kyberStatus.eth.prepare); //OPEN_ETH
if (!$scope.$$phase) $scope.$apply();
} catch (e) {
console.error(e);
@@ -779,7 +793,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Initiate ETH to Token Swap flow
- $scope.openKyberEthOrder = function () {
+ $scope.openKyberEthOrder = function() {
try {
$scope.addressString = $scope.walletKyber.getAddressString();
$scope.tx = $scope.buildTransactionObject($scope.kyber.getTradeData($scope.swapOrder, $scope.swapOrder.swapRate), $scope.kyber.getKyberNetworkAddress(), $scope.swapOrder.fromVal);
@@ -796,7 +810,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
// Initiate Token to ETH (or Token to Token) Swap flow
// Build the Approve transaction to send to the Token Contract of the 'from' Token
- $scope.approveTokenKyber = function () {
+ $scope.approveTokenKyber = function() {
try {
$scope.tx = $scope.buildTransactionObject($scope.kyber.approveKyber($scope.swapOrder.fromCoin, $scope.swapOrder.fromVal), $scope.kyber.getTokenAddress($scope.swapOrder.fromCoin));
var txData = uiFuncs.getTxData($scope);
@@ -809,7 +823,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Build the Swap transaction to send to the Kyber Network Contract to execute the swap
- $scope.openKyberTokenOrder = function (nonce, gasPrice) {
+ $scope.openKyberTokenOrder = function(nonce, gasPrice) {
try {
$scope.tx = $scope.buildTransactionObject($scope.kyber.getTradeData($scope.swapOrder, $scope.swapOrder.swapRate), $scope.kyber.getKyberNetworkAddress());
var txData = uiFuncs.getTxData($scope);
@@ -829,9 +843,9 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ----------- Kyber (common functions) ----------- */
// generate the transaction object based on the specific flow stage
- $scope.generateKyberTransaction = function (txData, stage) {
+ $scope.generateKyberTransaction = function(txData, stage) {
try {
- uiFuncs.generateTx(txData, function (rawTx) {
+ uiFuncs.generateTx(txData, function(rawTx) {
if (!rawTx.isError) {
switch (stage) {
case "GENERATE_APPROVAL_TRANSACTION":
@@ -866,7 +880,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Trigger the opening of the modal for user review and authorization to proceed
- $scope.sendKyberModal = function () {
+ $scope.sendKyberModal = function() {
try {
switch ($scope.kyberOrderResult.progress.status) {
case "APPROVE_TOKENS":
@@ -888,7 +902,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// call the send function with content specific to the transaction object related to the specific flow stage
- $scope.sendKyberTransaction = function () {
+ $scope.sendKyberTransaction = function() {
try {
switch ($scope.kyberOrderResult.progress.status) {
case "APPROVE_TOKENS":
@@ -918,9 +932,9 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Send the transaction, call functions related to the specific flow stage, and update the UI
- $scope.sendKyberTx = function (signedTx) {
+ $scope.sendKyberTx = function(signedTx) {
try {
- uiFuncs.sendTx(signedTx, function (resp) {
+ uiFuncs.sendTx(signedTx, function(resp) {
if (!resp.isError) {
let notCustomNode = $scope.ajaxReq.type != nodes.nodeTypes.Custom;
switch ($scope.kyberOrderResult.progress.status) {
@@ -958,18 +972,18 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ----------- Kyber [Token -> ETH] (Polling For Token Approval) ----------- */
// Poll token contract for approval, then trigger the Kyber Network Contract portion of the flow
- $scope.checkForTokenApproveKyber = function (address) {
+ $scope.checkForTokenApproveKyber = function(address) {
try {
// var checkValue = etherUnits.toWei($scope.swapOrder.fromVal, "ether");
var checkValue = $scope.kyber.convertToTokenWei($scope.swapOrder.fromVal, $scope.swapOrder.fromCoin);
$scope.indicatorhacked = [];
var orderResult = $scope.kyberOrderResult;
orderResult.progress.startTime = new Date().getTime();
- var progressCheck = setInterval(function () {
+ var progressCheck = setInterval(function() {
if ($scope.indicatorhacked.length > 10) $scope.indicatorhacked = [];
if (!orderResult.progress.pendingStatusReq) {
orderResult.progress.pendingStatusReq = true;
- $scope.kyber.allowance($scope.swapOrder.fromCoin, address, function (data) {
+ $scope.kyber.allowance($scope.swapOrder.fromCoin, address, function(data) {
if (data.error) $scope.notifier.danger(data.msg);
else {
@@ -996,7 +1010,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
/* ---------------------------------------- MISC./UTIL --------------------------------------------------------- */
// Build a $scope.tx object with supplied parameters
- $scope.buildTransactionObject = function (data, to, value, gasPrice) {
+ $scope.buildTransactionObject = function(data, to, value, gasPrice) {
return {
gasLimit: kyber.defaultValues.gasLimit,
data: data,
@@ -1009,7 +1023,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
// Build a $scope.orderResult.progress object with initial values
- $scope.buildKyberOrderResultProgress = function () {
+ $scope.buildKyberOrderResultProgress = function() {
return {
bar: getProgressBarArr(1, 5),
weiValue: $scope.kyber.convertToTokenBase($scope.swapOrder.fromVal, "ETH"),
@@ -1019,14 +1033,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
};
};
- $scope.displayTxHash = function (resp, txHashInject) {
+ $scope.displayTxHash = function(resp, txHashInject) {
var emailLink = '
Confused? Email Us.'; // email link
var bExStr = $scope.ajaxReq.type != nodes.nodeTypes.Custom ? `
View your transaction ` : "";
$scope.sendTxStatus += globalFuncs.successMsgs[2] + "
" + resp.data + "
" + bExStr + "
" + emailLink + "
";
$scope.notifier.success($scope.sendTxStatus);
};
- $scope.displayKyberErrorMessage = function (type, params) {
+ $scope.displayKyberErrorMessage = function(type, params) {
switch (type) {
case "userCap":
let message;
@@ -1063,12 +1077,12 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
- $scope.setKyberStatus = function (status) {
+ $scope.setKyberStatus = function(status) {
$scope.kyberOrderResult.progress.status = status;
};
- $scope.parseKyberSignedTx = function (signedTx) {
+ $scope.parseKyberSignedTx = function(signedTx) {
$scope.parsedKyberTx = $scope.parseKyberSignedTransaction(signedTx);
if (!$scope.kyberEthToToken) {
$scope.parsedKyberTokenTx = $scope.parseKyberSignedTransaction($scope.kyberTransaction.tokenApproveTx.signedTx);
@@ -1094,7 +1108,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
}
};
- $scope.parseKyberSignedTransaction = function (signedTx) {
+ $scope.parseKyberSignedTransaction = function(signedTx) {
var txData = {}
var isJSON = false;
let parsedKyberTx = {}
@@ -1123,14 +1137,14 @@ var swapCtrl = function ($scope, $sce, walletService) {
return parsedKyberTx;
};
- var applyScope = function () {
+ var applyScope = function() {
if (!$scope.$$phase) $scope.$apply();
};
- $scope.$watch(function () {
+ $scope.$watch(function() {
if (walletService.wallet == null) return null;
return walletService.wallet.getAddressString();
- }, function (oldVal, newVal, scpe) {
+ }, function(oldVal, newVal, scpe) {
// console.log("$watch", oldVal); //todo remove dev item
// console.log("$watch", newVal); //todo remove dev item
if (walletService.wallet == null) return;
@@ -1146,7 +1160,7 @@ var swapCtrl = function ($scope, $sce, walletService) {
///////////////////////// KYBER (end) //////////////////////////////////////////////////////////////////
- $scope.newSwap = function () {
+ $scope.newSwap = function() {
globalFuncs.localStorage.setItem(lStorageKey, '');
initValues();
};
@@ -1157,4 +1171,4 @@ var swapCtrl = function ($scope, $sce, walletService) {
setOrderFromStorage();
}
};
-module.exports = swapCtrl;
+module.exports = swapCtrl;
\ No newline at end of file
diff --git a/app/scripts/kyber.js b/app/scripts/kyber.js
index 8e7763ba70..17ec57bebb 100644
--- a/app/scripts/kyber.js
+++ b/app/scripts/kyber.js
@@ -1,7 +1,7 @@
const mainKyberNetworkABI = require('./kyberConfig/KyberNetworkABI.json');
const KyberReserveABI = require('./kyberConfig/KyberReserveABI.json');
//todo convert from callbacks to async (or promise)
-const kyberFuncs = function () {
+const kyberFuncs = function() {
var _this = this;
this.kyberNetworkABI = {};
for (let i in mainKyberNetworkABI) this.kyberNetworkABI[mainKyberNetworkABI[i].name] = mainKyberNetworkABI[i];
@@ -18,8 +18,7 @@ const kyberFuncs = function () {
for (let i in kyberFuncs.networkTokenABIs.ETH[key]) {
this.tokenABIs[key][kyberFuncs.networkTokenABIs.ETH[key][i].name] = kyberFuncs.networkTokenABIs.ETH[key][i];
}
- }
- ;
+ };
break;
case nodes.nodeTypes.Ropsten:
this.nodeType = "ROPSTEN";
@@ -57,12 +56,12 @@ kyberFuncs.networkTokenABIs = {
NULL: {}
};
-kyberFuncs.kyberUnavailablePhrasing = function (fromCoin, toCoin) {
+kyberFuncs.kyberUnavailablePhrasing = function(fromCoin, toCoin) {
let _pair = kyberFuncs.toPairKey(fromCoin, toCoin);
return `The pair ${_pair} is temporarily unavailable`;
};
-kyberFuncs.prototype.buildPairList = function (tokens) {
+kyberFuncs.prototype.buildPairList = function(tokens) {
let forRates = {};
tokens.forEach((_token) => {
tokens.forEach((_token2) => {
@@ -74,19 +73,19 @@ kyberFuncs.prototype.buildPairList = function (tokens) {
return forRates;
};
-kyberFuncs.toPairKey = function (_from, _to) {
+kyberFuncs.toPairKey = function(_from, _to) {
return _from + "/" + _to;
};
-kyberFuncs.fromPairKey = function (_pairKey) {
+kyberFuncs.fromPairKey = function(_pairKey) {
return _pairKey.split("/");
};
-kyberFuncs.BnToNumber = function (bn) {
+kyberFuncs.BnToNumber = function(bn) {
return bn.toNumber();
}
-kyberFuncs.prototype.setCurrentNetwork = function (_network) {
+kyberFuncs.prototype.setCurrentNetwork = function(_network) {
var _this = this;
if (_network) {
@@ -98,32 +97,32 @@ kyberFuncs.prototype.setCurrentNetwork = function (_network) {
}
};
-kyberFuncs.prototype.setDefaultValues = function (_network) {
+kyberFuncs.prototype.setDefaultValues = function(_network) {
var _this = this;
// kyberFuncs.defaultValues.maxGasPrice = _network["max gas price"] ? _network["max gas price"] : 50000000000;// 50 Gwei
}
-kyberFuncs.prototype.setCurrentTokenABIs = function (_tokenABIs) {
+kyberFuncs.prototype.setCurrentTokenABIs = function(_tokenABIs) {
var _this = this;
_this.tokenABIs = _tokenABIs;
};
-kyberFuncs.prototype.getKyberNetworkAddress = function () {
+kyberFuncs.prototype.getKyberNetworkAddress = function() {
var _this = this;
return _this.currentNetwork.network;
};
-kyberFuncs.prototype.getTokenAddress = function (_token) {
+kyberFuncs.prototype.getTokenAddress = function(_token) {
var _this = this;
return _this.tokenDetails[_token].address;
};
-kyberFuncs.prototype.getTokenList = function () {
+kyberFuncs.prototype.getTokenList = function() {
var _this = this;
return _this.mainTokens.filter(_tok => _tok !== "ETH")
};
-kyberFuncs.prototype.getDataString = function (func, inputs) {
+kyberFuncs.prototype.getDataString = function(func, inputs) {
var fullFuncName = ethUtil.solidityUtils.transformToFullName(func);
var funcSig = ethFuncs.getFunctionSignature(fullFuncName);
var typeName = ethUtil.solidityUtils.extractTypeName(fullFuncName);
@@ -132,7 +131,7 @@ kyberFuncs.prototype.getDataString = function (func, inputs) {
return '0x' + funcSig + ethUtil.solidityCoder.encodeParams(types, inputs);
};
-kyberFuncs.prototype.findBestRate = function (srcToken, destToken, srcQty, callback) {
+kyberFuncs.prototype.findBestRate = function(srcToken, destToken, srcQty, callback) {
/*returns (uint expectedRate, uint slippageRate)*/
var _this = this;
var srcTokenAddress = _this.getTokenAddress(srcToken);
@@ -141,15 +140,15 @@ kyberFuncs.prototype.findBestRate = function (srcToken, destToken, srcQty, callb
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, [srcTokenAddress, destTokenAddress, srcQty])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
data.data = {
- "bestReserve": ethUtil.solidityCoder.decodeParams(outTypes, data.data.replace('0x', ''))[0].toString(), // NOTE: was toNumber()
+ "bestReserve": ethUtil.solidityCoder.decodeParams(outTypes, data.data.replace('0x', ''))[0].toString(), // NOTE: was toNumber()
"bestRate": ethUtil.solidityCoder.decodeParams(outTypes, data.data.replace('0x', ''))[1].toString() // NOTE: was toNumber()
};
callback(data);
@@ -157,15 +156,15 @@ kyberFuncs.prototype.findBestRate = function (srcToken, destToken, srcQty, callb
});
};
-kyberFuncs.prototype.ethCall = function (funcABI, inputArray) {
+kyberFuncs.prototype.ethCall = function(funcABI, inputArray) {
var _this = this;
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, inputArray)
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
data.data = ethUtil.solidityCoder.decodeParams(outTypes, data.data.replace('0x', ''))[0];
@@ -174,12 +173,22 @@ kyberFuncs.prototype.ethCall = function (funcABI, inputArray) {
});
};
+kyberFuncs.prototype.setKyberRate = function(_from, _to) {
+ var _this = this;
+ return new Promise((resolve, reject) => {
+ _this.getExpectedRate(_from, _to, 1, (_results) => {
+ _this.kyberRates[kyber.toPairKey(_from, _to)] = _this.convertToTokenBase(_results.data.slippageRate, "ETH");
+ _this.priceLoaded = true;
+ resolve();
+ })
+ })
+};
-kyberFuncs.prototype.refreshRates = function () {
+kyberFuncs.prototype.refreshRates = function() {
var _this = this;
let keys = Object.keys(_this.kyberRates);
- keys.forEach(function (_key) {
+ keys.forEach(function(_key) {
let pairContents = kyberFuncs.fromPairKey(_key);
let fromToken = pairContents[0];
let toToken = pairContents[1];
@@ -194,7 +203,7 @@ kyberFuncs.prototype.refreshRates = function () {
// For tokens with less than 18 decimals convert the raw balance to use 18 decimals for comparison (i.e. the values are converted to eth like decimals) [temporary]
// Todo: convert all conversion points to use convertToTokenWei or convertToTokenBase
-kyberFuncs.prototype.convertToTokenWei = function (_value, _token) {
+kyberFuncs.prototype.convertToTokenWei = function(_value, _token) {
var _this = this;
if (_value == "" || _value == undefined) {
_value = 0;
@@ -208,14 +217,14 @@ kyberFuncs.prototype.convertToTokenWei = function (_value, _token) {
};
-kyberFuncs.prototype.convertToTokenBase = function (_value, _token) {
+kyberFuncs.prototype.convertToTokenBase = function(_value, _token) {
var _this = this;
if (_value == "" || _value == undefined) {
_value = 0;
}
let decimal = _this.tokenDetails[_token].decimals;
if (decimal < 18) {
- let numnum = new BigNumber(String(_value)).div(new BigNumber(10).pow(decimal)).toString();// NOTE: was toNumber()
+ let numnum = new BigNumber(String(_value)).div(new BigNumber(10).pow(decimal)).toString(); // NOTE: was toNumber()
return numnum;
} else {
@@ -224,7 +233,7 @@ kyberFuncs.prototype.convertToTokenBase = function (_value, _token) {
};
-kyberFuncs.prototype.getBalance = async function (_token, userAddress, callback) {
+kyberFuncs.prototype.getBalance = async function(_token, userAddress, callback) {
var _this = this;
// returns int
var _tokenAddress = _this.getTokenAddress(_token);
@@ -232,10 +241,10 @@ kyberFuncs.prototype.getBalance = async function (_token, userAddress, callback)
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, [_tokenAddress, userAddress])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
@@ -251,7 +260,7 @@ kyberFuncs.prototype.getBalance = async function (_token, userAddress, callback)
/*ERC20 src, ERC20 dest, uint srcQty*/
// rate/10**18between 1 eth and 1 token base
-kyberFuncs.prototype.getExpectedRate = function (srcToken, destToken, srcQty /* In ETH or Whole Token*/, callback) {
+kyberFuncs.prototype.getExpectedRate = function(srcToken, destToken, srcQty /* In ETH or Whole Token*/ , callback) {
var _this = this;
// returns int
var srcTokenAddress = _this.getTokenAddress(srcToken);
@@ -261,10 +270,10 @@ kyberFuncs.prototype.getExpectedRate = function (srcToken, destToken, srcQty /*
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, [srcTokenAddress, destTokenAddress, valueInWei])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
@@ -278,17 +287,17 @@ kyberFuncs.prototype.getExpectedRate = function (srcToken, destToken, srcQty /*
};
-kyberFuncs.prototype.getUserCapInWei = function (address, callback) {
+kyberFuncs.prototype.getUserCapInWei = function(address, callback) {
var _this = this;
// returns int
var funcABI = _this.kyberNetworkABI.getUserCapInWei;
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, [address])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
@@ -298,51 +307,49 @@ kyberFuncs.prototype.getUserCapInWei = function (address, callback) {
});
};
-kyberFuncs.prototype.checkUserCap = function (_userAddress, swapValue /* In ETH or Whole Token*/, isFrom, callback) {
+kyberFuncs.prototype.checkUserCap = function(_userAddress, swapValue /* In ETH or Whole Token*/ , isFrom, callback) {
var _this = this;
let weiValue = _this.convertToTokenWei(swapValue, "ETH");
- _this.getUserCapInWei(_userAddress, function (data) {
+ _this.getUserCapInWei(_userAddress, function(data) {
// console.log(data); //todo remove dev item
let numberAsBN = new BigNumber(weiValue);
let nineFivePct = data.data.times(0.95);
let nineFivePctUserCap = _this.convertToTokenWei(nineFivePct, "ETH");
if (nineFivePct.gt(numberAsBN)) {
- callback(
- {
- error: false,
- data: {
- isFrom: isFrom,
- userCap: nineFivePctUserCap,
- originalValue: swapValue,
- result: nineFivePct.gt(numberAsBN)
- }
- });
+ callback({
+ error: false,
+ data: {
+ isFrom: isFrom,
+ userCap: nineFivePctUserCap,
+ originalValue: swapValue,
+ result: nineFivePct.gt(numberAsBN)
+ }
+ });
} else {
- callback(
- {
- error: true,
- data: {
- isFrom: isFrom,
- userCap: nineFivePctUserCap,
- originalValue: swapValue,
- result: nineFivePct.gt(numberAsBN)
- }
- });
+ callback({
+ error: true,
+ data: {
+ isFrom: isFrom,
+ userCap: nineFivePctUserCap,
+ originalValue: swapValue,
+ result: nineFivePct.gt(numberAsBN)
+ }
+ });
}
})
};
-kyberFuncs.prototype.kyberNetworkState = async function (callback) {
+kyberFuncs.prototype.kyberNetworkState = async function(callback) {
var _this = this;
var funcABI = _this.kyberNetworkABI.enabled;
ajaxReq.getEthCall({
to: _this.currentNetwork.network,
data: _this.getDataString(funcABI, [""])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
data.data = ethUtil.solidityCoder.decodeParams(outTypes, data.data.replace('0x', ''))[0];
@@ -353,14 +360,14 @@ kyberFuncs.prototype.kyberNetworkState = async function (callback) {
};
-kyberFuncs.prototype.approveKyber = function (srcToken, value) {
+kyberFuncs.prototype.approveKyber = function(srcToken, value) {
var _this = this;
var funcABI = _this.tokenABIs[srcToken].approve;
var weiValue = _this.convertToTokenWei(value, srcToken);
return _this.getDataString(funcABI, [_this.KyberNetworkAddress, weiValue]);
};
-kyberFuncs.prototype.allowance = function (srcToken, userAddress, callback) {
+kyberFuncs.prototype.allowance = function(srcToken, userAddress, callback) {
var _this = this;
var funcABI = _this.tokenABIs[srcToken].allowance;
@@ -369,10 +376,10 @@ kyberFuncs.prototype.allowance = function (srcToken, userAddress, callback) {
ajaxReq.getEthCall({
to: srcTokenAddress,
data: _this.getDataString(funcABI, [userAddress, _this.KyberNetworkAddress])
- }, function (data) {
+ }, function(data) {
if (data.error) callback(data);
else {
- var outTypes = funcABI.outputs.map(function (i) {
+ var outTypes = funcABI.outputs.map(function(i) {
return i.type;
});
@@ -383,7 +390,7 @@ kyberFuncs.prototype.allowance = function (srcToken, userAddress, callback) {
});
};
-kyberFuncs.prototype.getTradeData = function (swapOrder, minRate) {
+kyberFuncs.prototype.getTradeData = function(swapOrder, minRate) {
var _this = this;
var funcABI = _this.kyberNetworkABI.trade;
@@ -391,7 +398,7 @@ kyberFuncs.prototype.getTradeData = function (swapOrder, minRate) {
var destTokenAddress = _this.getTokenAddress(swapOrder.toCoin);
let walletId = "0xDECAF9CD2367cdbb726E904cD6397eDFcAe6068D";
let minConversionRate = minRate ? minRate : 1; // Uses slippagePrice with fallback to MarketRate. 1 => Market Rate, but we could also set this as the quoted rate
- let srcAmount = _this.convertToTokenWei(swapOrder.fromVal, swapOrder.fromCoin);//etherUnits.toWei(swapOrder.fromVal, "ether");
+ let srcAmount = _this.convertToTokenWei(swapOrder.fromVal, swapOrder.fromCoin); //etherUnits.toWei(swapOrder.fromVal, "ether");
let maxDestAmount = 2 ** 200; //100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000; // Really big number (like a googol)
if (swapOrder.toAddress) {
@@ -401,4 +408,4 @@ kyberFuncs.prototype.getTradeData = function (swapOrder, minRate) {
}
};
-module.exports = kyberFuncs;
+module.exports = kyberFuncs;
\ No newline at end of file
diff --git a/chrome-extension/contest.html b/chrome-extension/contest.html
index 4c9bd9cc50..cb5760b5a6 100644
--- a/chrome-extension/contest.html
+++ b/chrome-extension/contest.html
@@ -98,13 +98,13 @@
- 3.21.07
+ 3.21.08
-
3.21.07
+
3.21.08
{{curLang}}
diff --git a/chrome-extension/cx-wallet.html b/chrome-extension/cx-wallet.html
index 25f9aa2418..8005310594 100644
--- a/chrome-extension/cx-wallet.html
+++ b/chrome-extension/cx-wallet.html
@@ -83,12 +83,12 @@
- 3.21.07
+ 3.21.08
-
3.21.07
+
3.21.08
{{curLang}}
@@ -2094,7 +2094,7 @@ for
+
1 {{swapOrder.fromCoin}} = {{kyber.kyberRates[swapOrder.fromCoin + "/" + swapOrder.toCoin] | number: 6}} {{swapOrder.toCoin}}
diff --git a/chrome-extension/helpers.html b/chrome-extension/helpers.html
index 58e06850f5..c40a6f917a 100644
--- a/chrome-extension/helpers.html
+++ b/chrome-extension/helpers.html
@@ -98,13 +98,13 @@
- 3.21.07
+ 3.21.08
-
3.21.07
+
3.21.08
{{curLang}}
diff --git a/chrome-extension/images/logo-kyber-beta-raw.svg b/chrome-extension/images/logo-kyber-beta-raw.svg
new file mode 100644
index 0000000000..72af7c4cc1
--- /dev/null
+++ b/chrome-extension/images/logo-kyber-beta-raw.svg
@@ -0,0 +1,28 @@
+
+
\ No newline at end of file
diff --git a/chrome-extension/images/logo-kyber-beta.svg b/chrome-extension/images/logo-kyber-beta.svg
new file mode 100644
index 0000000000..630debdc99
--- /dev/null
+++ b/chrome-extension/images/logo-kyber-beta.svg
@@ -0,0 +1,27 @@
+
\ No newline at end of file
diff --git a/chrome-extension/images/logo-kyber.svg b/chrome-extension/images/logo-kyber.svg
new file mode 100644
index 0000000000..12d3ed90a4
--- /dev/null
+++ b/chrome-extension/images/logo-kyber.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/chrome-extension/js/etherwallet-master.js b/chrome-extension/js/etherwallet-master.js
index 25612f9ecf..1efe1f19a8 100644
--- a/chrome-extension/js/etherwallet-master.js
+++ b/chrome-extension/js/etherwallet-master.js
@@ -4829,7 +4829,6 @@ var decryptWalletCtrl = function decryptWalletCtrl($scope, $sce, walletService)
module.exports = decryptWalletCtrl;
}).call(this,require("buffer").Buffer)
-
},{"buffer":219}],23:[function(require,module,exports){
'use strict';
@@ -6560,10 +6559,11 @@ var signMsgCtrl = function signMsgCtrl($scope, $sce, walletService) {
module.exports = signMsgCtrl;
}).call(this,require("buffer").Buffer)
-
},{"buffer":219}],31:[function(require,module,exports){
'use strict';
+function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
+
function _toConsumableArray(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = Array(arr.length); i <