Clean shapeshift service and add the correct callback
This commit is contained in:
Jean-Baptiste Dominguez
parent
2a017bc999
commit
c40eabf807
3 changed files with 85 additions and 145 deletions
|
|
@ -328,10 +328,13 @@ angular.module('copayApp.services').factory('shapeshiftApiService', function($q)
|
||||||
$scope.amount, $scope.withdrawalAddress,
|
$scope.amount, $scope.withdrawalAddress,
|
||||||
$scope.coinIn, $scope.coinOut
|
$scope.coinIn, $scope.coinOut
|
||||||
);
|
);
|
||||||
|
console.log('shapeshiftApiService.FixedAmountTx()');
|
||||||
console.log(fixedTx);
|
console.log(fixedTx);
|
||||||
SSA.FixedAmountTx(fixedTx, function (data) {
|
SSA.FixedAmountTx(fixedTx, function (data) {
|
||||||
console.log(data)
|
console.log(data);
|
||||||
return promise.resolve({ fixedTxData : data.success });
|
promise.resolve(data.success);
|
||||||
|
}, function (err) {
|
||||||
|
promise.reject(err);
|
||||||
});
|
});
|
||||||
return promise.promise;
|
return promise.promise;
|
||||||
},
|
},
|
||||||
|
|
@ -361,8 +364,10 @@ angular.module('copayApp.services').factory('shapeshiftApiService', function($q)
|
||||||
},
|
},
|
||||||
ValidateAddress : function(address, coin) {
|
ValidateAddress : function(address, coin) {
|
||||||
var promise = $q.defer();
|
var promise = $q.defer();
|
||||||
SSA.ValidateAdddress(address, coin, function(data){
|
SSA.ValidateAdddress(address, coin, function onSuccess(data){
|
||||||
promise.resolve(data);
|
promise.resolve(data);
|
||||||
|
}, function onError(err) {
|
||||||
|
promise.reject(err);
|
||||||
});
|
});
|
||||||
return promise.promise;
|
return promise.promise;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
76
src/js/services/shapeshift.service.js
Normal file
76
src/js/services/shapeshift.service.js
Normal file
|
|
@ -0,0 +1,76 @@
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
angular.module('bitcoincom.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingDataService, platformInfo, servicesService) {
|
||||||
|
var root = {};
|
||||||
|
root.ShiftState = 'Shift';
|
||||||
|
root.coinIn = '';
|
||||||
|
root.coinOut = '';
|
||||||
|
root.withdrawalAddress = '';
|
||||||
|
root.returnAddress = '';
|
||||||
|
root.amount = '';
|
||||||
|
root.marketData = {};
|
||||||
|
|
||||||
|
root.getMarketData = function (coinIn, coinOut, cb) {
|
||||||
|
root.coinIn = coinIn;
|
||||||
|
root.coinOut = coinOut;
|
||||||
|
if (root.coinIn !== undefined && root.coinOut !== undefined){
|
||||||
|
shapeshiftApiService
|
||||||
|
.marketInfo(root.coinIn, root.coinOut)
|
||||||
|
.then(function (marketData) {
|
||||||
|
root.marketData = marketData;
|
||||||
|
root.rateString = root.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
|
||||||
|
if (cb) {
|
||||||
|
cb(marketData);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
root.coins = {
|
||||||
|
'BTC': {name: 'Bitcoin', symbol: 'BTC'},
|
||||||
|
'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'}
|
||||||
|
};
|
||||||
|
|
||||||
|
root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) {
|
||||||
|
ongoingProcess.set('connectingShapeshift', true);
|
||||||
|
root.withdrawalAddress = withdrawalAddress;
|
||||||
|
root.returnAddress = returnAddress;
|
||||||
|
root.coinIn = coinIn;
|
||||||
|
root.coinOut = coinOut;
|
||||||
|
shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut).then(function onSuccess(data) {
|
||||||
|
shapeshiftApiService.FixedAmountTx(root).then(function onSuccess(txData) {
|
||||||
|
if (txData.err) {
|
||||||
|
cb(txData.err);
|
||||||
|
} else {
|
||||||
|
if (!txData.orderId || !txData.deposit) {
|
||||||
|
cb(new Error('Invalid response'));
|
||||||
|
} else {
|
||||||
|
var coinPair = txData.pair.split('_');
|
||||||
|
txData.depositType = coinPair[0].toUpperCase();
|
||||||
|
txData.withdrawalType = coinPair[1].toUpperCase();
|
||||||
|
coin = root.coins[txData.depositType].name.toLowerCase();
|
||||||
|
txData.depositQR = coin + ":" + txData.deposit + "?amount=" + txData.depositAmount;
|
||||||
|
root.txFixedPending = true;
|
||||||
|
root.depositInfo = txData;
|
||||||
|
var shapeshiftData = {
|
||||||
|
coinIn: coinIn,
|
||||||
|
coinOut: coinOut,
|
||||||
|
toWalletId: root.toWalletId,
|
||||||
|
minAmount: root.marketData.minimum,
|
||||||
|
maxAmount: root.marketData.maxLimit,
|
||||||
|
orderId: txData.orderId,
|
||||||
|
toAddress: txData.deposit
|
||||||
|
};
|
||||||
|
|
||||||
|
cb(null, shapeshiftData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, function onError(err) {
|
||||||
|
cb(err);
|
||||||
|
});
|
||||||
|
}, function onError(err) {
|
||||||
|
cb(err);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
return root;
|
||||||
|
});
|
||||||
|
|
@ -1,141 +0,0 @@
|
||||||
'use strict';
|
|
||||||
|
|
||||||
angular.module('copayApp.services').factory('shapeshiftService', function ($http, $interval, $log, lodash, moment, ongoingProcess, shapeshiftApiService, storageService, configService, incomingDataService, platformInfo, servicesService) {
|
|
||||||
var root = {};
|
|
||||||
root.ShiftState = 'Shift';
|
|
||||||
root.coinIn = '';
|
|
||||||
root.coinOut = '';
|
|
||||||
root.withdrawalAddress = '';
|
|
||||||
root.returnAddress = '';
|
|
||||||
root.amount = '';
|
|
||||||
root.marketData = {};
|
|
||||||
|
|
||||||
root.getMarketDataIn = function (coin) {
|
|
||||||
if (coin === root.coinOut) return root.getMarketData(root.coinOut, root.coinIn);
|
|
||||||
return root.getMarketData(coin, root.coinOut);
|
|
||||||
};
|
|
||||||
root.getMarketDataOut = function (coin) {
|
|
||||||
if (coin === root.coinIn) return root.getMarketData(root.coinOut, root.coinIn);
|
|
||||||
return root.getMarketData(root.coinIn, coin);
|
|
||||||
};
|
|
||||||
root.getMarketData = function (coinIn, coinOut, cb) {
|
|
||||||
root.coinIn = coinIn;
|
|
||||||
root.coinOut = coinOut;
|
|
||||||
if (root.coinIn === undefined || root.coinOut === undefined) return;
|
|
||||||
shapeshiftApiService
|
|
||||||
.marketInfo(root.coinIn, root.coinOut)
|
|
||||||
.then(function (marketData) {
|
|
||||||
root.marketData = marketData;
|
|
||||||
root.rateString = root.marketData.rate.toString() + ' ' + coinOut.toUpperCase() + '/' + coinIn.toUpperCase();
|
|
||||||
if (cb) {
|
|
||||||
cb(marketData);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
/*shapeshiftApiService.coins().then(function(coins){
|
|
||||||
root.coins = coins;
|
|
||||||
root.coinIn = coins['BTC'].symbol;
|
|
||||||
root.coinOut = coins['BCH'].symbol;
|
|
||||||
root.getMarketData(root.coinIn, root.coinOut);
|
|
||||||
});*/
|
|
||||||
|
|
||||||
root.coins = {
|
|
||||||
'BTC': {name: 'Bitcoin', symbol: 'BTC'},
|
|
||||||
'BCH': {name: 'Bitcoin Cash', symbol: 'BCH'}
|
|
||||||
};
|
|
||||||
|
|
||||||
function checkForError(data) {
|
|
||||||
if (data.err) return true;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
root.shiftIt = function (coinIn, coinOut, withdrawalAddress, returnAddress, cb) {
|
|
||||||
ongoingProcess.set('connectingShapeshift', true);
|
|
||||||
root.withdrawalAddress = withdrawalAddress;
|
|
||||||
root.returnAddress = returnAddress;
|
|
||||||
root.coinIn = coinIn;
|
|
||||||
root.coinOut = coinOut;
|
|
||||||
shapeshiftApiService.ValidateAddress(withdrawalAddress, coinOut).then(function (valid) {
|
|
||||||
var tx = ShapeShift();
|
|
||||||
var coin;
|
|
||||||
console.log("Starting");
|
|
||||||
tx.then(function (txData) {
|
|
||||||
console.log("Got txData", txData);
|
|
||||||
if (txData['fixedTxData']) {
|
|
||||||
txData = txData.fixedTxData;
|
|
||||||
if (checkForError(txData)) return cb(txData.err);
|
|
||||||
//console.log(txData)
|
|
||||||
var coinPair = txData.pair.split('_');
|
|
||||||
txData.depositType = coinPair[0].toUpperCase();
|
|
||||||
txData.withdrawalType = coinPair[1].toUpperCase();
|
|
||||||
coin = root.coins[txData.depositType].name.toLowerCase();
|
|
||||||
|
|
||||||
txData.depositQR = coin + ":" + txData.deposit + "?amount=" + txData.depositAmount;
|
|
||||||
|
|
||||||
root.txFixedPending = true;
|
|
||||||
|
|
||||||
} else if (txData['normalTxData']) {
|
|
||||||
txData = txData.normalTxData;
|
|
||||||
if (checkForError(txData)) return cb(txData.err);
|
|
||||||
coin = root.coins[txData.depositType.toUpperCase()].name.toLowerCase();
|
|
||||||
txData.depositQR = coin + ":" + txData.deposit;
|
|
||||||
} else if (txData['cancelTxData']) {
|
|
||||||
txData = txData.cancelTxData;
|
|
||||||
if (checkForError(txData)) return cb(txData.err);
|
|
||||||
if (root.txFixedPending) {
|
|
||||||
root.txFixedPending = false;
|
|
||||||
}
|
|
||||||
root.ShiftState = 'Shift';
|
|
||||||
}
|
|
||||||
root.depositInfo = txData;
|
|
||||||
//console.log(root.marketData);
|
|
||||||
//console.log(root.depositInfo);
|
|
||||||
var sendAddress = txData.depositQR;
|
|
||||||
if (sendAddress && sendAddress.indexOf('bitcoin cash') >= 0)
|
|
||||||
sendAddress = sendAddress.replace('bitcoin cash', 'bitcoincash');
|
|
||||||
|
|
||||||
ongoingProcess.set('connectingShapeshift', false);
|
|
||||||
|
|
||||||
root.ShiftState = 'Cancel';
|
|
||||||
//root.GetStatus();
|
|
||||||
//root.txInterval=$interval(root.GetStatus, 8000);
|
|
||||||
|
|
||||||
var shapeshiftData = {
|
|
||||||
coinIn: coinIn,
|
|
||||||
coinOut: coinOut,
|
|
||||||
toWalletId: root.toWalletId,
|
|
||||||
minAmount: root.marketData.minimum,
|
|
||||||
maxAmount: root.marketData.maxLimit,
|
|
||||||
orderId: root.depositInfo.orderId,
|
|
||||||
toAddress: txData.deposit
|
|
||||||
};
|
|
||||||
//
|
|
||||||
// if (incomingDataService.redir(sendAddress, 'shapeshift', shapeshiftData)) {
|
|
||||||
ongoingProcess.set('connectingShapeshift', false);
|
|
||||||
// return;
|
|
||||||
// }
|
|
||||||
cb(null, shapeshiftData);
|
|
||||||
});
|
|
||||||
})
|
|
||||||
};
|
|
||||||
|
|
||||||
function ShapeShift() {
|
|
||||||
if (parseFloat(root.amount) > 0) return shapeshiftApiService.FixedAmountTx(root);
|
|
||||||
return shapeshiftApiService.NormalTx(root);
|
|
||||||
}
|
|
||||||
|
|
||||||
root.GetStatus = function () {
|
|
||||||
var address = root.depositInfo.deposit
|
|
||||||
shapeshiftApiService.GetStatusOfDepositToAddress(address).then(function (data) {
|
|
||||||
root.DepositStatus = data;
|
|
||||||
if (root.DepositStatus.status === 'complete') {
|
|
||||||
$interval.cancel(root.txInterval);
|
|
||||||
root.depositInfo = null;
|
|
||||||
root.ShiftState = 'Shift'
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
return root;
|
|
||||||
});
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue